diff --git a/README.md b/README.md
index 6d37dd5e7b..4d079de391 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ The **ImageSharp** library is made up of multiple packages.
 
 Packages include:
 - **ImageSharp**
-  - Contains the Image classes, Colors, Primitives, Configuration, and other core functionality.
+  - Contains the Image classes, PixelFormats, Primitives, Configuration, and other core functionality.
   - The IImageFormat interface, Jpeg, Png, Bmp, and Gif formats.
   - Transform methods like Resize, Crop, Skew, Rotate - Anything that alters the dimensions of the image.
   - Non-transform methods like Gaussian Blur, Pixelate, Edge Detection - Anything that maintains the original image dimensions.
@@ -108,11 +108,12 @@ Setting individual pixel values is perfomed as follows:
 using (image = new Image(400, 400)
 using (var pixels = image.Lock())
 {
-    pixels[200, 200] = Color.White;
+	// Rgba32 is our default PixelFormat, equivalent to System.Drawing Color
+    pixels[200, 200] = Rgba32.White;
 }
 ```
 
-For advanced usage the `Image<TColor>` and `PixelAccessor<TColor>` classes are available allowing developers to implement their own color models in the same manner as Microsoft XNA Game Studio and MonoGame. 
+For advanced usage the `Image<TPixel>` and `PixelAccessor<TPixel>` classes are available allowing developers to implement their own color models in the same manner as Microsoft XNA Game Studio and MonoGame. 
 
 All in all this should allow image processing to be much more accessible to developers which has always been my goal from the start.
 
@@ -204,4 +205,4 @@ Become a sponsor and get your logo on our README on Github with a link to your s
 <a href="https://opencollective.com/imagesharp/sponsor/26/website" target="_blank"><img src="https://opencollective.com/imagesharp/sponsor/26/avatar.svg"></a>
 <a href="https://opencollective.com/imagesharp/sponsor/27/website" target="_blank"><img src="https://opencollective.com/imagesharp/sponsor/27/avatar.svg"></a>
 <a href="https://opencollective.com/imagesharp/sponsor/28/website" target="_blank"><img src="https://opencollective.com/imagesharp/sponsor/28/avatar.svg"></a>
-<a href="https://opencollective.com/imagesharp/sponsor/29/website" target="_blank"><img src="https://opencollective.com/imagesharp/sponsor/29/avatar.svg"></a>
+<a href="https://opencollective.com/imagesharp/sponsor/29/website" target="_blank"><img src="https://opencollective.com/imagesharp/sponsor/29/avatar.svg"></a>
\ No newline at end of file
diff --git a/features.md b/features.md
index 6bc5630eed..1e35b88e0d 100644
--- a/features.md
+++ b/features.md
@@ -13,6 +13,7 @@ We've achieved a lot so far and hope to do a lot more in the future. We're alway
  - [ ] Tiff (Help needed)
 - **Metadata**
  - [x] EXIF Read/Write (Jpeg just now)
+ - [ ] ICC (In Progress)
 - **Quantizers (IQuantizer with alpha channel support, dithering, and thresholding)**
  - [x] Octree
  - [x] Xiaolin Wu
@@ -28,7 +29,6 @@ We've achieved a lot so far and hope to do a lot more in the future. We're alway
  - [x] Bayer
  - [x] Ordered
 - **Basic color structs with implicit operators.**
- - [x] Color - 32bit color in RGBA order (IPackedPixel\<TPacked\>).
  - [x] Bgra32
  - [x] CIE Lab
  - [x] CIE XYZ
@@ -38,7 +38,7 @@ We've achieved a lot so far and hope to do a lot more in the future. We're alway
  - [x] YCbCr
 - **IPackedPixel representations of color models. Compatible with Microsoft XNA Game Studio and MonoGame IPackedVector\<TPacked\>.**
  - [x] Alpha8 
- - [x] Argb 
+ - [x] Argb32 
  - [x] Bgr565 
  - [x] Bgra444 
  - [x] Bgra565 
@@ -52,7 +52,9 @@ We've achieved a lot so far and hope to do a lot more in the future. We're alway
  - [x] NormalizedShort4 
  - [x] Rg32 
  - [x] Rgba1010102 
+ - [x] Rgba32 - 32bit color in RGBA order - Our default pixel format.
  - [x] Rgba64 
+ - [x] RgbaVector
  - [x] Short2 
  - [x] Short4 
 - **Basic shape primitives.**
diff --git a/src/ImageSharp.Drawing/Brushes/Brushes.cs b/src/ImageSharp.Drawing/Brushes/Brushes.cs
index e8269848ce..8998c60f6e 100644
--- a/src/ImageSharp.Drawing/Brushes/Brushes.cs
+++ b/src/ImageSharp.Drawing/Brushes/Brushes.cs
@@ -5,8 +5,10 @@
 
 namespace ImageSharp.Drawing.Brushes
 {
+    using ImageSharp.PixelFormats;
+
     /// <summary>
-    /// A collection of methods for creating brushes. Brushes use <see cref="Color"/> for painting.
+    /// A collection of methods for creating brushes. Brushes use <see cref="Rgba32"/> for painting.
     /// </summary>
     public class Brushes
     {
@@ -15,7 +17,7 @@ namespace ImageSharp.Drawing.Brushes
         /// </summary>
         /// <param name="color">The color.</param>
         /// <returns>A Brush</returns>
-        public static SolidBrush Solid(Color color)
+        public static SolidBrush Solid(Rgba32 color)
                   => new SolidBrush(color);
 
         /// <summary>
@@ -24,8 +26,8 @@ namespace ImageSharp.Drawing.Brushes
         /// </summary>
         /// <param name="foreColor">Color of the foreground.</param>
         /// <returns>A Brush</returns>
-        public static PatternBrush Percent10(Color foreColor)
-            => new PatternBrush(Brushes<Color>.Percent10(foreColor, Color.Transparent));
+        public static PatternBrush Percent10(Rgba32 foreColor)
+            => new PatternBrush(Brushes<Rgba32>.Percent10(foreColor, Rgba32.Transparent));
 
         /// <summary>
         /// Create as brush that will paint a Percent10 Hatch Pattern with
@@ -34,8 +36,8 @@ namespace ImageSharp.Drawing.Brushes
         /// <param name="foreColor">Color of the foreground.</param>
         /// <param name="backColor">Color of the background.</param>
         /// <returns>A Brush</returns>
-        public static PatternBrush Percent10(Color foreColor, Color backColor)
-            => new PatternBrush(Brushes<Color>.Percent10(foreColor, backColor));
+        public static PatternBrush Percent10(Rgba32 foreColor, Rgba32 backColor)
+            => new PatternBrush(Brushes<Rgba32>.Percent10(foreColor, backColor));
 
         /// <summary>
         /// Create as brush that will paint a Percent20 Hatch Pattern with
@@ -43,8 +45,8 @@ namespace ImageSharp.Drawing.Brushes
         /// </summary>
         /// <param name="foreColor">Color of the foreground.</param>
         /// <returns>A Brush</returns>
-        public static PatternBrush Percent20(Color foreColor)
-            => new PatternBrush(Brushes<Color>.Percent20(foreColor, Color.Transparent));
+        public static PatternBrush Percent20(Rgba32 foreColor)
+            => new PatternBrush(Brushes<Rgba32>.Percent20(foreColor, Rgba32.Transparent));
 
         /// <summary>
         /// Create as brush that will paint a Percent20 Hatch Pattern with
@@ -53,8 +55,8 @@ namespace ImageSharp.Drawing.Brushes
         /// <param name="foreColor">Color of the foreground.</param>
         /// <param name="backColor">Color of the background.</param>
         /// <returns>A Brush</returns>
-        public static PatternBrush Percent20(Color foreColor, Color backColor)
-            => new PatternBrush(Brushes<Color>.Percent20(foreColor, backColor));
+        public static PatternBrush Percent20(Rgba32 foreColor, Rgba32 backColor)
+            => new PatternBrush(Brushes<Rgba32>.Percent20(foreColor, backColor));
 
         /// <summary>
         /// Create as brush that will paint a Horizontal Hatch Pattern with
@@ -62,8 +64,8 @@ namespace ImageSharp.Drawing.Brushes
         /// </summary>
         /// <param name="foreColor">Color of the foreground.</param>
         /// <returns>A Brush</returns>
-        public static PatternBrush Horizontal(Color foreColor)
-            => new PatternBrush(Brushes<Color>.Horizontal(foreColor, Color.Transparent));
+        public static PatternBrush Horizontal(Rgba32 foreColor)
+            => new PatternBrush(Brushes<Rgba32>.Horizontal(foreColor, Rgba32.Transparent));
 
         /// <summary>
         /// Create as brush that will paint a Horizontal Hatch Pattern with
@@ -72,8 +74,8 @@ namespace ImageSharp.Drawing.Brushes
         /// <param name="foreColor">Color of the foreground.</param>
         /// <param name="backColor">Color of the background.</param>
         /// <returns>A Brush</returns>
-        public static PatternBrush Horizontal(Color foreColor, Color backColor)
-            => new PatternBrush(Brushes<Color>.Horizontal(foreColor, backColor));
+        public static PatternBrush Horizontal(Rgba32 foreColor, Rgba32 backColor)
+            => new PatternBrush(Brushes<Rgba32>.Horizontal(foreColor, backColor));
 
         /// <summary>
         /// Create as brush that will paint a Min Hatch Pattern with
@@ -81,8 +83,8 @@ namespace ImageSharp.Drawing.Brushes
         /// </summary>
         /// <param name="foreColor">Color of the foreground.</param>
         /// <returns>A Brush</returns>
-        public static PatternBrush Min(Color foreColor)
-            => new PatternBrush(Brushes<Color>.Min(foreColor, Color.Transparent));
+        public static PatternBrush Min(Rgba32 foreColor)
+            => new PatternBrush(Brushes<Rgba32>.Min(foreColor, Rgba32.Transparent));
 
         /// <summary>
         /// Create as brush that will paint a Min Hatch Pattern with
@@ -91,8 +93,8 @@ namespace ImageSharp.Drawing.Brushes
         /// <param name="foreColor">Color of the foreground.</param>
         /// <param name="backColor">Color of the background.</param>
         /// <returns>A Brush</returns>
-        public static PatternBrush Min(Color foreColor, Color backColor)
-            => new PatternBrush(Brushes<Color>.Min(foreColor, backColor));
+        public static PatternBrush Min(Rgba32 foreColor, Rgba32 backColor)
+            => new PatternBrush(Brushes<Rgba32>.Min(foreColor, backColor));
 
         /// <summary>
         /// Create as brush that will paint a Vertical Hatch Pattern with
@@ -100,8 +102,8 @@ namespace ImageSharp.Drawing.Brushes
         /// </summary>
         /// <param name="foreColor">Color of the foreground.</param>
         /// <returns>A Brush</returns>
-        public static PatternBrush Vertical(Color foreColor)
-            => new PatternBrush(Brushes<Color>.Vertical(foreColor, Color.Transparent));
+        public static PatternBrush Vertical(Rgba32 foreColor)
+            => new PatternBrush(Brushes<Rgba32>.Vertical(foreColor, Rgba32.Transparent));
 
         /// <summary>
         /// Create as brush that will paint a Vertical Hatch Pattern with
@@ -110,8 +112,8 @@ namespace ImageSharp.Drawing.Brushes
         /// <param name="foreColor">Color of the foreground.</param>
         /// <param name="backColor">Color of the background.</param>
         /// <returns>A Brush</returns>
-        public static PatternBrush Vertical(Color foreColor, Color backColor)
-            => new PatternBrush(Brushes<Color>.Vertical(foreColor, backColor));
+        public static PatternBrush Vertical(Rgba32 foreColor, Rgba32 backColor)
+            => new PatternBrush(Brushes<Rgba32>.Vertical(foreColor, backColor));
 
         /// <summary>
         /// Create as brush that will paint a Forward Diagonal Hatch Pattern with
@@ -119,8 +121,8 @@ namespace ImageSharp.Drawing.Brushes
         /// </summary>
         /// <param name="foreColor">Color of the foreground.</param>
         /// <returns>A Brush</returns>
-        public static PatternBrush ForwardDiagonal(Color foreColor)
-            => new PatternBrush(Brushes<Color>.ForwardDiagonal(foreColor, Color.Transparent));
+        public static PatternBrush ForwardDiagonal(Rgba32 foreColor)
+            => new PatternBrush(Brushes<Rgba32>.ForwardDiagonal(foreColor, Rgba32.Transparent));
 
         /// <summary>
         /// Create as brush that will paint a Forward Diagonal Hatch Pattern with
@@ -129,8 +131,8 @@ namespace ImageSharp.Drawing.Brushes
         /// <param name="foreColor">Color of the foreground.</param>
         /// <param name="backColor">Color of the background.</param>
         /// <returns>A Brush</returns>
-        public static PatternBrush ForwardDiagonal(Color foreColor, Color backColor)
-            => new PatternBrush(Brushes<Color>.ForwardDiagonal(foreColor, backColor));
+        public static PatternBrush ForwardDiagonal(Rgba32 foreColor, Rgba32 backColor)
+            => new PatternBrush(Brushes<Rgba32>.ForwardDiagonal(foreColor, backColor));
 
         /// <summary>
         /// Create as brush that will paint a Backward Diagonal Hatch Pattern with
@@ -138,8 +140,8 @@ namespace ImageSharp.Drawing.Brushes
         /// </summary>
         /// <param name="foreColor">Color of the foreground.</param>
         /// <returns>A Brush</returns>
-        public static PatternBrush BackwardDiagonal(Color foreColor)
-            => new PatternBrush(Brushes<Color>.BackwardDiagonal(foreColor, Color.Transparent));
+        public static PatternBrush BackwardDiagonal(Rgba32 foreColor)
+            => new PatternBrush(Brushes<Rgba32>.BackwardDiagonal(foreColor, Rgba32.Transparent));
 
         /// <summary>
         /// Create as brush that will paint a Backward Diagonal Hatch Pattern with
@@ -148,7 +150,7 @@ namespace ImageSharp.Drawing.Brushes
         /// <param name="foreColor">Color of the foreground.</param>
         /// <param name="backColor">Color of the background.</param>
         /// <returns>A Brush</returns>
-        public static PatternBrush BackwardDiagonal(Color foreColor, Color backColor)
-            => new PatternBrush(Brushes<Color>.BackwardDiagonal(foreColor, backColor));
+        public static PatternBrush BackwardDiagonal(Rgba32 foreColor, Rgba32 backColor)
+            => new PatternBrush(Brushes<Rgba32>.BackwardDiagonal(foreColor, backColor));
     }
 }
\ No newline at end of file
diff --git a/src/ImageSharp.Drawing/Brushes/Brushes{TColor}.cs b/src/ImageSharp.Drawing/Brushes/Brushes{TPixel}.cs
similarity index 78%
rename from src/ImageSharp.Drawing/Brushes/Brushes{TColor}.cs
rename to src/ImageSharp.Drawing/Brushes/Brushes{TPixel}.cs
index 6e092bf185..4b2f6c0261 100644
--- a/src/ImageSharp.Drawing/Brushes/Brushes{TColor}.cs
+++ b/src/ImageSharp.Drawing/Brushes/Brushes{TPixel}.cs
@@ -1,19 +1,19 @@
-// <copyright file="Brushes{TColor}.cs" company="James Jackson-South">
+// <copyright file="Brushes{TPixel}.cs" company="James Jackson-South">
 // Copyright (c) James Jackson-South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
 namespace ImageSharp.Drawing.Brushes
 {
-    using System;
+    using ImageSharp.PixelFormats;
 
     /// <summary>
     /// A collection of methods for creating generic brushes.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
     /// <returns>A Brush</returns>
-    public class Brushes<TColor>
-        where TColor : struct, IPixel<TColor>
+    public class Brushes<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
         /// Percent10 Hatch Pattern
@@ -99,8 +99,8 @@ namespace ImageSharp.Drawing.Brushes
         /// </summary>
         /// <param name="color">The color.</param>
         /// <returns>A Brush</returns>
-        public static SolidBrush<TColor> Solid(TColor color)
-            => new SolidBrush<TColor>(color);
+        public static SolidBrush<TPixel> Solid(TPixel color)
+            => new SolidBrush<TPixel>(color);
 
         /// <summary>
         /// Create as brush that will paint a Percent10 Hatch Pattern within the specified colors
@@ -108,8 +108,8 @@ namespace ImageSharp.Drawing.Brushes
         /// <param name="foreColor">Color of the foreground.</param>
         /// <param name="backColor">Color of the background.</param>
         /// <returns>A Brush</returns>
-        public static PatternBrush<TColor> Percent10(TColor foreColor, TColor backColor)
-            => new PatternBrush<TColor>(foreColor, backColor, Percent10Pattern);
+        public static PatternBrush<TPixel> Percent10(TPixel foreColor, TPixel backColor)
+            => new PatternBrush<TPixel>(foreColor, backColor, Percent10Pattern);
 
         /// <summary>
         /// Create as brush that will paint a Percent20 Hatch Pattern within the specified colors
@@ -117,8 +117,8 @@ namespace ImageSharp.Drawing.Brushes
         /// <param name="foreColor">Color of the foreground.</param>
         /// <param name="backColor">Color of the background.</param>
         /// <returns>A Brush</returns>
-        public static PatternBrush<TColor> Percent20(TColor foreColor, TColor backColor)
-            => new PatternBrush<TColor>(foreColor, backColor, Percent20Pattern);
+        public static PatternBrush<TPixel> Percent20(TPixel foreColor, TPixel backColor)
+            => new PatternBrush<TPixel>(foreColor, backColor, Percent20Pattern);
 
         /// <summary>
         /// Create as brush that will paint a Horizontal Hatch Pattern within the specified colors
@@ -126,8 +126,8 @@ namespace ImageSharp.Drawing.Brushes
         /// <param name="foreColor">Color of the foreground.</param>
         /// <param name="backColor">Color of the background.</param>
         /// <returns>A Brush</returns>
-        public static PatternBrush<TColor> Horizontal(TColor foreColor, TColor backColor)
-            => new PatternBrush<TColor>(foreColor, backColor, HorizontalPattern);
+        public static PatternBrush<TPixel> Horizontal(TPixel foreColor, TPixel backColor)
+            => new PatternBrush<TPixel>(foreColor, backColor, HorizontalPattern);
 
         /// <summary>
         /// Create as brush that will paint a Min Hatch Pattern within the specified colors
@@ -135,8 +135,8 @@ namespace ImageSharp.Drawing.Brushes
         /// <param name="foreColor">Color of the foreground.</param>
         /// <param name="backColor">Color of the background.</param>
         /// <returns>A Brush</returns>
-        public static PatternBrush<TColor> Min(TColor foreColor, TColor backColor)
-            => new PatternBrush<TColor>(foreColor, backColor, MinPattern);
+        public static PatternBrush<TPixel> Min(TPixel foreColor, TPixel backColor)
+            => new PatternBrush<TPixel>(foreColor, backColor, MinPattern);
 
         /// <summary>
         /// Create as brush that will paint a Vertical Hatch Pattern within the specified colors
@@ -144,8 +144,8 @@ namespace ImageSharp.Drawing.Brushes
         /// <param name="foreColor">Color of the foreground.</param>
         /// <param name="backColor">Color of the background.</param>
         /// <returns>A Brush</returns>
-        public static PatternBrush<TColor> Vertical(TColor foreColor, TColor backColor)
-            => new PatternBrush<TColor>(foreColor, backColor, VerticalPattern);
+        public static PatternBrush<TPixel> Vertical(TPixel foreColor, TPixel backColor)
+            => new PatternBrush<TPixel>(foreColor, backColor, VerticalPattern);
 
         /// <summary>
         /// Create as brush that will paint a Forward Diagonal Hatch Pattern within the specified colors
@@ -153,8 +153,8 @@ namespace ImageSharp.Drawing.Brushes
         /// <param name="foreColor">Color of the foreground.</param>
         /// <param name="backColor">Color of the background.</param>
         /// <returns>A Brush</returns>
-        public static PatternBrush<TColor> ForwardDiagonal(TColor foreColor, TColor backColor)
-            => new PatternBrush<TColor>(foreColor, backColor, ForwardDiagonalPattern);
+        public static PatternBrush<TPixel> ForwardDiagonal(TPixel foreColor, TPixel backColor)
+            => new PatternBrush<TPixel>(foreColor, backColor, ForwardDiagonalPattern);
 
         /// <summary>
         /// Create as brush that will paint a Backward Diagonal Hatch Pattern within the specified colors
@@ -162,7 +162,7 @@ namespace ImageSharp.Drawing.Brushes
         /// <param name="foreColor">Color of the foreground.</param>
         /// <param name="backColor">Color of the background.</param>
         /// <returns>A Brush</returns>
-        public static PatternBrush<TColor> BackwardDiagonal(TColor foreColor, TColor backColor)
-            => new PatternBrush<TColor>(foreColor, backColor, BackwardDiagonalPattern);
+        public static PatternBrush<TPixel> BackwardDiagonal(TPixel foreColor, TPixel backColor)
+            => new PatternBrush<TPixel>(foreColor, backColor, BackwardDiagonalPattern);
     }
 }
diff --git a/src/ImageSharp.Drawing/Brushes/IBrush.cs b/src/ImageSharp.Drawing/Brushes/IBrush.cs
index df05fa23e1..e16f220288 100644
--- a/src/ImageSharp.Drawing/Brushes/IBrush.cs
+++ b/src/ImageSharp.Drawing/Brushes/IBrush.cs
@@ -5,20 +5,19 @@
 
 namespace ImageSharp.Drawing
 {
-    using System;
-
+    using ImageSharp.PixelFormats;
     using Processors;
 
     /// <summary>
     /// Brush represents a logical configuration of a brush which can be used to source pixel colors
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
     /// <remarks>
-    /// A brush is a simple class that will return an <see cref="BrushApplicator{TColor}" /> that will perform the
-    /// logic for converting a pixel location to a <typeparamref name="TColor"/>.
+    /// A brush is a simple class that will return an <see cref="BrushApplicator{TPixel}" /> that will perform the
+    /// logic for converting a pixel location to a <typeparamref name="TPixel"/>.
     /// </remarks>
-    public interface IBrush<TColor>
-        where TColor : struct, IPixel<TColor>
+    public interface IBrush<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
         /// Creates the applicator for this brush.
@@ -32,6 +31,6 @@ namespace ImageSharp.Drawing
         /// The <paramref name="region" /> when being applied to things like shapes would usually be the
         /// bounding box of the shape not necessarily the bounds of the whole image
         /// </remarks>
-        BrushApplicator<TColor> CreateApplicator(PixelAccessor<TColor> pixelSource, RectangleF region);
+        BrushApplicator<TPixel> CreateApplicator(PixelAccessor<TPixel> pixelSource, RectangleF region);
     }
 }
\ No newline at end of file
diff --git a/src/ImageSharp.Drawing/Brushes/ImageBrush.cs b/src/ImageSharp.Drawing/Brushes/ImageBrush.cs
index a7124bfe86..6a3ff1d9d3 100644
--- a/src/ImageSharp.Drawing/Brushes/ImageBrush.cs
+++ b/src/ImageSharp.Drawing/Brushes/ImageBrush.cs
@@ -5,16 +5,18 @@
 
 namespace ImageSharp.Drawing.Brushes
 {
+    using ImageSharp.PixelFormats;
+
     /// <summary>
-    /// Provides an implementation of a solid brush for painting with repeating images. The brush uses <see cref="Color"/> for painting.
+    /// Provides an implementation of a solid brush for painting with repeating images. The brush uses <see cref="Rgba32"/> for painting.
     /// </summary>
-    public class ImageBrush : ImageBrush<Color>
+    public class ImageBrush : ImageBrush<Rgba32>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="ImageBrush" /> class.
         /// </summary>
         /// <param name="image">The image to paint.</param>
-        public ImageBrush(IImageBase<Color> image)
+        public ImageBrush(IImageBase<Rgba32> image)
             : base(image)
         {
         }
diff --git a/src/ImageSharp.Drawing/Brushes/ImageBrush{TColor}.cs b/src/ImageSharp.Drawing/Brushes/ImageBrush{TPixel}.cs
similarity index 83%
rename from src/ImageSharp.Drawing/Brushes/ImageBrush{TColor}.cs
rename to src/ImageSharp.Drawing/Brushes/ImageBrush{TPixel}.cs
index b68b02eff1..3e2da040fd 100644
--- a/src/ImageSharp.Drawing/Brushes/ImageBrush{TColor}.cs
+++ b/src/ImageSharp.Drawing/Brushes/ImageBrush{TPixel}.cs
@@ -1,38 +1,37 @@
-// <copyright file="ImageBrush{TColor}.cs" company="James Jackson-South">
+// <copyright file="ImageBrush{TPixel}.cs" company="James Jackson-South">
 // Copyright (c) James Jackson-South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
 namespace ImageSharp.Drawing.Brushes
 {
-    using System;
     using System.Numerics;
-
+    using ImageSharp.PixelFormats;
     using Processors;
 
     /// <summary>
     /// Provides an implementation of an image brush for painting images within areas.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    public class ImageBrush<TColor> : IBrush<TColor>
-    where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    public class ImageBrush<TPixel> : IBrush<TPixel>
+    where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
         /// The image to paint.
         /// </summary>
-        private readonly IImageBase<TColor> image;
+        private readonly IImageBase<TPixel> image;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="ImageBrush{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="ImageBrush{TPixel}"/> class.
         /// </summary>
         /// <param name="image">The image.</param>
-        public ImageBrush(IImageBase<TColor> image)
+        public ImageBrush(IImageBase<TPixel> image)
         {
             this.image = image;
         }
 
         /// <inheritdoc />
-        public BrushApplicator<TColor> CreateApplicator(PixelAccessor<TColor> sourcePixels, RectangleF region)
+        public BrushApplicator<TPixel> CreateApplicator(PixelAccessor<TPixel> sourcePixels, RectangleF region)
         {
             return new ImageBrushApplicator(sourcePixels, this.image, region);
         }
@@ -40,12 +39,12 @@ namespace ImageSharp.Drawing.Brushes
         /// <summary>
         /// The image brush applicator.
         /// </summary>
-        private class ImageBrushApplicator : BrushApplicator<TColor>
+        private class ImageBrushApplicator : BrushApplicator<TPixel>
         {
             /// <summary>
             /// The source pixel accessor.
             /// </summary>
-            private readonly PixelAccessor<TColor> source;
+            private readonly PixelAccessor<TPixel> source;
 
             /// <summary>
             /// The y-length.
@@ -74,7 +73,7 @@ namespace ImageSharp.Drawing.Brushes
             /// <param name="sourcePixels">
             /// The sourcePixels.
             /// </param>
-            public ImageBrushApplicator(PixelAccessor<TColor> sourcePixels, IImageBase<TColor> image, RectangleF region)
+            public ImageBrushApplicator(PixelAccessor<TPixel> sourcePixels, IImageBase<TPixel> image, RectangleF region)
                 : base(sourcePixels)
             {
                 this.source = image.Lock();
@@ -91,7 +90,7 @@ namespace ImageSharp.Drawing.Brushes
             /// <returns>
             /// The color
             /// </returns>
-            internal override TColor this[int x, int y]
+            internal override TPixel this[int x, int y]
             {
                 get
                 {
@@ -135,7 +134,7 @@ namespace ImageSharp.Drawing.Brushes
 
                             Vector4 finalColor = Vector4BlendTransforms.PremultipliedLerp(backgroundVector, sourceVector, opacity);
 
-                            TColor packed = default(TColor);
+                            TPixel packed = default(TPixel);
                             packed.PackFromVector4(finalColor);
                             this.Target[targetX, targetY] = packed;
                         }
diff --git a/src/ImageSharp.Drawing/Brushes/PatternBrush.cs b/src/ImageSharp.Drawing/Brushes/PatternBrush.cs
index 5093a7df06..f00862fe78 100644
--- a/src/ImageSharp.Drawing/Brushes/PatternBrush.cs
+++ b/src/ImageSharp.Drawing/Brushes/PatternBrush.cs
@@ -5,10 +5,12 @@
 
 namespace ImageSharp.Drawing.Brushes
 {
+    using ImageSharp.PixelFormats;
+
     /// <summary>
-    /// Provides an implementation of a pattern brush for painting patterns. The brush use <see cref="Color"/> for painting.
+    /// Provides an implementation of a pattern brush for painting patterns. The brush use <see cref="Rgba32"/> for painting.
     /// </summary>
-    public class PatternBrush : PatternBrush<Color>
+    public class PatternBrush : PatternBrush<Rgba32>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="PatternBrush"/> class.
@@ -16,7 +18,7 @@ namespace ImageSharp.Drawing.Brushes
         /// <param name="foreColor">Color of the fore.</param>
         /// <param name="backColor">Color of the back.</param>
         /// <param name="pattern">The pattern.</param>
-        public PatternBrush(Color foreColor, Color backColor, bool[,] pattern)
+        public PatternBrush(Rgba32 foreColor, Rgba32 backColor, bool[,] pattern)
             : base(foreColor, backColor, pattern)
         {
         }
@@ -25,7 +27,7 @@ namespace ImageSharp.Drawing.Brushes
         /// Initializes a new instance of the <see cref="PatternBrush"/> class.
         /// </summary>
         /// <param name="brush">The brush.</param>
-        internal PatternBrush(PatternBrush<Color> brush)
+        internal PatternBrush(PatternBrush<Rgba32> brush)
             : base(brush)
         {
         }
diff --git a/src/ImageSharp.Drawing/Brushes/PatternBrush{TColor}.cs b/src/ImageSharp.Drawing/Brushes/PatternBrush{TPixel}.cs
similarity index 84%
rename from src/ImageSharp.Drawing/Brushes/PatternBrush{TColor}.cs
rename to src/ImageSharp.Drawing/Brushes/PatternBrush{TPixel}.cs
index 1af58bc62f..ad37f4d289 100644
--- a/src/ImageSharp.Drawing/Brushes/PatternBrush{TColor}.cs
+++ b/src/ImageSharp.Drawing/Brushes/PatternBrush{TPixel}.cs
@@ -1,4 +1,4 @@
-// <copyright file="PatternBrush{TColor}.cs" company="James Jackson-South">
+// <copyright file="PatternBrush{TPixel}.cs" company="James Jackson-South">
 // Copyright (c) James Jackson-South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
@@ -7,7 +7,7 @@ namespace ImageSharp.Drawing.Brushes
 {
     using System;
     using System.Numerics;
-
+    using ImageSharp.PixelFormats;
     using Processors;
 
     /// <summary>
@@ -31,38 +31,38 @@ namespace ImageSharp.Drawing.Brushes
     ///  0
     /// </para>
     /// </remarks>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    public class PatternBrush<TColor> : IBrush<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    public class PatternBrush<TPixel> : IBrush<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
         /// The pattern.
         /// </summary>
-        private readonly Fast2DArray<TColor> pattern;
+        private readonly Fast2DArray<TPixel> pattern;
         private readonly Fast2DArray<Vector4> patternVector;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="PatternBrush{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="PatternBrush{TPixel}"/> class.
         /// </summary>
         /// <param name="foreColor">Color of the fore.</param>
         /// <param name="backColor">Color of the back.</param>
         /// <param name="pattern">The pattern.</param>
-        public PatternBrush(TColor foreColor, TColor backColor, bool[,] pattern)
+        public PatternBrush(TPixel foreColor, TPixel backColor, bool[,] pattern)
             : this(foreColor, backColor, new Fast2DArray<bool>(pattern))
         {
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="PatternBrush{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="PatternBrush{TPixel}"/> class.
         /// </summary>
         /// <param name="foreColor">Color of the fore.</param>
         /// <param name="backColor">Color of the back.</param>
         /// <param name="pattern">The pattern.</param>
-        internal PatternBrush(TColor foreColor, TColor backColor, Fast2DArray<bool> pattern)
+        internal PatternBrush(TPixel foreColor, TPixel backColor, Fast2DArray<bool> pattern)
         {
             Vector4 foreColorVector = foreColor.ToVector4();
             Vector4 backColorVector = backColor.ToVector4();
-            this.pattern = new Fast2DArray<TColor>(pattern.Width, pattern.Height);
+            this.pattern = new Fast2DArray<TPixel>(pattern.Width, pattern.Height);
             this.patternVector = new Fast2DArray<Vector4>(pattern.Width, pattern.Height);
             for (int i = 0; i < pattern.Data.Length; i++)
             {
@@ -80,17 +80,17 @@ namespace ImageSharp.Drawing.Brushes
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="PatternBrush{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="PatternBrush{TPixel}"/> class.
         /// </summary>
         /// <param name="brush">The brush.</param>
-        internal PatternBrush(PatternBrush<TColor> brush)
+        internal PatternBrush(PatternBrush<TPixel> brush)
         {
             this.pattern = brush.pattern;
             this.patternVector = brush.patternVector;
         }
 
         /// <inheritdoc />
-        public BrushApplicator<TColor> CreateApplicator(PixelAccessor<TColor> sourcePixels, RectangleF region)
+        public BrushApplicator<TPixel> CreateApplicator(PixelAccessor<TPixel> sourcePixels, RectangleF region)
         {
             return new PatternBrushApplicator(sourcePixels, this.pattern, this.patternVector);
         }
@@ -98,12 +98,12 @@ namespace ImageSharp.Drawing.Brushes
         /// <summary>
         /// The pattern brush applicator.
         /// </summary>
-        private class PatternBrushApplicator : BrushApplicator<TColor>
+        private class PatternBrushApplicator : BrushApplicator<TPixel>
         {
             /// <summary>
             /// The pattern.
             /// </summary>
-            private readonly Fast2DArray<TColor> pattern;
+            private readonly Fast2DArray<TPixel> pattern;
             private readonly Fast2DArray<Vector4> patternVector;
 
             /// <summary>
@@ -112,7 +112,7 @@ namespace ImageSharp.Drawing.Brushes
             /// <param name="sourcePixels">The sourcePixels.</param>
             /// <param name="pattern">The pattern.</param>
             /// <param name="patternVector">The patternVector.</param>
-            public PatternBrushApplicator(PixelAccessor<TColor> sourcePixels, Fast2DArray<TColor> pattern, Fast2DArray<Vector4> patternVector)
+            public PatternBrushApplicator(PixelAccessor<TPixel> sourcePixels, Fast2DArray<TPixel> pattern, Fast2DArray<Vector4> patternVector)
                 : base(sourcePixels)
             {
                 this.pattern = pattern;
@@ -127,7 +127,7 @@ namespace ImageSharp.Drawing.Brushes
             /// <returns>
             /// The Color.
             /// </returns>
-            internal override TColor this[int x, int y]
+            internal override TPixel this[int x, int y]
             {
                 get
                 {
@@ -169,7 +169,7 @@ namespace ImageSharp.Drawing.Brushes
 
                             Vector4 finalColor = Vector4BlendTransforms.PremultipliedLerp(backgroundVector, sourceVector, opacity);
 
-                            TColor packed = default(TColor);
+                            TPixel packed = default(TPixel);
                             packed.PackFromVector4(finalColor);
                             this.Target[targetX, targetY] = packed;
                         }
diff --git a/src/ImageSharp.Drawing/Brushes/Processors/BrushApplicator.cs b/src/ImageSharp.Drawing/Brushes/Processors/BrushApplicator.cs
index 0ef11e1611..5dd6dad76d 100644
--- a/src/ImageSharp.Drawing/Brushes/Processors/BrushApplicator.cs
+++ b/src/ImageSharp.Drawing/Brushes/Processors/BrushApplicator.cs
@@ -7,21 +7,21 @@ namespace ImageSharp.Drawing.Processors
 {
     using System;
     using System.Numerics;
-    using System.Runtime.CompilerServices;
+    using ImageSharp.PixelFormats;
 
     /// <summary>
     /// primitive that converts a point in to a color for discovering the fill color based on an implementation
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
     /// <seealso cref="System.IDisposable" />
-    public abstract class BrushApplicator<TColor> : IDisposable // disposable will be required if/when there is an ImageBrush
-        where TColor : struct, IPixel<TColor>
+    public abstract class BrushApplicator<TPixel> : IDisposable // disposable will be required if/when there is an ImageBrush
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
-        /// Initializes a new instance of the <see cref="BrushApplicator{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="BrushApplicator{TPixel}"/> class.
         /// </summary>
         /// <param name="target">The target.</param>
-        internal BrushApplicator(PixelAccessor<TColor> target)
+        internal BrushApplicator(PixelAccessor<TPixel> target)
         {
             this.Target = target;
         }
@@ -29,15 +29,15 @@ namespace ImageSharp.Drawing.Processors
         /// <summary>
         /// Gets the destinaion
         /// </summary>
-        protected PixelAccessor<TColor> Target { get; }
+        protected PixelAccessor<TPixel> Target { get; }
 
         /// <summary>
         /// Gets the color for a single pixel.
         /// </summary>
         /// <param name="x">The x cordinate.</param>
         /// <param name="y">The y cordinate.</param>
-        /// <returns>The a <typeparamref name="TColor"/> that should be applied to the pixel.</returns>
-        internal abstract TColor this[int x, int y] { get; }
+        /// <returns>The a <typeparamref name="TPixel"/> that should be applied to the pixel.</returns>
+        internal abstract TPixel this[int x, int y] { get; }
 
         /// <inheritdoc/>
         public abstract void Dispose();
@@ -73,7 +73,7 @@ namespace ImageSharp.Drawing.Processors
 
                         Vector4 finalColor = Vector4BlendTransforms.PremultipliedLerp(backgroundVector, sourceVector, opacity);
 
-                        TColor packed = default(TColor);
+                        TPixel packed = default(TPixel);
                         packed.PackFromVector4(finalColor);
                         this.Target[targetX, targetY] = packed;
                     }
diff --git a/src/ImageSharp.Drawing/Brushes/RecolorBrush.cs b/src/ImageSharp.Drawing/Brushes/RecolorBrush.cs
index 0452a3f015..bfe5c01e63 100644
--- a/src/ImageSharp.Drawing/Brushes/RecolorBrush.cs
+++ b/src/ImageSharp.Drawing/Brushes/RecolorBrush.cs
@@ -5,19 +5,21 @@
 
 namespace ImageSharp.Drawing.Brushes
 {
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// Provides an implementation of a recolor brush for painting color changes.
     /// </summary>
-    public class RecolorBrush : RecolorBrush<Color>
+    public class RecolorBrush : RecolorBrush<Rgba32>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="RecolorBrush" /> class.
         /// </summary>
         /// <param name="sourceColor">Color of the source.</param>
-        /// <param name="targetColor">Color of the target.</param>
+        /// <param name="targeTPixel">Color of the target.</param>
         /// <param name="threshold">The threshold.</param>
-        public RecolorBrush(Color sourceColor, Color targetColor, float threshold)
-            : base(sourceColor, targetColor, threshold)
+        public RecolorBrush(Rgba32 sourceColor, Rgba32 targeTPixel, float threshold)
+            : base(sourceColor, targeTPixel, threshold)
         {
         }
     }
diff --git a/src/ImageSharp.Drawing/Brushes/RecolorBrush{TColor}.cs b/src/ImageSharp.Drawing/Brushes/RecolorBrush{TPixel}.cs
similarity index 80%
rename from src/ImageSharp.Drawing/Brushes/RecolorBrush{TColor}.cs
rename to src/ImageSharp.Drawing/Brushes/RecolorBrush{TPixel}.cs
index 4e3cd01ae8..7c192b2d3c 100644
--- a/src/ImageSharp.Drawing/Brushes/RecolorBrush{TColor}.cs
+++ b/src/ImageSharp.Drawing/Brushes/RecolorBrush{TPixel}.cs
@@ -1,33 +1,32 @@
-// <copyright file="RecolorBrush{TColor}.cs" company="James Jackson-South">
+// <copyright file="RecolorBrush{TPixel}.cs" company="James Jackson-South">
 // Copyright (c) James Jackson-South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
 namespace ImageSharp.Drawing.Brushes
 {
-    using System;
     using System.Numerics;
-
+    using ImageSharp.PixelFormats;
     using Processors;
 
     /// <summary>
     /// Provides an implementation of a brush that can recolor an image
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    public class RecolorBrush<TColor> : IBrush<TColor>
-    where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    public class RecolorBrush<TPixel> : IBrush<TPixel>
+    where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
-        /// Initializes a new instance of the <see cref="RecolorBrush{TColor}" /> class.
+        /// Initializes a new instance of the <see cref="RecolorBrush{TPixel}" /> class.
         /// </summary>
         /// <param name="sourceColor">Color of the source.</param>
-        /// <param name="targetColor">Color of the target.</param>
+        /// <param name="targeTPixel">Color of the target.</param>
         /// <param name="threshold">The threshold as a value between 0 and 1.</param>
-        public RecolorBrush(TColor sourceColor, TColor targetColor, float threshold)
+        public RecolorBrush(TPixel sourceColor, TPixel targeTPixel, float threshold)
         {
             this.SourceColor = sourceColor;
             this.Threshold = threshold;
-            this.TargetColor = targetColor;
+            this.TargeTPixel = targeTPixel;
         }
 
         /// <summary>
@@ -44,7 +43,7 @@ namespace ImageSharp.Drawing.Brushes
         /// <value>
         /// The color of the source.
         /// </value>
-        public TColor SourceColor { get; }
+        public TPixel SourceColor { get; }
 
         /// <summary>
         /// Gets the target color.
@@ -52,18 +51,18 @@ namespace ImageSharp.Drawing.Brushes
         /// <value>
         /// The color of the target.
         /// </value>
-        public TColor TargetColor { get; }
+        public TPixel TargeTPixel { get; }
 
         /// <inheritdoc />
-        public BrushApplicator<TColor> CreateApplicator(PixelAccessor<TColor> sourcePixels, RectangleF region)
+        public BrushApplicator<TPixel> CreateApplicator(PixelAccessor<TPixel> sourcePixels, RectangleF region)
         {
-            return new RecolorBrushApplicator(sourcePixels, this.SourceColor, this.TargetColor, this.Threshold);
+            return new RecolorBrushApplicator(sourcePixels, this.SourceColor, this.TargeTPixel, this.Threshold);
         }
 
         /// <summary>
         /// The recolor brush applicator.
         /// </summary>
-        private class RecolorBrushApplicator : BrushApplicator<TColor>
+        private class RecolorBrushApplicator : BrushApplicator<TPixel>
         {
             /// <summary>
             /// The source color.
@@ -73,7 +72,7 @@ namespace ImageSharp.Drawing.Brushes
             /// <summary>
             /// The target color.
             /// </summary>
-            private readonly Vector4 targetColor;
+            private readonly Vector4 targeTPixel;
 
             /// <summary>
             /// The threshold.
@@ -85,18 +84,18 @@ namespace ImageSharp.Drawing.Brushes
             /// </summary>
             /// <param name="sourcePixels">The source pixels.</param>
             /// <param name="sourceColor">Color of the source.</param>
-            /// <param name="targetColor">Color of the target.</param>
+            /// <param name="targeTPixel">Color of the target.</param>
             /// <param name="threshold">The threshold .</param>
-            public RecolorBrushApplicator(PixelAccessor<TColor> sourcePixels, TColor sourceColor, TColor targetColor, float threshold)
+            public RecolorBrushApplicator(PixelAccessor<TPixel> sourcePixels, TPixel sourceColor, TPixel targeTPixel, float threshold)
                 : base(sourcePixels)
             {
                 this.sourceColor = sourceColor.ToVector4();
-                this.targetColor = targetColor.ToVector4();
+                this.targeTPixel = targeTPixel.ToVector4();
 
                 // Lets hack a min max extreams for a color space by letteing the IPackedPixel clamp our values to something in the correct spaces :)
-                TColor maxColor = default(TColor);
+                TPixel maxColor = default(TPixel);
                 maxColor.PackFromVector4(new Vector4(float.MaxValue));
-                TColor minColor = default(TColor);
+                TPixel minColor = default(TPixel);
                 minColor.PackFromVector4(new Vector4(float.MinValue));
                 this.threshold = Vector4.DistanceSquared(maxColor.ToVector4(), minColor.ToVector4()) * threshold;
             }
@@ -109,12 +108,12 @@ namespace ImageSharp.Drawing.Brushes
             /// <returns>
             /// The color
             /// </returns>
-            internal override TColor this[int x, int y]
+            internal override TPixel this[int x, int y]
             {
                 get
                 {
                     // Offset the requested pixel by the value in the rectangle (the shapes position)
-                    TColor result = this.Target[x, y];
+                    TPixel result = this.Target[x, y];
                     Vector4 background = result.ToVector4();
                     float distance = Vector4.DistanceSquared(background, this.sourceColor);
                     if (distance <= this.threshold)
@@ -122,7 +121,7 @@ namespace ImageSharp.Drawing.Brushes
                         float lerpAmount = (this.threshold - distance) / this.threshold;
                         Vector4 blended = Vector4BlendTransforms.PremultipliedLerp(
                             background,
-                            this.targetColor,
+                            this.targeTPixel,
                             lerpAmount);
                         result.PackFromVector4(blended);
                     }
@@ -162,12 +161,12 @@ namespace ImageSharp.Drawing.Brushes
                                 float lerpAmount = (this.threshold - distance) / this.threshold;
                                 sourceVector = Vector4BlendTransforms.PremultipliedLerp(
                                     sourceVector,
-                                    this.targetColor,
+                                    this.targeTPixel,
                                     lerpAmount);
 
                                 Vector4 finalColor = Vector4BlendTransforms.PremultipliedLerp(backgroundVector, sourceVector, opacity);
 
-                                TColor packed = default(TColor);
+                                TPixel packed = default(TPixel);
                                 packed.PackFromVector4(finalColor);
                                 this.Target[targetX, targetY] = packed;
                             }
diff --git a/src/ImageSharp.Drawing/Brushes/SolidBrush.cs b/src/ImageSharp.Drawing/Brushes/SolidBrush.cs
index 123d8a7e31..8a3ad50e7c 100644
--- a/src/ImageSharp.Drawing/Brushes/SolidBrush.cs
+++ b/src/ImageSharp.Drawing/Brushes/SolidBrush.cs
@@ -5,16 +5,18 @@
 
 namespace ImageSharp.Drawing.Brushes
 {
+    using ImageSharp.PixelFormats;
+
     /// <summary>
-    /// Provides an implementation of a solid brush for painting solid color areas. The brush uses <see cref="Color"/> for painting.
+    /// Provides an implementation of a solid brush for painting solid color areas. The brush uses <see cref="Rgba32"/> for painting.
     /// </summary>
-    public class SolidBrush : SolidBrush<Color>
+    public class SolidBrush : SolidBrush<Rgba32>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="SolidBrush" /> class.
         /// </summary>
         /// <param name="color">The color.</param>
-        public SolidBrush(Color color)
+        public SolidBrush(Rgba32 color)
             : base(color)
         {
         }
diff --git a/src/ImageSharp.Drawing/Brushes/SolidBrush{TColor}.cs b/src/ImageSharp.Drawing/Brushes/SolidBrush{TPixel}.cs
similarity index 79%
rename from src/ImageSharp.Drawing/Brushes/SolidBrush{TColor}.cs
rename to src/ImageSharp.Drawing/Brushes/SolidBrush{TPixel}.cs
index 74c7081b3b..634a2b70de 100644
--- a/src/ImageSharp.Drawing/Brushes/SolidBrush{TColor}.cs
+++ b/src/ImageSharp.Drawing/Brushes/SolidBrush{TPixel}.cs
@@ -1,32 +1,31 @@
-// <copyright file="SolidBrush{TColor}.cs" company="James Jackson-South">
+// <copyright file="SolidBrush{TPixel}.cs" company="James Jackson-South">
 // Copyright (c) James Jackson-South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
 namespace ImageSharp.Drawing.Brushes
 {
-    using System;
     using System.Numerics;
-
+    using ImageSharp.PixelFormats;
     using Processors;
 
     /// <summary>
     /// Provides an implementation of a solid brush for painting solid color areas.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    public class SolidBrush<TColor> : IBrush<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    public class SolidBrush<TPixel> : IBrush<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
         /// The color to paint.
         /// </summary>
-        private readonly TColor color;
+        private readonly TPixel color;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="SolidBrush{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="SolidBrush{TPixel}"/> class.
         /// </summary>
         /// <param name="color">The color.</param>
-        public SolidBrush(TColor color)
+        public SolidBrush(TPixel color)
         {
             this.color = color;
         }
@@ -37,10 +36,10 @@ namespace ImageSharp.Drawing.Brushes
         /// <value>
         /// The color.
         /// </value>
-        public TColor Color => this.color;
+        public TPixel Color => this.color;
 
         /// <inheritdoc />
-        public BrushApplicator<TColor> CreateApplicator(PixelAccessor<TColor> sourcePixels, RectangleF region)
+        public BrushApplicator<TPixel> CreateApplicator(PixelAccessor<TPixel> sourcePixels, RectangleF region)
         {
             return new SolidBrushApplicator(sourcePixels, this.color);
         }
@@ -48,12 +47,12 @@ namespace ImageSharp.Drawing.Brushes
         /// <summary>
         /// The solid brush applicator.
         /// </summary>
-        private class SolidBrushApplicator : BrushApplicator<TColor>
+        private class SolidBrushApplicator : BrushApplicator<TPixel>
         {
             /// <summary>
             /// The solid color.
             /// </summary>
-            private readonly TColor color;
+            private readonly TPixel color;
             private readonly Vector4 colorVector;
 
             /// <summary>
@@ -61,7 +60,7 @@ namespace ImageSharp.Drawing.Brushes
             /// </summary>
             /// <param name="color">The color.</param>
             /// <param name="sourcePixels">The sourcePixels.</param>
-            public SolidBrushApplicator(PixelAccessor<TColor> sourcePixels, TColor color)
+            public SolidBrushApplicator(PixelAccessor<TPixel> sourcePixels, TPixel color)
                 : base(sourcePixels)
             {
                 this.color = color;
@@ -76,7 +75,7 @@ namespace ImageSharp.Drawing.Brushes
             /// <returns>
             /// The color
             /// </returns>
-            internal override TColor this[int x, int y] => this.color;
+            internal override TPixel this[int x, int y] => this.color;
 
             /// <inheritdoc />
             public override void Dispose()
@@ -106,7 +105,7 @@ namespace ImageSharp.Drawing.Brushes
 
                             Vector4 finalColor = Vector4BlendTransforms.PremultipliedLerp(backgroundVector, sourceVector, opacity);
 
-                            TColor packed = default(TColor);
+                            TPixel packed = default(TPixel);
                             packed.PackFromVector4(finalColor);
                             this.Target[targetX, targetY] = packed;
                         }
diff --git a/src/ImageSharp.Drawing/DrawImage.cs b/src/ImageSharp.Drawing/DrawImage.cs
index 16582e7ee5..6a4f49337c 100644
--- a/src/ImageSharp.Drawing/DrawImage.cs
+++ b/src/ImageSharp.Drawing/DrawImage.cs
@@ -5,9 +5,8 @@
 
 namespace ImageSharp
 {
-    using System;
-
     using Drawing.Processors;
+    using ImageSharp.PixelFormats;
 
     /// <summary>
     /// Extension methods for the <see cref="Image"/> type.
@@ -17,13 +16,13 @@ namespace ImageSharp
         /// <summary>
         /// Draws the given image together with the current one by blending their pixels.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="image">The image to blend with the currently processing image.</param>
         /// <param name="percent">The opacity of the image image to blend. Must be between 0 and 100.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Blend<TColor>(this Image<TColor> source, Image<TColor> image, int percent = 50)
-            where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Blend<TPixel>(this Image<TPixel> source, Image<TPixel> image, int percent = 50)
+            where TPixel : struct, IPixel<TPixel>
         {
             return DrawImage(source, image, percent, default(Size), default(Point));
         }
@@ -33,13 +32,13 @@ namespace ImageSharp
         /// </summary>
         /// <param name="source">The image this method extends.</param>
         /// <param name="image">The image to blend with the currently processing image.</param>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="percent">The opacity of the image image to blend. Must be between 0 and 100.</param>
         /// <param name="size">The size to draw the blended image.</param>
         /// <param name="location">The location to draw the blended image.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> DrawImage<TColor>(this Image<TColor> source, Image<TColor> image, int percent, Size size, Point location)
-            where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> DrawImage<TPixel>(this Image<TPixel> source, Image<TPixel> image, int percent, Size size, Point location)
+            where TPixel : struct, IPixel<TPixel>
         {
             if (size == default(Size))
             {
@@ -51,7 +50,7 @@ namespace ImageSharp
                 location = Point.Empty;
             }
 
-            source.ApplyProcessor(new DrawImageProcessor<TColor>(image, size, location, percent), source.Bounds);
+            source.ApplyProcessor(new DrawImageProcessor<TPixel>(image, size, location, percent), source.Bounds);
             return source;
         }
     }
diff --git a/src/ImageSharp.Drawing/DrawPath.cs b/src/ImageSharp.Drawing/DrawPath.cs
index e91b972033..09d3dbb028 100644
--- a/src/ImageSharp.Drawing/DrawPath.cs
+++ b/src/ImageSharp.Drawing/DrawPath.cs
@@ -5,43 +5,42 @@
 
 namespace ImageSharp
 {
-    using System;
-
     using Drawing;
     using Drawing.Brushes;
     using Drawing.Pens;
     using Drawing.Processors;
+    using ImageSharp.PixelFormats;
 
     /// <summary>
-    /// Extension methods for the <see cref="Image{TColor}"/> type.
+    /// Extension methods for the <see cref="Image{TPixel}"/> type.
     /// </summary>
     public static partial class ImageExtensions
     {
         /// <summary>
         /// Draws the outline of the region with the provided pen.
         /// </summary>
-        /// <typeparam name="TColor">The type of the color.</typeparam>
+        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="pen">The pen.</param>
         /// <param name="path">The path.</param>
         /// <param name="options">The options.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Draw<TColor>(this Image<TColor> source, IPen<TColor> pen, Drawable path, GraphicsOptions options)
-           where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Draw<TPixel>(this Image<TPixel> source, IPen<TPixel> pen, Drawable path, GraphicsOptions options)
+           where TPixel : struct, IPixel<TPixel>
         {
-            return source.Apply(new DrawPathProcessor<TColor>(pen, path, options));
+            return source.Apply(new DrawPathProcessor<TPixel>(pen, path, options));
         }
 
         /// <summary>
         /// Draws the outline of the polygon with the provided pen.
         /// </summary>
-        /// <typeparam name="TColor">The type of the color.</typeparam>
+        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="pen">The pen.</param>
         /// <param name="path">The path.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Draw<TColor>(this Image<TColor> source, IPen<TColor> pen, Drawable path)
-           where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Draw<TPixel>(this Image<TPixel> source, IPen<TPixel> pen, Drawable path)
+           where TPixel : struct, IPixel<TPixel>
         {
             return source.Draw(pen, path, GraphicsOptions.Default);
         }
@@ -49,63 +48,63 @@ namespace ImageSharp
         /// <summary>
         /// Draws the outline of the polygon with the provided brush at the provided thickness.
         /// </summary>
-        /// <typeparam name="TColor">The type of the color.</typeparam>
+        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="brush">The brush.</param>
         /// <param name="thickness">The thickness.</param>
         /// <param name="path">The path.</param>
         /// <param name="options">The options.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Draw<TColor>(this Image<TColor> source, IBrush<TColor> brush, float thickness, Drawable path, GraphicsOptions options)
-           where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Draw<TPixel>(this Image<TPixel> source, IBrush<TPixel> brush, float thickness, Drawable path, GraphicsOptions options)
+           where TPixel : struct, IPixel<TPixel>
         {
-            return source.Draw(new Pen<TColor>(brush, thickness), path, options);
+            return source.Draw(new Pen<TPixel>(brush, thickness), path, options);
         }
 
         /// <summary>
         /// Draws the outline of the polygon with the provided brush at the provided thickness.
         /// </summary>
-        /// <typeparam name="TColor">The type of the color.</typeparam>
+        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="brush">The brush.</param>
         /// <param name="thickness">The thickness.</param>
         /// <param name="path">The path.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Draw<TColor>(this Image<TColor> source, IBrush<TColor> brush, float thickness, Drawable path)
-           where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Draw<TPixel>(this Image<TPixel> source, IBrush<TPixel> brush, float thickness, Drawable path)
+           where TPixel : struct, IPixel<TPixel>
         {
-            return source.Draw(new Pen<TColor>(brush, thickness), path);
+            return source.Draw(new Pen<TPixel>(brush, thickness), path);
         }
 
         /// <summary>
         /// Draws the outline of the polygon with the provided brush at the provided thickness.
         /// </summary>
-        /// <typeparam name="TColor">The type of the color.</typeparam>
+        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="color">The color.</param>
         /// <param name="thickness">The thickness.</param>
         /// <param name="path">The path.</param>
         /// <param name="options">The options.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Draw<TColor>(this Image<TColor> source, TColor color, float thickness, Drawable path, GraphicsOptions options)
-           where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Draw<TPixel>(this Image<TPixel> source, TPixel color, float thickness, Drawable path, GraphicsOptions options)
+           where TPixel : struct, IPixel<TPixel>
         {
-            return source.Draw(new SolidBrush<TColor>(color), thickness, path, options);
+            return source.Draw(new SolidBrush<TPixel>(color), thickness, path, options);
         }
 
         /// <summary>
         /// Draws the outline of the polygon with the provided brush at the provided thickness.
         /// </summary>
-        /// <typeparam name="TColor">The type of the color.</typeparam>
+        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="color">The color.</param>
         /// <param name="thickness">The thickness.</param>
         /// <param name="path">The path.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Draw<TColor>(this Image<TColor> source, TColor color, float thickness, Drawable path)
-           where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Draw<TPixel>(this Image<TPixel> source, TPixel color, float thickness, Drawable path)
+           where TPixel : struct, IPixel<TPixel>
         {
-            return source.Draw(new SolidBrush<TColor>(color), thickness, path);
+            return source.Draw(new SolidBrush<TPixel>(color), thickness, path);
         }
     }
 }
diff --git a/src/ImageSharp.Drawing/FillRegion.cs b/src/ImageSharp.Drawing/FillRegion.cs
index 8aab202519..f29c37a67f 100644
--- a/src/ImageSharp.Drawing/FillRegion.cs
+++ b/src/ImageSharp.Drawing/FillRegion.cs
@@ -5,68 +5,67 @@
 
 namespace ImageSharp
 {
-    using System;
-
     using Drawing;
     using Drawing.Brushes;
     using Drawing.Processors;
+    using ImageSharp.PixelFormats;
 
     /// <summary>
-    /// Extension methods for the <see cref="Image{TColor}"/> type.
+    /// Extension methods for the <see cref="Image{TPixel}"/> type.
     /// </summary>
     public static partial class ImageExtensions
     {
         /// <summary>
         /// Flood fills the image with the specified brush.
         /// </summary>
-        /// <typeparam name="TColor">The type of the color.</typeparam>
+        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="brush">The details how to fill the region of interest.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Fill<TColor>(this Image<TColor> source, IBrush<TColor> brush)
-            where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Fill<TPixel>(this Image<TPixel> source, IBrush<TPixel> brush)
+            where TPixel : struct, IPixel<TPixel>
         {
-            return source.Apply(new FillProcessor<TColor>(brush));
+            return source.Apply(new FillProcessor<TPixel>(brush));
         }
 
         /// <summary>
         /// Flood fills the image with the specified color.
         /// </summary>
-        /// <typeparam name="TColor">The type of the color.</typeparam>
+        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="color">The color.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Fill<TColor>(this Image<TColor> source, TColor color)
-            where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Fill<TPixel>(this Image<TPixel> source, TPixel color)
+            where TPixel : struct, IPixel<TPixel>
         {
-            return source.Fill(new SolidBrush<TColor>(color));
+            return source.Fill(new SolidBrush<TPixel>(color));
         }
 
         /// <summary>
         /// Flood fills the image with in the region with the specified brush.
         /// </summary>
-        /// <typeparam name="TColor">The type of the color.</typeparam>
+        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="brush">The brush.</param>
         /// <param name="region">The region.</param>
         /// <param name="options">The graphics options.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Fill<TColor>(this Image<TColor> source, IBrush<TColor> brush, Region region, GraphicsOptions options)
-          where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Fill<TPixel>(this Image<TPixel> source, IBrush<TPixel> brush, Region region, GraphicsOptions options)
+          where TPixel : struct, IPixel<TPixel>
         {
-            return source.Apply(new FillRegionProcessor<TColor>(brush, region, options));
+            return source.Apply(new FillRegionProcessor<TPixel>(brush, region, options));
         }
 
         /// <summary>
         /// Flood fills the image with in the region with the specified brush.
         /// </summary>
-        /// <typeparam name="TColor">The type of the color.</typeparam>
+        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="brush">The brush.</param>
         /// <param name="region">The region.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Fill<TColor>(this Image<TColor> source, IBrush<TColor> brush, Region region)
-          where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Fill<TPixel>(this Image<TPixel> source, IBrush<TPixel> brush, Region region)
+          where TPixel : struct, IPixel<TPixel>
         {
             return source.Fill(brush, region, GraphicsOptions.Default);
         }
@@ -74,30 +73,30 @@ namespace ImageSharp
         /// <summary>
         /// Flood fills the image with in the region with the specified color.
         /// </summary>
-        /// <typeparam name="TColor">The type of the color.</typeparam>
+        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="color">The color.</param>
         /// <param name="region">The region.</param>
         /// <param name="options">The options.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Fill<TColor>(this Image<TColor> source, TColor color, Region region, GraphicsOptions options)
-          where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Fill<TPixel>(this Image<TPixel> source, TPixel color, Region region, GraphicsOptions options)
+          where TPixel : struct, IPixel<TPixel>
         {
-            return source.Fill(new SolidBrush<TColor>(color), region, options);
+            return source.Fill(new SolidBrush<TPixel>(color), region, options);
         }
 
         /// <summary>
         /// Flood fills the image with in the region with the specified color.
         /// </summary>
-        /// <typeparam name="TColor">The type of the color.</typeparam>
+        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="color">The color.</param>
         /// <param name="region">The region.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Fill<TColor>(this Image<TColor> source, TColor color, Region region)
-          where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Fill<TPixel>(this Image<TPixel> source, TPixel color, Region region)
+          where TPixel : struct, IPixel<TPixel>
         {
-            return source.Fill(new SolidBrush<TColor>(color), region);
+            return source.Fill(new SolidBrush<TPixel>(color), region);
         }
     }
 }
diff --git a/src/ImageSharp.Drawing/ImageSharp.Drawing.csproj b/src/ImageSharp.Drawing/ImageSharp.Drawing.csproj
index c4515db375..7c483712d2 100644
--- a/src/ImageSharp.Drawing/ImageSharp.Drawing.csproj
+++ b/src/ImageSharp.Drawing/ImageSharp.Drawing.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Description>An extension to ImageSharp that allows the drawing of images, paths, and text.</Description>
     <AssemblyTitle>ImageSharp.Drawing</AssemblyTitle>
-    <VersionPrefix>1.0.0-alpha6</VersionPrefix>
+    <VersionPrefix>1.0.0-alpha7</VersionPrefix>
     <Authors>James Jackson-South and contributors</Authors>
     <TargetFramework>netstandard1.1</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
diff --git a/src/ImageSharp.Drawing/Paths/DrawBeziers.cs b/src/ImageSharp.Drawing/Paths/DrawBeziers.cs
index 936d5a9ce5..c4ea8c3785 100644
--- a/src/ImageSharp.Drawing/Paths/DrawBeziers.cs
+++ b/src/ImageSharp.Drawing/Paths/DrawBeziers.cs
@@ -5,92 +5,91 @@
 
 namespace ImageSharp
 {
-    using System;
     using System.Numerics;
     using Drawing;
     using Drawing.Brushes;
     using Drawing.Pens;
-
+    using ImageSharp.PixelFormats;
     using SixLabors.Shapes;
 
     /// <summary>
-    /// Extension methods for the <see cref="Image{TColor}"/> type.
+    /// Extension methods for the <see cref="Image{TPixel}"/> type.
     /// </summary>
     public static partial class ImageExtensions
     {
         /// <summary>
         /// Draws the provided Points as an open Bezier path at the provided thickness with the supplied brush
         /// </summary>
-        /// <typeparam name="TColor">The type of the color.</typeparam>
+        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="brush">The brush.</param>
         /// <param name="thickness">The thickness.</param>
         /// <param name="points">The points.</param>
         /// <param name="options">The options.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> DrawBeziers<TColor>(this Image<TColor> source, IBrush<TColor> brush, float thickness, Vector2[] points, GraphicsOptions options)
-           where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> DrawBeziers<TPixel>(this Image<TPixel> source, IBrush<TPixel> brush, float thickness, Vector2[] points, GraphicsOptions options)
+           where TPixel : struct, IPixel<TPixel>
         {
-            return source.Draw(new Pen<TColor>(brush, thickness), new Path(new BezierLineSegment(points)), options);
+            return source.Draw(new Pen<TPixel>(brush, thickness), new Path(new BezierLineSegment(points)), options);
         }
 
         /// <summary>
         /// Draws the provided Points as an open Bezier path at the provided thickness with the supplied brush
         /// </summary>
-        /// <typeparam name="TColor">The type of the color.</typeparam>
+        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="brush">The brush.</param>
         /// <param name="thickness">The thickness.</param>
         /// <param name="points">The points.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> DrawBeziers<TColor>(this Image<TColor> source, IBrush<TColor> brush, float thickness, Vector2[] points)
-           where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> DrawBeziers<TPixel>(this Image<TPixel> source, IBrush<TPixel> brush, float thickness, Vector2[] points)
+           where TPixel : struct, IPixel<TPixel>
         {
-            return source.Draw(new Pen<TColor>(brush, thickness), new Path(new BezierLineSegment(points)));
+            return source.Draw(new Pen<TPixel>(brush, thickness), new Path(new BezierLineSegment(points)));
         }
 
         /// <summary>
         /// Draws the provided Points as an open Bezier path at the provided thickness with the supplied brush
         /// </summary>
-        /// <typeparam name="TColor">The type of the color.</typeparam>
+        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="color">The color.</param>
         /// <param name="thickness">The thickness.</param>
         /// <param name="points">The points.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> DrawBeziers<TColor>(this Image<TColor> source, TColor color, float thickness, Vector2[] points)
-           where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> DrawBeziers<TPixel>(this Image<TPixel> source, TPixel color, float thickness, Vector2[] points)
+           where TPixel : struct, IPixel<TPixel>
         {
-            return source.DrawBeziers(new SolidBrush<TColor>(color), thickness, points);
+            return source.DrawBeziers(new SolidBrush<TPixel>(color), thickness, points);
         }
 
         /// <summary>
         /// Draws the provided Points as an open Bezier path at the provided thickness with the supplied brush
         /// </summary>
-        /// <typeparam name="TColor">The type of the color.</typeparam>
+        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="color">The color.</param>
         /// <param name="thickness">The thickness.</param>
         /// <param name="points">The points.</param>
         /// <param name="options">The options.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> DrawBeziers<TColor>(this Image<TColor> source, TColor color, float thickness, Vector2[] points, GraphicsOptions options)
-           where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> DrawBeziers<TPixel>(this Image<TPixel> source, TPixel color, float thickness, Vector2[] points, GraphicsOptions options)
+           where TPixel : struct, IPixel<TPixel>
         {
-            return source.DrawBeziers(new SolidBrush<TColor>(color), thickness, points, options);
+            return source.DrawBeziers(new SolidBrush<TPixel>(color), thickness, points, options);
         }
 
         /// <summary>
         /// Draws the provided Points as an open Bezier path with the supplied pen
         /// </summary>
-        /// <typeparam name="TColor">The type of the color.</typeparam>
+        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="pen">The pen.</param>
         /// <param name="points">The points.</param>
         /// <param name="options">The options.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> DrawBeziers<TColor>(this Image<TColor> source, IPen<TColor> pen, Vector2[] points, GraphicsOptions options)
-           where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> DrawBeziers<TPixel>(this Image<TPixel> source, IPen<TPixel> pen, Vector2[] points, GraphicsOptions options)
+           where TPixel : struct, IPixel<TPixel>
         {
             return source.Draw(pen, new Path(new BezierLineSegment(points)), options);
         }
@@ -98,13 +97,13 @@ namespace ImageSharp
         /// <summary>
         /// Draws the provided Points as an open Bezier path with the supplied pen
         /// </summary>
-        /// <typeparam name="TColor">The type of the color.</typeparam>
+        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="pen">The pen.</param>
         /// <param name="points">The points.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> DrawBeziers<TColor>(this Image<TColor> source, IPen<TColor> pen, Vector2[] points)
-           where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> DrawBeziers<TPixel>(this Image<TPixel> source, IPen<TPixel> pen, Vector2[] points)
+           where TPixel : struct, IPixel<TPixel>
         {
             return source.Draw(pen, new Path(new BezierLineSegment(points)));
         }
diff --git a/src/ImageSharp.Drawing/Paths/DrawLines.cs b/src/ImageSharp.Drawing/Paths/DrawLines.cs
index 42f4406e83..e8c463638f 100644
--- a/src/ImageSharp.Drawing/Paths/DrawLines.cs
+++ b/src/ImageSharp.Drawing/Paths/DrawLines.cs
@@ -5,92 +5,91 @@
 
 namespace ImageSharp
 {
-    using System;
     using System.Numerics;
     using Drawing;
     using Drawing.Brushes;
     using Drawing.Pens;
-
+    using ImageSharp.PixelFormats;
     using SixLabors.Shapes;
 
     /// <summary>
-    /// Extension methods for the <see cref="Image{TColor}"/> type.
+    /// Extension methods for the <see cref="Image{TPixel}"/> type.
     /// </summary>
     public static partial class ImageExtensions
     {
         /// <summary>
         /// Draws the provided Points as an open Linear path at the provided thickness with the supplied brush
         /// </summary>
-        /// <typeparam name="TColor">The type of the color.</typeparam>
+        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="brush">The brush.</param>
         /// <param name="thickness">The thickness.</param>
         /// <param name="points">The points.</param>
         /// <param name="options">The options.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> DrawLines<TColor>(this Image<TColor> source, IBrush<TColor> brush, float thickness, Vector2[] points, GraphicsOptions options)
-           where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> DrawLines<TPixel>(this Image<TPixel> source, IBrush<TPixel> brush, float thickness, Vector2[] points, GraphicsOptions options)
+           where TPixel : struct, IPixel<TPixel>
         {
-            return source.Draw(new Pen<TColor>(brush, thickness), new Path(new LinearLineSegment(points)), options);
+            return source.Draw(new Pen<TPixel>(brush, thickness), new Path(new LinearLineSegment(points)), options);
         }
 
         /// <summary>
         /// Draws the provided Points as an open Linear path at the provided thickness with the supplied brush
         /// </summary>
-        /// <typeparam name="TColor">The type of the color.</typeparam>
+        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="brush">The brush.</param>
         /// <param name="thickness">The thickness.</param>
         /// <param name="points">The points.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> DrawLines<TColor>(this Image<TColor> source, IBrush<TColor> brush, float thickness, Vector2[] points)
-           where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> DrawLines<TPixel>(this Image<TPixel> source, IBrush<TPixel> brush, float thickness, Vector2[] points)
+           where TPixel : struct, IPixel<TPixel>
         {
-            return source.Draw(new Pen<TColor>(brush, thickness), new Path(new LinearLineSegment(points)));
+            return source.Draw(new Pen<TPixel>(brush, thickness), new Path(new LinearLineSegment(points)));
         }
 
         /// <summary>
         /// Draws the provided Points as an open Linear path at the provided thickness with the supplied brush
         /// </summary>
-        /// <typeparam name="TColor">The type of the color.</typeparam>
+        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="color">The color.</param>
         /// <param name="thickness">The thickness.</param>
         /// <param name="points">The points.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> DrawLines<TColor>(this Image<TColor> source, TColor color, float thickness, Vector2[] points)
-           where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> DrawLines<TPixel>(this Image<TPixel> source, TPixel color, float thickness, Vector2[] points)
+           where TPixel : struct, IPixel<TPixel>
         {
-            return source.DrawLines(new SolidBrush<TColor>(color), thickness, points);
+            return source.DrawLines(new SolidBrush<TPixel>(color), thickness, points);
         }
 
         /// <summary>
         /// Draws the provided Points as an open Linear path at the provided thickness with the supplied brush
         /// </summary>
-        /// <typeparam name="TColor">The type of the color.</typeparam>
+        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="color">The color.</param>
         /// <param name="thickness">The thickness.</param>
         /// <param name="points">The points.</param>
         /// <param name="options">The options.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>>
-        public static Image<TColor> DrawLines<TColor>(this Image<TColor> source, TColor color, float thickness, Vector2[] points, GraphicsOptions options)
-           where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>>
+        public static Image<TPixel> DrawLines<TPixel>(this Image<TPixel> source, TPixel color, float thickness, Vector2[] points, GraphicsOptions options)
+           where TPixel : struct, IPixel<TPixel>
         {
-            return source.DrawLines(new SolidBrush<TColor>(color), thickness, points, options);
+            return source.DrawLines(new SolidBrush<TPixel>(color), thickness, points, options);
         }
 
         /// <summary>
         /// Draws the provided Points as an open Linear path with the supplied pen
         /// </summary>
-        /// <typeparam name="TColor">The type of the color.</typeparam>
+        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="pen">The pen.</param>
         /// <param name="points">The points.</param>
         /// <param name="options">The options.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> DrawLines<TColor>(this Image<TColor> source, IPen<TColor> pen, Vector2[] points, GraphicsOptions options)
-           where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> DrawLines<TPixel>(this Image<TPixel> source, IPen<TPixel> pen, Vector2[] points, GraphicsOptions options)
+           where TPixel : struct, IPixel<TPixel>
         {
             return source.Draw(pen, new Path(new LinearLineSegment(points)), options);
         }
@@ -98,13 +97,13 @@ namespace ImageSharp
         /// <summary>
         /// Draws the provided Points as an open Linear path with the supplied pen
         /// </summary>
-        /// <typeparam name="TColor">The type of the color.</typeparam>
+        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="pen">The pen.</param>
         /// <param name="points">The points.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> DrawLines<TColor>(this Image<TColor> source, IPen<TColor> pen, Vector2[] points)
-           where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> DrawLines<TPixel>(this Image<TPixel> source, IPen<TPixel> pen, Vector2[] points)
+           where TPixel : struct, IPixel<TPixel>
         {
             return source.Draw(pen, new Path(new LinearLineSegment(points)));
         }
diff --git a/src/ImageSharp.Drawing/Paths/DrawPath.cs b/src/ImageSharp.Drawing/Paths/DrawPath.cs
index e2c1442de8..176539663c 100644
--- a/src/ImageSharp.Drawing/Paths/DrawPath.cs
+++ b/src/ImageSharp.Drawing/Paths/DrawPath.cs
@@ -5,30 +5,28 @@
 
 namespace ImageSharp
 {
-    using System;
-
     using Drawing;
     using Drawing.Brushes;
     using Drawing.Pens;
-
+    using ImageSharp.PixelFormats;
     using SixLabors.Shapes;
 
     /// <summary>
-    /// Extension methods for the <see cref="Image{TColor}"/> type.
+    /// Extension methods for the <see cref="Image{TPixel}"/> type.
     /// </summary>
     public static partial class ImageExtensions
     {
         /// <summary>
         /// Draws the outline of the polygon with the provided pen.
         /// </summary>
-        /// <typeparam name="TColor">The type of the color.</typeparam>
+        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="pen">The pen.</param>
         /// <param name="path">The path.</param>
         /// <param name="options">The options.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Draw<TColor>(this Image<TColor> source, IPen<TColor> pen, IPath path, GraphicsOptions options)
-           where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Draw<TPixel>(this Image<TPixel> source, IPen<TPixel> pen, IPath path, GraphicsOptions options)
+           where TPixel : struct, IPixel<TPixel>
         {
             return source.Draw(pen, new ShapePath(path), options);
         }
@@ -36,13 +34,13 @@ namespace ImageSharp
         /// <summary>
         /// Draws the outline of the polygon with the provided pen.
         /// </summary>
-        /// <typeparam name="TColor">The type of the color.</typeparam>
+        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="pen">The pen.</param>
         /// <param name="path">The path.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Draw<TColor>(this Image<TColor> source, IPen<TColor> pen, IPath path)
-           where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Draw<TPixel>(this Image<TPixel> source, IPen<TPixel> pen, IPath path)
+           where TPixel : struct, IPixel<TPixel>
         {
             return source.Draw(pen, path, GraphicsOptions.Default);
         }
@@ -50,63 +48,63 @@ namespace ImageSharp
         /// <summary>
         /// Draws the outline of the polygon with the provided brush at the provided thickness.
         /// </summary>
-        /// <typeparam name="TColor">The type of the color.</typeparam>
+        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="brush">The brush.</param>
         /// <param name="thickness">The thickness.</param>
         /// <param name="path">The shape.</param>
         /// <param name="options">The options.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Draw<TColor>(this Image<TColor> source, IBrush<TColor> brush, float thickness, IPath path, GraphicsOptions options)
-           where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Draw<TPixel>(this Image<TPixel> source, IBrush<TPixel> brush, float thickness, IPath path, GraphicsOptions options)
+           where TPixel : struct, IPixel<TPixel>
         {
-            return source.Draw(new Pen<TColor>(brush, thickness), path, options);
+            return source.Draw(new Pen<TPixel>(brush, thickness), path, options);
         }
 
         /// <summary>
         /// Draws the outline of the polygon with the provided brush at the provided thickness.
         /// </summary>
-        /// <typeparam name="TColor">The type of the color.</typeparam>
+        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="brush">The brush.</param>
         /// <param name="thickness">The thickness.</param>
         /// <param name="path">The path.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Draw<TColor>(this Image<TColor> source, IBrush<TColor> brush, float thickness, IPath path)
-           where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Draw<TPixel>(this Image<TPixel> source, IBrush<TPixel> brush, float thickness, IPath path)
+           where TPixel : struct, IPixel<TPixel>
         {
-            return source.Draw(new Pen<TColor>(brush, thickness), path);
+            return source.Draw(new Pen<TPixel>(brush, thickness), path);
         }
 
         /// <summary>
         /// Draws the outline of the polygon with the provided brush at the provided thickness.
         /// </summary>
-        /// <typeparam name="TColor">The type of the color.</typeparam>
+        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="color">The color.</param>
         /// <param name="thickness">The thickness.</param>
         /// <param name="path">The path.</param>
         /// <param name="options">The options.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Draw<TColor>(this Image<TColor> source, TColor color, float thickness, IPath path, GraphicsOptions options)
-           where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Draw<TPixel>(this Image<TPixel> source, TPixel color, float thickness, IPath path, GraphicsOptions options)
+           where TPixel : struct, IPixel<TPixel>
         {
-            return source.Draw(new SolidBrush<TColor>(color), thickness, path, options);
+            return source.Draw(new SolidBrush<TPixel>(color), thickness, path, options);
         }
 
         /// <summary>
         /// Draws the outline of the polygon with the provided brush at the provided thickness.
         /// </summary>
-        /// <typeparam name="TColor">The type of the color.</typeparam>
+        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="color">The color.</param>
         /// <param name="thickness">The thickness.</param>
         /// <param name="path">The path.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Draw<TColor>(this Image<TColor> source, TColor color, float thickness, IPath path)
-           where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Draw<TPixel>(this Image<TPixel> source, TPixel color, float thickness, IPath path)
+           where TPixel : struct, IPixel<TPixel>
         {
-            return source.Draw(new SolidBrush<TColor>(color), thickness, path);
+            return source.Draw(new SolidBrush<TPixel>(color), thickness, path);
         }
     }
 }
diff --git a/src/ImageSharp.Drawing/Paths/DrawPolygon.cs b/src/ImageSharp.Drawing/Paths/DrawPolygon.cs
index 8043d18e56..4b99e60c02 100644
--- a/src/ImageSharp.Drawing/Paths/DrawPolygon.cs
+++ b/src/ImageSharp.Drawing/Paths/DrawPolygon.cs
@@ -5,91 +5,90 @@
 
 namespace ImageSharp
 {
-    using System;
     using System.Numerics;
     using Drawing;
     using Drawing.Brushes;
     using Drawing.Pens;
-
+    using ImageSharp.PixelFormats;
     using SixLabors.Shapes;
 
     /// <summary>
-    /// Extension methods for the <see cref="Image{TColor}"/> type.
+    /// Extension methods for the <see cref="Image{TPixel}"/> type.
     /// </summary>
     public static partial class ImageExtensions
     {
         /// <summary>
         /// Draws the provided Points as a closed Linear Polygon with the provided brush at the provided thickness.
         /// </summary>
-        /// <typeparam name="TColor">The type of the color.</typeparam>
+        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="brush">The brush.</param>
         /// <param name="thickness">The thickness.</param>
         /// <param name="points">The points.</param>
         /// <param name="options">The options.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> DrawPolygon<TColor>(this Image<TColor> source, IBrush<TColor> brush, float thickness, Vector2[] points, GraphicsOptions options)
-           where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> DrawPolygon<TPixel>(this Image<TPixel> source, IBrush<TPixel> brush, float thickness, Vector2[] points, GraphicsOptions options)
+           where TPixel : struct, IPixel<TPixel>
         {
-            return source.Draw(new Pen<TColor>(brush, thickness), new Polygon(new LinearLineSegment(points)), options);
+            return source.Draw(new Pen<TPixel>(brush, thickness), new Polygon(new LinearLineSegment(points)), options);
         }
 
         /// <summary>
         /// Draws the provided Points as a closed Linear Polygon with the provided brush at the provided thickness.
         /// </summary>
-        /// <typeparam name="TColor">The type of the color.</typeparam>
+        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="brush">The brush.</param>
         /// <param name="thickness">The thickness.</param>
         /// <param name="points">The points.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> DrawPolygon<TColor>(this Image<TColor> source, IBrush<TColor> brush, float thickness, Vector2[] points)
-           where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> DrawPolygon<TPixel>(this Image<TPixel> source, IBrush<TPixel> brush, float thickness, Vector2[] points)
+           where TPixel : struct, IPixel<TPixel>
         {
-            return source.Draw(new Pen<TColor>(brush, thickness), new Polygon(new LinearLineSegment(points)));
+            return source.Draw(new Pen<TPixel>(brush, thickness), new Polygon(new LinearLineSegment(points)));
         }
 
         /// <summary>
         /// Draws the provided Points as a closed Linear Polygon with the provided brush at the provided thickness.
         /// </summary>
-        /// <typeparam name="TColor">The type of the color.</typeparam>
+        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="color">The color.</param>
         /// <param name="thickness">The thickness.</param>
         /// <param name="points">The points.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> DrawPolygon<TColor>(this Image<TColor> source, TColor color, float thickness, Vector2[] points)
-           where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> DrawPolygon<TPixel>(this Image<TPixel> source, TPixel color, float thickness, Vector2[] points)
+           where TPixel : struct, IPixel<TPixel>
         {
-            return source.DrawPolygon(new SolidBrush<TColor>(color), thickness, points);
+            return source.DrawPolygon(new SolidBrush<TPixel>(color), thickness, points);
         }
 
         /// <summary>
         /// Draws the provided Points as a closed Linear Polygon with the provided brush at the provided thickness.
         /// </summary>
-        /// <typeparam name="TColor">The type of the color.</typeparam>
+        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="color">The color.</param>
         /// <param name="thickness">The thickness.</param>
         /// <param name="points">The points.</param>
         /// <param name="options">The options.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> DrawPolygon<TColor>(this Image<TColor> source, TColor color, float thickness, Vector2[] points, GraphicsOptions options)
-           where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> DrawPolygon<TPixel>(this Image<TPixel> source, TPixel color, float thickness, Vector2[] points, GraphicsOptions options)
+           where TPixel : struct, IPixel<TPixel>
         {
-            return source.DrawPolygon(new SolidBrush<TColor>(color), thickness, points, options);
+            return source.DrawPolygon(new SolidBrush<TPixel>(color), thickness, points, options);
         }
 
         /// <summary>
         /// Draws the provided Points as a closed Linear Polygon with the provided Pen.
         /// </summary>
-        /// <typeparam name="TColor">The type of the color.</typeparam>
+        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="pen">The pen.</param>
         /// <param name="points">The points.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> DrawPolygon<TColor>(this Image<TColor> source, IPen<TColor> pen, Vector2[] points)
-           where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> DrawPolygon<TPixel>(this Image<TPixel> source, IPen<TPixel> pen, Vector2[] points)
+           where TPixel : struct, IPixel<TPixel>
         {
             return source.Draw(pen, new Polygon(new LinearLineSegment(points)), GraphicsOptions.Default);
         }
@@ -97,14 +96,14 @@ namespace ImageSharp
         /// <summary>
         /// Draws the provided Points as a closed Linear Polygon with the provided Pen.
         /// </summary>
-        /// <typeparam name="TColor">The type of the color.</typeparam>
+        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="pen">The pen.</param>
         /// <param name="points">The points.</param>
         /// <param name="options">The options.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> DrawPolygon<TColor>(this Image<TColor> source, IPen<TColor> pen, Vector2[] points, GraphicsOptions options)
-           where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> DrawPolygon<TPixel>(this Image<TPixel> source, IPen<TPixel> pen, Vector2[] points, GraphicsOptions options)
+           where TPixel : struct, IPixel<TPixel>
         {
             return source.Draw(pen, new Polygon(new LinearLineSegment(points)), options);
         }
diff --git a/src/ImageSharp.Drawing/Paths/DrawRectangle.cs b/src/ImageSharp.Drawing/Paths/DrawRectangle.cs
index b356652409..0fefc6cab4 100644
--- a/src/ImageSharp.Drawing/Paths/DrawRectangle.cs
+++ b/src/ImageSharp.Drawing/Paths/DrawRectangle.cs
@@ -5,28 +5,27 @@
 
 namespace ImageSharp
 {
-    using System;
-
     using Drawing;
     using Drawing.Brushes;
     using Drawing.Pens;
+    using ImageSharp.PixelFormats;
 
     /// <summary>
-    /// Extension methods for the <see cref="Image{TColor}"/> type.
+    /// Extension methods for the <see cref="Image{TPixel}"/> type.
     /// </summary>
     public static partial class ImageExtensions
     {
         /// <summary>
         /// Draws the outline of the polygon with the provided pen.
         /// </summary>
-        /// <typeparam name="TColor">The type of the color.</typeparam>
+        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="pen">The pen.</param>
         /// <param name="shape">The shape.</param>
         /// <param name="options">The options.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Draw<TColor>(this Image<TColor> source, IPen<TColor> pen, Rectangle shape, GraphicsOptions options)
-           where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Draw<TPixel>(this Image<TPixel> source, IPen<TPixel> pen, Rectangle shape, GraphicsOptions options)
+           where TPixel : struct, IPixel<TPixel>
         {
             return source.Draw(pen, new SixLabors.Shapes.Rectangle(shape.X, shape.Y, shape.Width, shape.Height), options);
         }
@@ -34,13 +33,13 @@ namespace ImageSharp
         /// <summary>
         /// Draws the outline of the polygon with the provided pen.
         /// </summary>
-        /// <typeparam name="TColor">The type of the color.</typeparam>
+        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="pen">The pen.</param>
         /// <param name="shape">The shape.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Draw<TColor>(this Image<TColor> source, IPen<TColor> pen, Rectangle shape)
-           where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Draw<TPixel>(this Image<TPixel> source, IPen<TPixel> pen, Rectangle shape)
+           where TPixel : struct, IPixel<TPixel>
         {
             return source.Draw(pen, shape, GraphicsOptions.Default);
         }
@@ -48,63 +47,63 @@ namespace ImageSharp
         /// <summary>
         /// Draws the outline of the polygon with the provided brush at the provided thickness.
         /// </summary>
-        /// <typeparam name="TColor">The type of the color.</typeparam>
+        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="brush">The brush.</param>
         /// <param name="thickness">The thickness.</param>
         /// <param name="shape">The shape.</param>
         /// <param name="options">The options.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Draw<TColor>(this Image<TColor> source, IBrush<TColor> brush, float thickness, Rectangle shape, GraphicsOptions options)
-           where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Draw<TPixel>(this Image<TPixel> source, IBrush<TPixel> brush, float thickness, Rectangle shape, GraphicsOptions options)
+           where TPixel : struct, IPixel<TPixel>
         {
-            return source.Draw(new Pen<TColor>(brush, thickness), shape, options);
+            return source.Draw(new Pen<TPixel>(brush, thickness), shape, options);
         }
 
         /// <summary>
         /// Draws the outline of the polygon with the provided brush at the provided thickness.
         /// </summary>
-        /// <typeparam name="TColor">The type of the color.</typeparam>
+        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="brush">The brush.</param>
         /// <param name="thickness">The thickness.</param>
         /// <param name="shape">The shape.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Draw<TColor>(this Image<TColor> source, IBrush<TColor> brush, float thickness, Rectangle shape)
-           where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Draw<TPixel>(this Image<TPixel> source, IBrush<TPixel> brush, float thickness, Rectangle shape)
+           where TPixel : struct, IPixel<TPixel>
         {
-            return source.Draw(new Pen<TColor>(brush, thickness), shape);
+            return source.Draw(new Pen<TPixel>(brush, thickness), shape);
         }
 
         /// <summary>
         /// Draws the outline of the polygon with the provided brush at the provided thickness.
         /// </summary>
-        /// <typeparam name="TColor">The type of the color.</typeparam>
+        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="color">The color.</param>
         /// <param name="thickness">The thickness.</param>
         /// <param name="shape">The shape.</param>
         /// <param name="options">The options.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Draw<TColor>(this Image<TColor> source, TColor color, float thickness, Rectangle shape, GraphicsOptions options)
-           where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Draw<TPixel>(this Image<TPixel> source, TPixel color, float thickness, Rectangle shape, GraphicsOptions options)
+           where TPixel : struct, IPixel<TPixel>
         {
-            return source.Draw(new SolidBrush<TColor>(color), thickness, shape, options);
+            return source.Draw(new SolidBrush<TPixel>(color), thickness, shape, options);
         }
 
         /// <summary>
         /// Draws the outline of the polygon with the provided brush at the provided thickness.
         /// </summary>
-        /// <typeparam name="TColor">The type of the color.</typeparam>
+        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="color">The color.</param>
         /// <param name="thickness">The thickness.</param>
         /// <param name="shape">The shape.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Draw<TColor>(this Image<TColor> source, TColor color, float thickness, Rectangle shape)
-           where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Draw<TPixel>(this Image<TPixel> source, TPixel color, float thickness, Rectangle shape)
+           where TPixel : struct, IPixel<TPixel>
         {
-            return source.Draw(new SolidBrush<TColor>(color), thickness, shape);
+            return source.Draw(new SolidBrush<TPixel>(color), thickness, shape);
         }
     }
 }
diff --git a/src/ImageSharp.Drawing/Paths/FillPaths.cs b/src/ImageSharp.Drawing/Paths/FillPaths.cs
index 92e227ce1f..f579c4ad02 100644
--- a/src/ImageSharp.Drawing/Paths/FillPaths.cs
+++ b/src/ImageSharp.Drawing/Paths/FillPaths.cs
@@ -5,29 +5,27 @@
 
 namespace ImageSharp
 {
-    using System;
-
     using Drawing;
     using Drawing.Brushes;
-
+    using ImageSharp.PixelFormats;
     using SixLabors.Shapes;
 
     /// <summary>
-    /// Extension methods for the <see cref="Image{TColor}"/> type.
+    /// Extension methods for the <see cref="Image{TPixel}"/> type.
     /// </summary>
     public static partial class ImageExtensions
     {
         /// <summary>
         /// Flood fills the image in the shape of the provided polygon with the specified brush..
         /// </summary>
-        /// <typeparam name="TColor">The type of the color.</typeparam>
+        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="brush">The brush.</param>
         /// <param name="path">The shape.</param>
         /// <param name="options">The graphics options.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Fill<TColor>(this Image<TColor> source, IBrush<TColor> brush, IPath path, GraphicsOptions options)
-          where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Fill<TPixel>(this Image<TPixel> source, IBrush<TPixel> brush, IPath path, GraphicsOptions options)
+          where TPixel : struct, IPixel<TPixel>
         {
             return source.Fill(brush, new ShapeRegion(path), options);
         }
@@ -35,13 +33,13 @@ namespace ImageSharp
         /// <summary>
         /// Flood fills the image in the shape of the provided polygon with the specified brush.
         /// </summary>
-        /// <typeparam name="TColor">The type of the color.</typeparam>
+        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="brush">The brush.</param>
         /// <param name="path">The path.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Fill<TColor>(this Image<TColor> source, IBrush<TColor> brush, IPath path)
-          where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Fill<TPixel>(this Image<TPixel> source, IBrush<TPixel> brush, IPath path)
+          where TPixel : struct, IPixel<TPixel>
         {
             return source.Fill(brush, new ShapeRegion(path), GraphicsOptions.Default);
         }
@@ -49,30 +47,30 @@ namespace ImageSharp
         /// <summary>
         /// Flood fills the image in the shape of the provided polygon with the specified brush..
         /// </summary>
-        /// <typeparam name="TColor">The type of the color.</typeparam>
+        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="color">The color.</param>
         /// <param name="path">The path.</param>
         /// <param name="options">The options.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Fill<TColor>(this Image<TColor> source, TColor color, IPath path, GraphicsOptions options)
-          where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Fill<TPixel>(this Image<TPixel> source, TPixel color, IPath path, GraphicsOptions options)
+          where TPixel : struct, IPixel<TPixel>
         {
-            return source.Fill(new SolidBrush<TColor>(color), path, options);
+            return source.Fill(new SolidBrush<TPixel>(color), path, options);
         }
 
         /// <summary>
         /// Flood fills the image in the shape of the provided polygon with the specified brush..
         /// </summary>
-        /// <typeparam name="TColor">The type of the color.</typeparam>
+        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="color">The color.</param>
         /// <param name="path">The path.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Fill<TColor>(this Image<TColor> source, TColor color, IPath path)
-          where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Fill<TPixel>(this Image<TPixel> source, TPixel color, IPath path)
+          where TPixel : struct, IPixel<TPixel>
         {
-            return source.Fill(new SolidBrush<TColor>(color), path);
+            return source.Fill(new SolidBrush<TPixel>(color), path);
         }
     }
 }
diff --git a/src/ImageSharp.Drawing/Paths/FillPolygon.cs b/src/ImageSharp.Drawing/Paths/FillPolygon.cs
index cd3d154666..3360cff13c 100644
--- a/src/ImageSharp.Drawing/Paths/FillPolygon.cs
+++ b/src/ImageSharp.Drawing/Paths/FillPolygon.cs
@@ -9,25 +9,25 @@ namespace ImageSharp
     using System.Numerics;
     using Drawing;
     using Drawing.Brushes;
-
+    using ImageSharp.PixelFormats;
     using SixLabors.Shapes;
 
     /// <summary>
-    /// Extension methods for the <see cref="Image{TColor}"/> type.
+    /// Extension methods for the <see cref="Image{TPixel}"/> type.
     /// </summary>
     public static partial class ImageExtensions
     {
         /// <summary>
         /// Flood fills the image in the shape of a Linear polygon described by the points
         /// </summary>
-        /// <typeparam name="TColor">The type of the color.</typeparam>
+        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="brush">The brush.</param>
         /// <param name="points">The points.</param>
         /// <param name="options">The options.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> FillPolygon<TColor>(this Image<TColor> source, IBrush<TColor> brush, Vector2[] points, GraphicsOptions options)
-           where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> FillPolygon<TPixel>(this Image<TPixel> source, IBrush<TPixel> brush, Vector2[] points, GraphicsOptions options)
+           where TPixel : struct, IPixel<TPixel>
         {
             return source.Fill(brush, new Polygon(new LinearLineSegment(points)), options);
         }
@@ -35,13 +35,13 @@ namespace ImageSharp
         /// <summary>
         /// Flood fills the image in the shape of a Linear polygon described by the points
         /// </summary>
-        /// <typeparam name="TColor">The type of the color.</typeparam>
+        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="brush">The brush.</param>
         /// <param name="points">The points.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> FillPolygon<TColor>(this Image<TColor> source, IBrush<TColor> brush, Vector2[] points)
-           where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> FillPolygon<TPixel>(this Image<TPixel> source, IBrush<TPixel> brush, Vector2[] points)
+           where TPixel : struct, IPixel<TPixel>
         {
             return source.Fill(brush, new Polygon(new LinearLineSegment(points)));
         }
@@ -49,30 +49,30 @@ namespace ImageSharp
         /// <summary>
         /// Flood fills the image in the shape of a Linear polygon described by the points
         /// </summary>
-        /// <typeparam name="TColor">The type of the color.</typeparam>
+        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="color">The color.</param>
         /// <param name="points">The points.</param>
         /// <param name="options">The options.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> FillPolygon<TColor>(this Image<TColor> source, TColor color, Vector2[] points, GraphicsOptions options)
-           where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> FillPolygon<TPixel>(this Image<TPixel> source, TPixel color, Vector2[] points, GraphicsOptions options)
+           where TPixel : struct, IPixel<TPixel>
         {
-            return source.Fill(new SolidBrush<TColor>(color), new Polygon(new LinearLineSegment(points)), options);
+            return source.Fill(new SolidBrush<TPixel>(color), new Polygon(new LinearLineSegment(points)), options);
         }
 
         /// <summary>
         /// Flood fills the image in the shape of a Linear polygon described by the points
         /// </summary>
-        /// <typeparam name="TColor">The type of the color.</typeparam>
+        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="color">The color.</param>
         /// <param name="points">The points.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> FillPolygon<TColor>(this Image<TColor> source, TColor color, Vector2[] points)
-           where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> FillPolygon<TPixel>(this Image<TPixel> source, TPixel color, Vector2[] points)
+           where TPixel : struct, IPixel<TPixel>
         {
-            return source.Fill(new SolidBrush<TColor>(color), new Polygon(new LinearLineSegment(points)));
+            return source.Fill(new SolidBrush<TPixel>(color), new Polygon(new LinearLineSegment(points)));
         }
     }
 }
diff --git a/src/ImageSharp.Drawing/Paths/FillRectangle.cs b/src/ImageSharp.Drawing/Paths/FillRectangle.cs
index 1928e54d3c..07ff4c69c5 100644
--- a/src/ImageSharp.Drawing/Paths/FillRectangle.cs
+++ b/src/ImageSharp.Drawing/Paths/FillRectangle.cs
@@ -5,27 +5,26 @@
 
 namespace ImageSharp
 {
-    using System;
-
     using Drawing;
     using Drawing.Brushes;
+    using ImageSharp.PixelFormats;
 
     /// <summary>
-    /// Extension methods for the <see cref="Image{TColor}"/> type.
+    /// Extension methods for the <see cref="Image{TPixel}"/> type.
     /// </summary>
     public static partial class ImageExtensions
     {
         /// <summary>
         /// Flood fills the image in the shape of the provided polygon with the specified brush..
         /// </summary>
-        /// <typeparam name="TColor">The type of the color.</typeparam>
+        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="brush">The brush.</param>
         /// <param name="shape">The shape.</param>
         /// <param name="options">The options.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Fill<TColor>(this Image<TColor> source, IBrush<TColor> brush, Rectangle shape, GraphicsOptions options)
-            where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Fill<TPixel>(this Image<TPixel> source, IBrush<TPixel> brush, Rectangle shape, GraphicsOptions options)
+            where TPixel : struct, IPixel<TPixel>
         {
             return source.Fill(brush, new SixLabors.Shapes.Rectangle(shape.X, shape.Y, shape.Width, shape.Height), options);
         }
@@ -33,13 +32,13 @@ namespace ImageSharp
         /// <summary>
         /// Flood fills the image in the shape of the provided polygon with the specified brush..
         /// </summary>
-        /// <typeparam name="TColor">The type of the color.</typeparam>
+        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="brush">The brush.</param>
         /// <param name="shape">The shape.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Fill<TColor>(this Image<TColor> source, IBrush<TColor> brush, Rectangle shape)
-            where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Fill<TPixel>(this Image<TPixel> source, IBrush<TPixel> brush, Rectangle shape)
+            where TPixel : struct, IPixel<TPixel>
         {
             return source.Fill(brush, new SixLabors.Shapes.Rectangle(shape.X, shape.Y, shape.Width, shape.Height));
         }
@@ -47,30 +46,30 @@ namespace ImageSharp
         /// <summary>
         /// Flood fills the image in the shape of the provided polygon with the specified brush..
         /// </summary>
-        /// <typeparam name="TColor">The type of the color.</typeparam>
+        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="color">The color.</param>
         /// <param name="shape">The shape.</param>
         /// <param name="options">The options.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Fill<TColor>(this Image<TColor> source, TColor color, Rectangle shape, GraphicsOptions options)
-          where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Fill<TPixel>(this Image<TPixel> source, TPixel color, Rectangle shape, GraphicsOptions options)
+          where TPixel : struct, IPixel<TPixel>
         {
-            return source.Fill(new SolidBrush<TColor>(color), shape, options);
+            return source.Fill(new SolidBrush<TPixel>(color), shape, options);
         }
 
         /// <summary>
         /// Flood fills the image in the shape of the provided polygon with the specified brush..
         /// </summary>
-        /// <typeparam name="TColor">The type of the color.</typeparam>
+        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="color">The color.</param>
         /// <param name="shape">The shape.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Fill<TColor>(this Image<TColor> source, TColor color, Rectangle shape)
-            where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Fill<TPixel>(this Image<TPixel> source, TPixel color, Rectangle shape)
+            where TPixel : struct, IPixel<TPixel>
         {
-            return source.Fill(new SolidBrush<TColor>(color), shape);
+            return source.Fill(new SolidBrush<TPixel>(color), shape);
         }
     }
 }
diff --git a/src/ImageSharp.Drawing/Pens/IPen.cs b/src/ImageSharp.Drawing/Pens/IPen.cs
index 72a5ffc367..31a609c8e0 100644
--- a/src/ImageSharp.Drawing/Pens/IPen.cs
+++ b/src/ImageSharp.Drawing/Pens/IPen.cs
@@ -5,15 +5,15 @@
 
 namespace ImageSharp.Drawing.Pens
 {
-    using System;
+    using ImageSharp.PixelFormats;
     using Processors;
 
     /// <summary>
     /// Interface representing a Pen
     /// </summary>
-    /// <typeparam name="TColor">The type of the color.</typeparam>
-    public interface IPen<TColor>
-            where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The type of the color.</typeparam>
+    public interface IPen<TPixel>
+            where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
         /// Creates the applicator for applying this pen to an Image
@@ -26,6 +26,6 @@ namespace ImageSharp.Drawing.Pens
         /// <remarks>
         /// The <paramref name="region" /> when being applied to things like shapes would usually be the bounding box of the shape not necessarily the shape of the whole image.
         /// </remarks>
-        PenApplicator<TColor> CreateApplicator(PixelAccessor<TColor> pixelSource, RectangleF region);
+        PenApplicator<TPixel> CreateApplicator(PixelAccessor<TPixel> pixelSource, RectangleF region);
     }
 }
diff --git a/src/ImageSharp.Drawing/Pens/Pen.cs b/src/ImageSharp.Drawing/Pens/Pen.cs
index 09fe89419c..a3cc3cbdf1 100644
--- a/src/ImageSharp.Drawing/Pens/Pen.cs
+++ b/src/ImageSharp.Drawing/Pens/Pen.cs
@@ -5,17 +5,19 @@
 
 namespace ImageSharp.Drawing.Pens
 {
+    using ImageSharp.PixelFormats;
+
     /// <summary>
-    /// Represents a <see cref="Pen{TColor}"/> in the <see cref="Color"/> color space.
+    /// Represents a <see cref="Pen{TPixel}"/> in the <see cref="Rgba32"/> color space.
     /// </summary>
-    public class Pen : Pen<Color>
+    public class Pen : Pen<Rgba32>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="Pen"/> class.
         /// </summary>
         /// <param name="color">The color.</param>
         /// <param name="width">The width.</param>
-        public Pen(Color color, float width)
+        public Pen(Rgba32 color, float width)
             : base(color, width)
         {
         }
@@ -25,7 +27,7 @@ namespace ImageSharp.Drawing.Pens
         /// </summary>
         /// <param name="brush">The brush.</param>
         /// <param name="width">The width.</param>
-        public Pen(IBrush<Color> brush, float width)
+        public Pen(IBrush<Rgba32> brush, float width)
             : base(brush, width)
         {
         }
@@ -36,7 +38,7 @@ namespace ImageSharp.Drawing.Pens
         /// <param name="brush">The brush.</param>
         /// <param name="width">The width.</param>
         /// <param name="pattern">The pattern.</param>
-        public Pen(IBrush<Color> brush, float width, float[] pattern)
+        public Pen(IBrush<Rgba32> brush, float width, float[] pattern)
             : base(brush, width, pattern)
         {
         }
@@ -45,7 +47,7 @@ namespace ImageSharp.Drawing.Pens
         /// Initializes a new instance of the <see cref="Pen"/> class.
         /// </summary>
         /// <param name="pen">The pen.</param>
-        internal Pen(Pen<Color> pen)
+        internal Pen(Pen<Rgba32> pen)
             : base(pen)
         {
         }
diff --git a/src/ImageSharp.Drawing/Pens/Pens.cs b/src/ImageSharp.Drawing/Pens/Pens.cs
index 039b7113ff..5c91df2261 100644
--- a/src/ImageSharp.Drawing/Pens/Pens.cs
+++ b/src/ImageSharp.Drawing/Pens/Pens.cs
@@ -5,6 +5,8 @@
 
 namespace ImageSharp.Drawing.Pens
 {
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// Common Pen styles
     /// </summary>
@@ -16,7 +18,7 @@ namespace ImageSharp.Drawing.Pens
         /// <param name="color">The color.</param>
         /// <param name="width">The width.</param>
         /// <returns>The Pen</returns>
-        public static Pen Solid(Color color, float width) => new Pen(color, width);
+        public static Pen Solid(Rgba32 color, float width) => new Pen(color, width);
 
         /// <summary>
         /// Create a solid pen with out any drawing patterns
@@ -24,7 +26,7 @@ namespace ImageSharp.Drawing.Pens
         /// <param name="brush">The brush.</param>
         /// <param name="width">The width.</param>
         /// <returns>The Pen</returns>
-        public static Pen Solid(IBrush<Color> brush, float width) => new Pen(brush, width);
+        public static Pen Solid(IBrush<Rgba32> brush, float width) => new Pen(brush, width);
 
         /// <summary>
         /// Create a pen with a 'Dash' drawing patterns
@@ -32,7 +34,7 @@ namespace ImageSharp.Drawing.Pens
         /// <param name="color">The color.</param>
         /// <param name="width">The width.</param>
         /// <returns>The Pen</returns>
-        public static Pen Dash(Color color, float width) => new Pen(Pens<Color>.Dash(color, width));
+        public static Pen Dash(Rgba32 color, float width) => new Pen(Pens<Rgba32>.Dash(color, width));
 
         /// <summary>
         /// Create a pen with a 'Dash' drawing patterns
@@ -40,7 +42,7 @@ namespace ImageSharp.Drawing.Pens
         /// <param name="brush">The brush.</param>
         /// <param name="width">The width.</param>
         /// <returns>The Pen</returns>
-        public static Pen Dash(IBrush<Color> brush, float width) => new Pen(Pens<Color>.Dash(brush, width));
+        public static Pen Dash(IBrush<Rgba32> brush, float width) => new Pen(Pens<Rgba32>.Dash(brush, width));
 
         /// <summary>
         /// Create a pen with a 'Dot' drawing patterns
@@ -48,7 +50,7 @@ namespace ImageSharp.Drawing.Pens
         /// <param name="color">The color.</param>
         /// <param name="width">The width.</param>
         /// <returns>The Pen</returns>
-        public static Pen Dot(Color color, float width) => new Pen(Pens<Color>.Dot(color, width));
+        public static Pen Dot(Rgba32 color, float width) => new Pen(Pens<Rgba32>.Dot(color, width));
 
         /// <summary>
         /// Create a pen with a 'Dot' drawing patterns
@@ -56,7 +58,7 @@ namespace ImageSharp.Drawing.Pens
         /// <param name="brush">The brush.</param>
         /// <param name="width">The width.</param>
         /// <returns>The Pen</returns>
-        public static Pen Dot(IBrush<Color> brush, float width) => new Pen(Pens<Color>.Dot(brush, width));
+        public static Pen Dot(IBrush<Rgba32> brush, float width) => new Pen(Pens<Rgba32>.Dot(brush, width));
 
         /// <summary>
         /// Create a pen with a 'Dash Dot' drawing patterns
@@ -64,7 +66,7 @@ namespace ImageSharp.Drawing.Pens
         /// <param name="color">The color.</param>
         /// <param name="width">The width.</param>
         /// <returns>The Pen</returns>
-        public static Pen DashDot(Color color, float width) => new Pen(Pens<Color>.DashDot(color, width));
+        public static Pen DashDot(Rgba32 color, float width) => new Pen(Pens<Rgba32>.DashDot(color, width));
 
         /// <summary>
         /// Create a pen with a 'Dash Dot' drawing patterns
@@ -72,7 +74,7 @@ namespace ImageSharp.Drawing.Pens
         /// <param name="brush">The brush.</param>
         /// <param name="width">The width.</param>
         /// <returns>The Pen</returns>
-        public static Pen DashDot(IBrush<Color> brush, float width) => new Pen(Pens<Color>.DashDot(brush, width));
+        public static Pen DashDot(IBrush<Rgba32> brush, float width) => new Pen(Pens<Rgba32>.DashDot(brush, width));
 
         /// <summary>
         /// Create a pen with a 'Dash Dot Dot' drawing patterns
@@ -80,7 +82,7 @@ namespace ImageSharp.Drawing.Pens
         /// <param name="color">The color.</param>
         /// <param name="width">The width.</param>
         /// <returns>The Pen</returns>
-        public static Pen DashDotDot(Color color, float width) => new Pen(Pens<Color>.DashDotDot(color, width));
+        public static Pen DashDotDot(Rgba32 color, float width) => new Pen(Pens<Rgba32>.DashDotDot(color, width));
 
         /// <summary>
         /// Create a pen with a 'Dash Dot Dot' drawing patterns
@@ -88,6 +90,6 @@ namespace ImageSharp.Drawing.Pens
         /// <param name="brush">The brush.</param>
         /// <param name="width">The width.</param>
         /// <returns>The Pen</returns>
-        public static Pen DashDotDot(IBrush<Color> brush, float width) => new Pen(Pens<Color>.DashDotDot(brush, width));
+        public static Pen DashDotDot(IBrush<Rgba32> brush, float width) => new Pen(Pens<Rgba32>.DashDotDot(brush, width));
     }
 }
\ No newline at end of file
diff --git a/src/ImageSharp.Drawing/Pens/Pens{TColor}.cs b/src/ImageSharp.Drawing/Pens/Pens{TPixel}.cs
similarity index 67%
rename from src/ImageSharp.Drawing/Pens/Pens{TColor}.cs
rename to src/ImageSharp.Drawing/Pens/Pens{TPixel}.cs
index 49eed370df..5eb78dc444 100644
--- a/src/ImageSharp.Drawing/Pens/Pens{TColor}.cs
+++ b/src/ImageSharp.Drawing/Pens/Pens{TPixel}.cs
@@ -1,18 +1,18 @@
-// <copyright file="Pens{TColor}.cs" company="James Jackson-South">
+// <copyright file="Pens{TPixel}.cs" company="James Jackson-South">
 // Copyright (c) James Jackson-South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
 namespace ImageSharp.Drawing.Pens
 {
-    using System;
+    using ImageSharp.PixelFormats;
 
     /// <summary>
     /// Common Pen styles
     /// </summary>
-    /// <typeparam name="TColor">The type of the color.</typeparam>
-    public class Pens<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The type of the color.</typeparam>
+    public class Pens<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         private static readonly float[] DashDotPattern = new[] { 3f, 1f, 1f, 1f };
         private static readonly float[] DashDotDotPattern = new[] { 3f, 1f, 1f, 1f, 1f, 1f };
@@ -25,8 +25,8 @@ namespace ImageSharp.Drawing.Pens
         /// <param name="color">The color.</param>
         /// <param name="width">The width.</param>
         /// <returns>The Pen</returns>
-        public static Pen<TColor> Solid(TColor color, float width)
-            => new Pen<TColor>(color, width);
+        public static Pen<TPixel> Solid(TPixel color, float width)
+            => new Pen<TPixel>(color, width);
 
         /// <summary>
         /// Create a solid pen with out any drawing patterns
@@ -34,8 +34,8 @@ namespace ImageSharp.Drawing.Pens
         /// <param name="brush">The brush.</param>
         /// <param name="width">The width.</param>
         /// <returns>The Pen</returns>
-        public static Pen<TColor> Solid(IBrush<TColor> brush, float width)
-            => new Pen<TColor>(brush, width);
+        public static Pen<TPixel> Solid(IBrush<TPixel> brush, float width)
+            => new Pen<TPixel>(brush, width);
 
         /// <summary>
         /// Create a pen with a 'Dash' drawing patterns
@@ -43,8 +43,8 @@ namespace ImageSharp.Drawing.Pens
         /// <param name="color">The color.</param>
         /// <param name="width">The width.</param>
         /// <returns>The Pen</returns>
-        public static Pen<TColor> Dash(TColor color, float width)
-            => new Pen<TColor>(color, width, DashedPattern);
+        public static Pen<TPixel> Dash(TPixel color, float width)
+            => new Pen<TPixel>(color, width, DashedPattern);
 
         /// <summary>
         /// Create a pen with a 'Dash' drawing patterns
@@ -52,8 +52,8 @@ namespace ImageSharp.Drawing.Pens
         /// <param name="brush">The brush.</param>
         /// <param name="width">The width.</param>
         /// <returns>The Pen</returns>
-        public static Pen<TColor> Dash(IBrush<TColor> brush, float width)
-            => new Pen<TColor>(brush, width, DashedPattern);
+        public static Pen<TPixel> Dash(IBrush<TPixel> brush, float width)
+            => new Pen<TPixel>(brush, width, DashedPattern);
 
         /// <summary>
         /// Create a pen with a 'Dot' drawing patterns
@@ -61,8 +61,8 @@ namespace ImageSharp.Drawing.Pens
         /// <param name="color">The color.</param>
         /// <param name="width">The width.</param>
         /// <returns>The Pen</returns>
-        public static Pen<TColor> Dot(TColor color, float width)
-            => new Pen<TColor>(color, width, DottedPattern);
+        public static Pen<TPixel> Dot(TPixel color, float width)
+            => new Pen<TPixel>(color, width, DottedPattern);
 
         /// <summary>
         /// Create a pen with a 'Dot' drawing patterns
@@ -70,8 +70,8 @@ namespace ImageSharp.Drawing.Pens
         /// <param name="brush">The brush.</param>
         /// <param name="width">The width.</param>
         /// <returns>The Pen</returns>
-        public static Pen<TColor> Dot(IBrush<TColor> brush, float width)
-            => new Pen<TColor>(brush, width, DottedPattern);
+        public static Pen<TPixel> Dot(IBrush<TPixel> brush, float width)
+            => new Pen<TPixel>(brush, width, DottedPattern);
 
         /// <summary>
         /// Create a pen with a 'Dash Dot' drawing patterns
@@ -79,8 +79,8 @@ namespace ImageSharp.Drawing.Pens
         /// <param name="color">The color.</param>
         /// <param name="width">The width.</param>
         /// <returns>The Pen</returns>
-        public static Pen<TColor> DashDot(TColor color, float width)
-            => new Pen<TColor>(color, width, DashDotPattern);
+        public static Pen<TPixel> DashDot(TPixel color, float width)
+            => new Pen<TPixel>(color, width, DashDotPattern);
 
         /// <summary>
         /// Create a pen with a 'Dash Dot' drawing patterns
@@ -88,8 +88,8 @@ namespace ImageSharp.Drawing.Pens
         /// <param name="brush">The brush.</param>
         /// <param name="width">The width.</param>
         /// <returns>The Pen</returns>
-        public static Pen<TColor> DashDot(IBrush<TColor> brush, float width)
-            => new Pen<TColor>(brush, width, DashDotPattern);
+        public static Pen<TPixel> DashDot(IBrush<TPixel> brush, float width)
+            => new Pen<TPixel>(brush, width, DashDotPattern);
 
         /// <summary>
         /// Create a pen with a 'Dash Dot Dot' drawing patterns
@@ -97,8 +97,8 @@ namespace ImageSharp.Drawing.Pens
         /// <param name="color">The color.</param>
         /// <param name="width">The width.</param>
         /// <returns>The Pen</returns>
-        public static Pen<TColor> DashDotDot(TColor color, float width)
-            => new Pen<TColor>(color, width, DashDotDotPattern);
+        public static Pen<TPixel> DashDotDot(TPixel color, float width)
+            => new Pen<TPixel>(color, width, DashDotDotPattern);
 
         /// <summary>
         /// Create a pen with a 'Dash Dot Dot' drawing patterns
@@ -106,7 +106,7 @@ namespace ImageSharp.Drawing.Pens
         /// <param name="brush">The brush.</param>
         /// <param name="width">The width.</param>
         /// <returns>The Pen</returns>
-        public static Pen<TColor> DashDotDot(IBrush<TColor> brush, float width)
-            => new Pen<TColor>(brush, width, DashDotDotPattern);
+        public static Pen<TPixel> DashDotDot(IBrush<TPixel> brush, float width)
+            => new Pen<TPixel>(brush, width, DashDotDotPattern);
     }
 }
\ No newline at end of file
diff --git a/src/ImageSharp.Drawing/Pens/Pen{TColor}.cs b/src/ImageSharp.Drawing/Pens/Pen{TPixel}.cs
similarity index 81%
rename from src/ImageSharp.Drawing/Pens/Pen{TColor}.cs
rename to src/ImageSharp.Drawing/Pens/Pen{TPixel}.cs
index e3716124e3..f49d03cbca 100644
--- a/src/ImageSharp.Drawing/Pens/Pen{TColor}.cs
+++ b/src/ImageSharp.Drawing/Pens/Pen{TPixel}.cs
@@ -1,20 +1,20 @@
-// <copyright file="Pen{TColor}.cs" company="James Jackson-South">
+// <copyright file="Pen{TPixel}.cs" company="James Jackson-South">
 // Copyright (c) James Jackson-South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
 namespace ImageSharp.Drawing.Pens
 {
-    using System;
     using System.Numerics;
 
     using ImageSharp.Drawing.Brushes;
+    using ImageSharp.PixelFormats;
     using Processors;
 
     /// <summary>
     /// Provides a pen that can apply a pattern to a line with a set brush and thickness
     /// </summary>
-    /// <typeparam name="TColor">The type of the color.</typeparam>
+    /// <typeparam name="TPixel">The type of the color.</typeparam>
     /// <remarks>
     /// The pattern will be in to the form of new float[]{ 1f, 2f, 0.5f} this will be
     /// converted into a pattern that is 3.5 times longer that the width with 3 sections
@@ -23,30 +23,30 @@ namespace ImageSharp.Drawing.Pens
     /// section 3 will be width/2 long and will be filled
     /// the the pattern will imidiatly repeat without gap.
     /// </remarks>
-    public class Pen<TColor> : IPen<TColor>
-        where TColor : struct, IPixel<TColor>
+    public class Pen<TPixel> : IPen<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         private static readonly float[] EmptyPattern = new float[0];
         private readonly float[] pattern;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="ImageSharp.Drawing.Pens.Pen{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="ImageSharp.Drawing.Pens.Pen{TPixel}"/> class.
         /// </summary>
         /// <param name="color">The color.</param>
         /// <param name="width">The width.</param>
         /// <param name="pattern">The pattern.</param>
-        public Pen(TColor color, float width, float[] pattern)
-            : this(new SolidBrush<TColor>(color), width, pattern)
+        public Pen(TPixel color, float width, float[] pattern)
+            : this(new SolidBrush<TPixel>(color), width, pattern)
         {
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="ImageSharp.Drawing.Pens.Pen{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="ImageSharp.Drawing.Pens.Pen{TPixel}"/> class.
         /// </summary>
         /// <param name="brush">The brush.</param>
         /// <param name="width">The width.</param>
         /// <param name="pattern">The pattern.</param>
-        public Pen(IBrush<TColor> brush, float width, float[] pattern)
+        public Pen(IBrush<TPixel> brush, float width, float[] pattern)
         {
             this.Brush = brush;
             this.Width = width;
@@ -54,30 +54,30 @@ namespace ImageSharp.Drawing.Pens
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="ImageSharp.Drawing.Pens.Pen{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="ImageSharp.Drawing.Pens.Pen{TPixel}"/> class.
         /// </summary>
         /// <param name="color">The color.</param>
         /// <param name="width">The width.</param>
-        public Pen(TColor color, float width)
-            : this(new SolidBrush<TColor>(color), width)
+        public Pen(TPixel color, float width)
+            : this(new SolidBrush<TPixel>(color), width)
         {
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="ImageSharp.Drawing.Pens.Pen{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="ImageSharp.Drawing.Pens.Pen{TPixel}"/> class.
         /// </summary>
         /// <param name="brush">The brush.</param>
         /// <param name="width">The width.</param>
-        public Pen(IBrush<TColor> brush, float width)
+        public Pen(IBrush<TPixel> brush, float width)
             : this(brush, width, EmptyPattern)
         {
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="ImageSharp.Drawing.Pens.Pen{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="ImageSharp.Drawing.Pens.Pen{TPixel}"/> class.
         /// </summary>
         /// <param name="pen">The pen.</param>
-        internal Pen(Pen<TColor> pen)
+        internal Pen(Pen<TPixel> pen)
            : this(pen.Brush, pen.Width, pen.pattern)
         {
         }
@@ -88,7 +88,7 @@ namespace ImageSharp.Drawing.Pens
         /// <value>
         /// The brush.
         /// </value>
-        public IBrush<TColor> Brush { get; }
+        public IBrush<TPixel> Brush { get; }
 
         /// <summary>
         /// Gets the width.
@@ -110,7 +110,7 @@ namespace ImageSharp.Drawing.Pens
         /// The <paramref name="region" /> when being applied to things like shapes would ussually be the
         /// bounding box of the shape not necorserrally the shape of the whole image
         /// </remarks>
-        public PenApplicator<TColor> CreateApplicator(PixelAccessor<TColor> sourcePixels, RectangleF region)
+        public PenApplicator<TPixel> CreateApplicator(PixelAccessor<TPixel> sourcePixels, RectangleF region)
         {
             if (this.pattern == null || this.pattern.Length < 2)
             {
@@ -122,12 +122,12 @@ namespace ImageSharp.Drawing.Pens
             return new PatternPenApplicator(sourcePixels, this.Brush, region, this.Width, this.pattern);
         }
 
-        private class SolidPenApplicator : PenApplicator<TColor>
+        private class SolidPenApplicator : PenApplicator<TPixel>
         {
-            private readonly BrushApplicator<TColor> brush;
+            private readonly BrushApplicator<TPixel> brush;
             private readonly float halfWidth;
 
-            public SolidPenApplicator(PixelAccessor<TColor> sourcePixels, IBrush<TColor> brush, RectangleF region, float width)
+            public SolidPenApplicator(PixelAccessor<TPixel> sourcePixels, IBrush<TPixel> brush, RectangleF region, float width)
             {
                 this.brush = brush.CreateApplicator(sourcePixels, region);
                 this.halfWidth = width / 2;
@@ -144,9 +144,9 @@ namespace ImageSharp.Drawing.Pens
                 this.brush.Dispose();
             }
 
-            public override ColoredPointInfo<TColor> GetColor(int x, int y, PointInfo info)
+            public override ColoredPointInfo<TPixel> GetColor(int x, int y, PointInfo info)
             {
-                ColoredPointInfo<TColor> result = default(ColoredPointInfo<TColor>);
+                ColoredPointInfo<TPixel> result = default(ColoredPointInfo<TPixel>);
                 result.Color = this.brush[x, y];
 
                 if (info.DistanceFromPath < this.halfWidth)
@@ -163,14 +163,14 @@ namespace ImageSharp.Drawing.Pens
             }
         }
 
-        private class PatternPenApplicator : PenApplicator<TColor>
+        private class PatternPenApplicator : PenApplicator<TPixel>
         {
-            private readonly BrushApplicator<TColor> brush;
+            private readonly BrushApplicator<TPixel> brush;
             private readonly float halfWidth;
             private readonly float[] pattern;
             private readonly float totalLength;
 
-            public PatternPenApplicator(PixelAccessor<TColor> sourcePixels, IBrush<TColor> brush, RectangleF region, float width, float[] pattern)
+            public PatternPenApplicator(PixelAccessor<TPixel> sourcePixels, IBrush<TPixel> brush, RectangleF region, float width, float[] pattern)
             {
                 this.brush = brush.CreateApplicator(sourcePixels, region);
                 this.halfWidth = width / 2;
@@ -197,16 +197,16 @@ namespace ImageSharp.Drawing.Pens
                 this.brush.Dispose();
             }
 
-            public override ColoredPointInfo<TColor> GetColor(int x, int y, PointInfo info)
+            public override ColoredPointInfo<TPixel> GetColor(int x, int y, PointInfo info)
             {
-                ColoredPointInfo<TColor> infoResult = default(ColoredPointInfo<TColor>);
+                ColoredPointInfo<TPixel> infoResult = default(ColoredPointInfo<TPixel>);
                 infoResult.DistanceFromElement = float.MaxValue; // is really outside the element
 
                 float length = info.DistanceAlongPath % this.totalLength;
 
                 // we can treat the DistanceAlongPath and DistanceFromPath as x,y coords for the pattern
                 // we need to calcualte the distance from the outside edge of the pattern
-                // and set them on the ColoredPointInfo<TColor> along with the color.
+                // and set them on the ColoredPointInfo<TPixel> along with the color.
                 infoResult.Color = this.brush[x, y];
 
                 float distanceWAway = 0;
diff --git a/src/ImageSharp.Drawing/Pens/Processors/ColoredPointInfo.cs b/src/ImageSharp.Drawing/Pens/Processors/ColoredPointInfo.cs
index d042bdccbb..65a8a61319 100644
--- a/src/ImageSharp.Drawing/Pens/Processors/ColoredPointInfo.cs
+++ b/src/ImageSharp.Drawing/Pens/Processors/ColoredPointInfo.cs
@@ -5,19 +5,19 @@
 
 namespace ImageSharp.Drawing.Processors
 {
-    using System;
+    using ImageSharp.PixelFormats;
 
     /// <summary>
     /// Returns details about how far away from the inside of a shape and the color the pixel could be.
     /// </summary>
-    /// <typeparam name="TColor">The type of the color.</typeparam>
-    public struct ColoredPointInfo<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The type of the color.</typeparam>
+    public struct ColoredPointInfo<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
         /// The color
         /// </summary>
-        public TColor Color;
+        public TPixel Color;
 
         /// <summary>
         /// The distance from element
diff --git a/src/ImageSharp.Drawing/Pens/Processors/PenApplicator.cs b/src/ImageSharp.Drawing/Pens/Processors/PenApplicator.cs
index 8cdb04b455..ac18890685 100644
--- a/src/ImageSharp.Drawing/Pens/Processors/PenApplicator.cs
+++ b/src/ImageSharp.Drawing/Pens/Processors/PenApplicator.cs
@@ -6,14 +6,14 @@
 namespace ImageSharp.Drawing.Processors
 {
     using System;
-    using System.Numerics;
+    using ImageSharp.PixelFormats;
 
     /// <summary>
     /// primitive that converts a <see cref="PointInfo"/> into a color and a distance away from the drawable part of the path.
     /// </summary>
-    /// <typeparam name="TColor">The type of the color.</typeparam>
-    public abstract class PenApplicator<TColor> : IDisposable
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The type of the color.</typeparam>
+    public abstract class PenApplicator<TPixel> : IDisposable
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
         /// Gets the required region.
@@ -27,7 +27,7 @@ namespace ImageSharp.Drawing.Processors
         public abstract void Dispose();
 
         /// <summary>
-        /// Gets a <see cref="ColoredPointInfo{TColor}" /> from a point represented by a <see cref="PointInfo" />.
+        /// Gets a <see cref="ColoredPointInfo{TPixel}" /> from a point represented by a <see cref="PointInfo" />.
         /// </summary>
         /// <param name="x">The x.</param>
         /// <param name="y">The y.</param>
@@ -35,6 +35,6 @@ namespace ImageSharp.Drawing.Processors
         /// <returns>
         /// Returns the color details and distance from a solid bit of the line.
         /// </returns>
-        public abstract ColoredPointInfo<TColor> GetColor(int x, int y, PointInfo info);
+        public abstract ColoredPointInfo<TPixel> GetColor(int x, int y, PointInfo info);
     }
 }
diff --git a/src/ImageSharp.Drawing/Processors/DrawImageProcessor.cs b/src/ImageSharp.Drawing/Processors/DrawImageProcessor.cs
index c67ba0370b..e2a9ef0248 100644
--- a/src/ImageSharp.Drawing/Processors/DrawImageProcessor.cs
+++ b/src/ImageSharp.Drawing/Processors/DrawImageProcessor.cs
@@ -8,24 +8,24 @@ namespace ImageSharp.Drawing.Processors
     using System;
     using System.Numerics;
     using System.Threading.Tasks;
-
+    using ImageSharp.PixelFormats;
     using ImageSharp.Processing;
 
     /// <summary>
     /// Combines two images together by blending the pixels.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    internal class DrawImageProcessor<TColor> : ImageProcessor<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    internal class DrawImageProcessor<TPixel> : ImageProcessor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
-        /// Initializes a new instance of the <see cref="DrawImageProcessor{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="DrawImageProcessor{TPixel}"/> class.
         /// </summary>
         /// <param name="image">The image to blend with the currently processing image.</param>
         /// <param name="size">The size to draw the blended image.</param>
         /// <param name="location">The location to draw the blended image.</param>
         /// <param name="alpha">The opacity of the image to blend. Between 0 and 100.</param>
-        public DrawImageProcessor(Image<TColor> image, Size size, Point location, int alpha = 100)
+        public DrawImageProcessor(Image<TPixel> image, Size size, Point location, int alpha = 100)
         {
             Guard.MustBeBetweenOrEqualTo(alpha, 0, 100, nameof(alpha));
             this.Image = image;
@@ -37,7 +37,7 @@ namespace ImageSharp.Drawing.Processors
         /// <summary>
         /// Gets the image to blend.
         /// </summary>
-        public Image<TColor> Image { get; private set; }
+        public Image<TPixel> Image { get; private set; }
 
         /// <summary>
         /// Gets the alpha percentage value.
@@ -55,7 +55,7 @@ namespace ImageSharp.Drawing.Processors
         public Point Location { get; }
 
         /// <inheritdoc/>
-        protected override void OnApply(ImageBase<TColor> source, Rectangle sourceRectangle)
+        protected override void OnApply(ImageBase<TPixel> source, Rectangle sourceRectangle)
         {
             if (this.Image.Bounds.Size != this.Size)
             {
@@ -72,8 +72,8 @@ namespace ImageSharp.Drawing.Processors
 
             float alpha = this.Alpha / 100F;
 
-            using (PixelAccessor<TColor> toBlendPixels = this.Image.Lock())
-            using (PixelAccessor<TColor> sourcePixels = source.Lock())
+            using (PixelAccessor<TPixel> toBlendPixels = this.Image.Lock())
+            using (PixelAccessor<TPixel> sourcePixels = source.Lock())
             {
                 Parallel.For(
                     minY,
@@ -89,7 +89,7 @@ namespace ImageSharp.Drawing.Processors
                                 // Lerping colors is dependent on the alpha of the blended color
                                 backgroundVector = Vector4BlendTransforms.PremultipliedLerp(backgroundVector, sourceVector, alpha);
 
-                                TColor packed = default(TColor);
+                                TPixel packed = default(TPixel);
                                 packed.PackFromVector4(backgroundVector);
                                 sourcePixels[x, y] = packed;
                             }
diff --git a/src/ImageSharp.Drawing/Processors/DrawPathProcessor.cs b/src/ImageSharp.Drawing/Processors/DrawPathProcessor.cs
index 89ba0968bb..62e366d2ae 100644
--- a/src/ImageSharp.Drawing/Processors/DrawPathProcessor.cs
+++ b/src/ImageSharp.Drawing/Processors/DrawPathProcessor.cs
@@ -8,28 +8,28 @@ namespace ImageSharp.Drawing.Processors
     using System;
     using System.Numerics;
     using System.Threading.Tasks;
-
+    using ImageSharp.PixelFormats;
     using ImageSharp.Processing;
     using Pens;
 
     /// <summary>
     /// Draws a path using the processor pipeline
     /// </summary>
-    /// <typeparam name="TColor">The type of the color.</typeparam>
-    /// <seealso cref="ImageSharp.Processing.ImageProcessor{TColor}" />
-    internal class DrawPathProcessor<TColor> : ImageProcessor<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The type of the color.</typeparam>
+    /// <seealso cref="ImageSharp.Processing.ImageProcessor{TPixel}" />
+    internal class DrawPathProcessor<TPixel> : ImageProcessor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         private const float AntialiasFactor = 1f;
         private const int PaddingFactor = 1; // needs to been the same or greater than AntialiasFactor
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="DrawPathProcessor{TColor}" /> class.
+        /// Initializes a new instance of the <see cref="DrawPathProcessor{TPixel}" /> class.
         /// </summary>
         /// <param name="pen">The details how to draw the outline/path.</param>
         /// <param name="drawable">The details of the paths and outlines to draw.</param>
         /// <param name="options">The drawing configuration options.</param>
-        public DrawPathProcessor(IPen<TColor> pen, Drawable drawable, GraphicsOptions options)
+        public DrawPathProcessor(IPen<TPixel> pen, Drawable drawable, GraphicsOptions options)
         {
             this.Path = drawable;
             this.Pen = pen;
@@ -44,7 +44,7 @@ namespace ImageSharp.Drawing.Processors
         /// <summary>
         /// Gets the pen.
         /// </summary>
-        public IPen<TColor> Pen { get; }
+        public IPen<TPixel> Pen { get; }
 
         /// <summary>
         /// Gets the path.
@@ -52,10 +52,10 @@ namespace ImageSharp.Drawing.Processors
         public Drawable Path { get; }
 
         /// <inheritdoc/>
-        protected override void OnApply(ImageBase<TColor> source, Rectangle sourceRectangle)
+        protected override void OnApply(ImageBase<TPixel> source, Rectangle sourceRectangle)
         {
-            using (PixelAccessor<TColor> sourcePixels = source.Lock())
-            using (PenApplicator<TColor> applicator = this.Pen.CreateApplicator(sourcePixels, this.Path.Bounds))
+            using (PixelAccessor<TPixel> sourcePixels = source.Lock())
+            using (PenApplicator<TPixel> applicator = this.Pen.CreateApplicator(sourcePixels, this.Path.Bounds))
             {
                 Rectangle rect = RectangleF.Ceiling(applicator.RequiredRegion);
 
@@ -100,7 +100,7 @@ namespace ImageSharp.Drawing.Processors
                             int offsetX = x - startX;
                             PointInfo info = this.Path.GetPointInfo(offsetX, offsetY);
 
-                            ColoredPointInfo<TColor> color = applicator.GetColor(offsetX, offsetY, info);
+                            ColoredPointInfo<TPixel> color = applicator.GetColor(offsetX, offsetY, info);
 
                             float opacity = this.Opacity(color.DistanceFromElement);
 
@@ -111,7 +111,7 @@ namespace ImageSharp.Drawing.Processors
 
                                 Vector4 finalColor = Vector4BlendTransforms.PremultipliedLerp(backgroundVector, sourceVector, opacity);
 
-                                TColor packed = default(TColor);
+                                TPixel packed = default(TPixel);
                                 packed.PackFromVector4(finalColor);
                                 sourcePixels[offsetX, offsetY] = packed;
                             }
diff --git a/src/ImageSharp.Drawing/Processors/FillProcessor.cs b/src/ImageSharp.Drawing/Processors/FillProcessor.cs
index 635829e9f1..ca2dc99824 100644
--- a/src/ImageSharp.Drawing/Processors/FillProcessor.cs
+++ b/src/ImageSharp.Drawing/Processors/FillProcessor.cs
@@ -10,31 +10,32 @@ namespace ImageSharp.Drawing.Processors
     using System.Threading.Tasks;
 
     using Drawing;
+    using ImageSharp.PixelFormats;
     using ImageSharp.Processing;
 
     /// <summary>
     /// Using the bursh as a source of pixels colors blends the brush color with source.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    internal class FillProcessor<TColor> : ImageProcessor<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    internal class FillProcessor<TPixel> : ImageProcessor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
         /// The brush.
         /// </summary>
-        private readonly IBrush<TColor> brush;
+        private readonly IBrush<TPixel> brush;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="FillProcessor{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="FillProcessor{TPixel}"/> class.
         /// </summary>
         /// <param name="brush">The brush to source pixel colors from.</param>
-        public FillProcessor(IBrush<TColor> brush)
+        public FillProcessor(IBrush<TPixel> brush)
         {
             this.brush = brush;
         }
 
         /// <inheritdoc/>
-        protected override void OnApply(ImageBase<TColor> source, Rectangle sourceRectangle)
+        protected override void OnApply(ImageBase<TPixel> source, Rectangle sourceRectangle)
         {
             int startX = sourceRectangle.X;
             int endX = sourceRectangle.Right;
@@ -59,10 +60,10 @@ namespace ImageSharp.Drawing.Processors
             }
 
             // we could possibly do some optermising by having knowledge about the individual brushes operate
-            // for example If brush is SolidBrush<TColor> then we could just get the color upfront
-            // and skip using the IBrushApplicator<TColor>?.
-            using (PixelAccessor<TColor> sourcePixels = source.Lock())
-            using (BrushApplicator<TColor> applicator = this.brush.CreateApplicator(sourcePixels, sourceRectangle))
+            // for example If brush is SolidBrush<TPixel> then we could just get the color upfront
+            // and skip using the IBrushApplicator<TPixel>?.
+            using (PixelAccessor<TPixel> sourcePixels = source.Lock())
+            using (BrushApplicator<TPixel> applicator = this.brush.CreateApplicator(sourcePixels, sourceRectangle))
             {
                 Parallel.For(
                     minY,
@@ -80,7 +81,7 @@ namespace ImageSharp.Drawing.Processors
 
                             Vector4 finalColor = Vector4BlendTransforms.PremultipliedLerp(backgroundVector, sourceVector, 1);
 
-                            TColor packed = default(TColor);
+                            TPixel packed = default(TPixel);
                             packed.PackFromVector4(finalColor);
                             sourcePixels[offsetX, offsetY] = packed;
                         }
diff --git a/src/ImageSharp.Drawing/Processors/FillRegionProcessor.cs b/src/ImageSharp.Drawing/Processors/FillRegionProcessor.cs
index 80a3e67932..af1e6fa895 100644
--- a/src/ImageSharp.Drawing/Processors/FillRegionProcessor.cs
+++ b/src/ImageSharp.Drawing/Processors/FillRegionProcessor.cs
@@ -7,29 +7,28 @@ namespace ImageSharp.Drawing.Processors
 {
     using System;
     using System.Buffers;
-    using System.Numerics;
-    using System.Threading.Tasks;
     using Drawing;
+    using ImageSharp.PixelFormats;
     using ImageSharp.Processing;
 
     /// <summary>
     /// Usinf a brsuh and a shape fills shape with contents of brush the
     /// </summary>
-    /// <typeparam name="TColor">The type of the color.</typeparam>
-    /// <seealso cref="ImageSharp.Processing.ImageProcessor{TColor}" />
-    internal class FillRegionProcessor<TColor> : ImageProcessor<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The type of the color.</typeparam>
+    /// <seealso cref="ImageSharp.Processing.ImageProcessor{TPixel}" />
+    internal class FillRegionProcessor<TPixel> : ImageProcessor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         private const float AntialiasFactor = 1f;
         private const int DrawPadding = 1;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="FillRegionProcessor{TColor}" /> class.
+        /// Initializes a new instance of the <see cref="FillRegionProcessor{TPixel}" /> class.
         /// </summary>
         /// <param name="brush">The details how to fill the region of interest.</param>
         /// <param name="region">The region of interest to be filled.</param>
         /// <param name="options">The configuration options.</param>
-        public FillRegionProcessor(IBrush<TColor> brush, Region region, GraphicsOptions options)
+        public FillRegionProcessor(IBrush<TPixel> brush, Region region, GraphicsOptions options)
         {
             this.Region = region;
             this.Brush = brush;
@@ -39,7 +38,7 @@ namespace ImageSharp.Drawing.Processors
         /// <summary>
         /// Gets the brush.
         /// </summary>
-        public IBrush<TColor> Brush { get; }
+        public IBrush<TPixel> Brush { get; }
 
         /// <summary>
         /// Gets the region that this processor applies to.
@@ -55,7 +54,7 @@ namespace ImageSharp.Drawing.Processors
         public GraphicsOptions Options { get; }
 
         /// <inheritdoc/>
-        protected override void OnApply(ImageBase<TColor> source, Rectangle sourceRectangle)
+        protected override void OnApply(ImageBase<TPixel> source, Rectangle sourceRectangle)
         {
             Region region = this.Region;
             Rectangle rect = region.Bounds;
@@ -88,8 +87,8 @@ namespace ImageSharp.Drawing.Processors
                 }
             }
 
-            using (PixelAccessor<TColor> sourcePixels = source.Lock())
-            using (BrushApplicator<TColor> applicator = this.Brush.CreateApplicator(sourcePixels, rect))
+            using (PixelAccessor<TPixel> sourcePixels = source.Lock())
+            using (BrushApplicator<TPixel> applicator = this.Brush.CreateApplicator(sourcePixels, rect))
             {
                 float[] buffer = arrayPool.Rent(maxIntersections);
                 int scanlineWidth = maxX - minX;
diff --git a/src/ImageSharp.Drawing/Text/DrawText.cs b/src/ImageSharp.Drawing/Text/DrawText.cs
index eba11b5c5e..876d17aca0 100644
--- a/src/ImageSharp.Drawing/Text/DrawText.cs
+++ b/src/ImageSharp.Drawing/Text/DrawText.cs
@@ -10,11 +10,11 @@ namespace ImageSharp
     using Drawing;
     using Drawing.Brushes;
     using Drawing.Pens;
-
+    using ImageSharp.PixelFormats;
     using SixLabors.Fonts;
 
     /// <summary>
-    /// Extension methods for the <see cref="Image{TColor}"/> type.
+    /// Extension methods for the <see cref="Image{TPixel}"/> type.
     /// </summary>
     public static partial class ImageExtensions
     {
@@ -23,17 +23,17 @@ namespace ImageSharp
         /// <summary>
         /// Draws the text onto the the image filled via the brush.
         /// </summary>
-        /// <typeparam name="TColor">The type of the color.</typeparam>
+        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="text">The text.</param>
         /// <param name="font">The font.</param>
         /// <param name="color">The color.</param>
         /// <param name="location">The location.</param>
         /// <returns>
-        /// The <see cref="Image{TColor}" />.
+        /// The <see cref="Image{TPixel}" />.
         /// </returns>
-        public static Image<TColor> DrawText<TColor>(this Image<TColor> source, string text, Font font, TColor color, Vector2 location)
-           where TColor : struct, IPixel<TColor>
+        public static Image<TPixel> DrawText<TPixel>(this Image<TPixel> source, string text, Font font, TPixel color, Vector2 location)
+           where TPixel : struct, IPixel<TPixel>
         {
             return source.DrawText(text, font, color, location, TextGraphicsOptions.Default);
         }
@@ -41,7 +41,7 @@ namespace ImageSharp
         /// <summary>
         /// Draws the text onto the the image filled via the brush.
         /// </summary>
-        /// <typeparam name="TColor">The type of the color.</typeparam>
+        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="text">The text.</param>
         /// <param name="font">The font.</param>
@@ -49,28 +49,28 @@ namespace ImageSharp
         /// <param name="location">The location.</param>
         /// <param name="options">The options.</param>
         /// <returns>
-        /// The <see cref="Image{TColor}" />.
+        /// The <see cref="Image{TPixel}" />.
         /// </returns>
-        public static Image<TColor> DrawText<TColor>(this Image<TColor> source, string text, Font font, TColor color, Vector2 location, TextGraphicsOptions options)
-           where TColor : struct, IPixel<TColor>
+        public static Image<TPixel> DrawText<TPixel>(this Image<TPixel> source, string text, Font font, TPixel color, Vector2 location, TextGraphicsOptions options)
+           where TPixel : struct, IPixel<TPixel>
         {
-            return source.DrawText(text, font, Brushes<TColor>.Solid(color), null, location, options);
+            return source.DrawText(text, font, Brushes<TPixel>.Solid(color), null, location, options);
         }
 
         /// <summary>
         /// Draws the text onto the the image filled via the brush.
         /// </summary>
-        /// <typeparam name="TColor">The type of the color.</typeparam>
+        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="text">The text.</param>
         /// <param name="font">The font.</param>
         /// <param name="brush">The brush.</param>
         /// <param name="location">The location.</param>
         /// <returns>
-        /// The <see cref="Image{TColor}" />.
+        /// The <see cref="Image{TPixel}" />.
         /// </returns>
-        public static Image<TColor> DrawText<TColor>(this Image<TColor> source, string text, Font font, IBrush<TColor> brush, Vector2 location)
-           where TColor : struct, IPixel<TColor>
+        public static Image<TPixel> DrawText<TPixel>(this Image<TPixel> source, string text, Font font, IBrush<TPixel> brush, Vector2 location)
+           where TPixel : struct, IPixel<TPixel>
         {
             return source.DrawText(text, font, brush, location, TextGraphicsOptions.Default);
         }
@@ -78,7 +78,7 @@ namespace ImageSharp
         /// <summary>
         /// Draws the text onto the the image filled via the brush.
         /// </summary>
-        /// <typeparam name="TColor">The type of the color.</typeparam>
+        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="text">The text.</param>
         /// <param name="font">The font.</param>
@@ -86,10 +86,10 @@ namespace ImageSharp
         /// <param name="location">The location.</param>
         /// <param name="options">The options.</param>
         /// <returns>
-        /// The <see cref="Image{TColor}" />.
+        /// The <see cref="Image{TPixel}" />.
         /// </returns>
-        public static Image<TColor> DrawText<TColor>(this Image<TColor> source, string text, Font font, IBrush<TColor> brush, Vector2 location, TextGraphicsOptions options)
-           where TColor : struct, IPixel<TColor>
+        public static Image<TPixel> DrawText<TPixel>(this Image<TPixel> source, string text, Font font, IBrush<TPixel> brush, Vector2 location, TextGraphicsOptions options)
+           where TPixel : struct, IPixel<TPixel>
         {
             return source.DrawText(text, font, brush, null, location, options);
         }
@@ -97,17 +97,17 @@ namespace ImageSharp
         /// <summary>
         /// Draws the text onto the the image outlined via the pen.
         /// </summary>
-        /// <typeparam name="TColor">The type of the color.</typeparam>
+        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="text">The text.</param>
         /// <param name="font">The font.</param>
         /// <param name="pen">The pen.</param>
         /// <param name="location">The location.</param>
         /// <returns>
-        /// The <see cref="Image{TColor}" />.
+        /// The <see cref="Image{TPixel}" />.
         /// </returns>
-        public static Image<TColor> DrawText<TColor>(this Image<TColor> source, string text, Font font, IPen<TColor> pen, Vector2 location)
-           where TColor : struct, IPixel<TColor>
+        public static Image<TPixel> DrawText<TPixel>(this Image<TPixel> source, string text, Font font, IPen<TPixel> pen, Vector2 location)
+           where TPixel : struct, IPixel<TPixel>
         {
             return source.DrawText(text, font, pen, location, TextGraphicsOptions.Default);
         }
@@ -115,7 +115,7 @@ namespace ImageSharp
         /// <summary>
         /// Draws the text onto the the image outlined via the pen.
         /// </summary>
-        /// <typeparam name="TColor">The type of the color.</typeparam>
+        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="text">The text.</param>
         /// <param name="font">The font.</param>
@@ -123,10 +123,10 @@ namespace ImageSharp
         /// <param name="location">The location.</param>
         /// <param name="options">The options.</param>
         /// <returns>
-        /// The <see cref="Image{TColor}" />.
+        /// The <see cref="Image{TPixel}" />.
         /// </returns>
-        public static Image<TColor> DrawText<TColor>(this Image<TColor> source, string text, Font font, IPen<TColor> pen, Vector2 location, TextGraphicsOptions options)
-           where TColor : struct, IPixel<TColor>
+        public static Image<TPixel> DrawText<TPixel>(this Image<TPixel> source, string text, Font font, IPen<TPixel> pen, Vector2 location, TextGraphicsOptions options)
+           where TPixel : struct, IPixel<TPixel>
         {
             return source.DrawText(text, font, null, pen, location, options);
         }
@@ -134,7 +134,7 @@ namespace ImageSharp
         /// <summary>
         /// Draws the text onto the the image filled via the brush then outlined via the pen.
         /// </summary>
-        /// <typeparam name="TColor">The type of the color.</typeparam>
+        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="text">The text.</param>
         /// <param name="font">The font.</param>
@@ -142,10 +142,10 @@ namespace ImageSharp
         /// <param name="pen">The pen.</param>
         /// <param name="location">The location.</param>
         /// <returns>
-        /// The <see cref="Image{TColor}" />.
+        /// The <see cref="Image{TPixel}" />.
         /// </returns>
-        public static Image<TColor> DrawText<TColor>(this Image<TColor> source, string text, Font font, IBrush<TColor> brush, IPen<TColor> pen, Vector2 location)
-           where TColor : struct, IPixel<TColor>
+        public static Image<TPixel> DrawText<TPixel>(this Image<TPixel> source, string text, Font font, IBrush<TPixel> brush, IPen<TPixel> pen, Vector2 location)
+           where TPixel : struct, IPixel<TPixel>
         {
             return source.DrawText(text, font, brush, pen, location, TextGraphicsOptions.Default);
         }
@@ -153,7 +153,7 @@ namespace ImageSharp
         /// <summary>
         /// Draws the text onto the the image filled via the brush then outlined via the pen.
         /// </summary>
-        /// <typeparam name="TColor">The type of the color.</typeparam>
+        /// <typeparam name="TPixel">The type of the color.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="text">The text.</param>
         /// <param name="font">The font.</param>
@@ -162,10 +162,10 @@ namespace ImageSharp
         /// <param name="location">The location.</param>
         /// <param name="options">The options.</param>
         /// <returns>
-        /// The <see cref="Image{TColor}" />.
+        /// The <see cref="Image{TPixel}" />.
         /// </returns>
-        public static Image<TColor> DrawText<TColor>(this Image<TColor> source, string text, Font font, IBrush<TColor> brush, IPen<TColor> pen, Vector2 location, TextGraphicsOptions options)
-           where TColor : struct, IPixel<TColor>
+        public static Image<TPixel> DrawText<TPixel>(this Image<TPixel> source, string text, Font font, IBrush<TPixel> brush, IPen<TPixel> pen, Vector2 location, TextGraphicsOptions options)
+           where TPixel : struct, IPixel<TPixel>
         {
             GlyphBuilder glyphBuilder = new GlyphBuilder(location);
 
diff --git a/src/ImageSharp/Colors/Color.Definitions.cs b/src/ImageSharp/Colors/Color.Definitions.cs
deleted file mode 100644
index 4bc0d486a8..0000000000
--- a/src/ImageSharp/Colors/Color.Definitions.cs
+++ /dev/null
@@ -1,728 +0,0 @@
-// <copyright file="Color.Definitions.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    /// <summary>
-    /// Packed vector type containing four 8-bit unsigned normalized values ranging from 0 to 255.
-    /// The color components are stored in red, green, blue, and alpha order.
-    /// </summary>
-    /// <remarks>
-    /// This struct is fully mutable. This is done (against the guidelines) for the sake of performance,
-    /// as it avoids the need to create new values for modification operations.
-    /// </remarks>
-    public partial struct Color
-    {
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #F0F8FF.
-        /// </summary>
-        public static readonly Color AliceBlue = NamedColors<Color>.AliceBlue;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FAEBD7.
-        /// </summary>
-        public static readonly Color AntiqueWhite = NamedColors<Color>.AntiqueWhite;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #00FFFF.
-        /// </summary>
-        public static readonly Color Aqua = NamedColors<Color>.Aqua;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #7FFFD4.
-        /// </summary>
-        public static readonly Color Aquamarine = NamedColors<Color>.Aquamarine;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #F0FFFF.
-        /// </summary>
-        public static readonly Color Azure = NamedColors<Color>.Azure;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #F5F5DC.
-        /// </summary>
-        public static readonly Color Beige = NamedColors<Color>.Beige;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FFE4C4.
-        /// </summary>
-        public static readonly Color Bisque = NamedColors<Color>.Bisque;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #000000.
-        /// </summary>
-        public static readonly Color Black = NamedColors<Color>.Black;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FFEBCD.
-        /// </summary>
-        public static readonly Color BlanchedAlmond = NamedColors<Color>.BlanchedAlmond;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #0000FF.
-        /// </summary>
-        public static readonly Color Blue = NamedColors<Color>.Blue;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #8A2BE2.
-        /// </summary>
-        public static readonly Color BlueViolet = NamedColors<Color>.BlueViolet;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #A52A2A.
-        /// </summary>
-        public static readonly Color Brown = NamedColors<Color>.Brown;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #DEB887.
-        /// </summary>
-        public static readonly Color BurlyWood = NamedColors<Color>.BurlyWood;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #5F9EA0.
-        /// </summary>
-        public static readonly Color CadetBlue = NamedColors<Color>.CadetBlue;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #7FFF00.
-        /// </summary>
-        public static readonly Color Chartreuse = NamedColors<Color>.Chartreuse;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #D2691E.
-        /// </summary>
-        public static readonly Color Chocolate = NamedColors<Color>.Chocolate;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FF7F50.
-        /// </summary>
-        public static readonly Color Coral = NamedColors<Color>.Coral;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #6495ED.
-        /// </summary>
-        public static readonly Color CornflowerBlue = NamedColors<Color>.CornflowerBlue;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FFF8DC.
-        /// </summary>
-        public static readonly Color Cornsilk = NamedColors<Color>.Cornsilk;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #DC143C.
-        /// </summary>
-        public static readonly Color Crimson = NamedColors<Color>.Crimson;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #00FFFF.
-        /// </summary>
-        public static readonly Color Cyan = NamedColors<Color>.Cyan;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #00008B.
-        /// </summary>
-        public static readonly Color DarkBlue = NamedColors<Color>.DarkBlue;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #008B8B.
-        /// </summary>
-        public static readonly Color DarkCyan = NamedColors<Color>.DarkCyan;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #B8860B.
-        /// </summary>
-        public static readonly Color DarkGoldenrod = NamedColors<Color>.DarkGoldenrod;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #A9A9A9.
-        /// </summary>
-        public static readonly Color DarkGray = NamedColors<Color>.DarkGray;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #006400.
-        /// </summary>
-        public static readonly Color DarkGreen = NamedColors<Color>.DarkGreen;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #BDB76B.
-        /// </summary>
-        public static readonly Color DarkKhaki = NamedColors<Color>.DarkKhaki;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #8B008B.
-        /// </summary>
-        public static readonly Color DarkMagenta = NamedColors<Color>.DarkMagenta;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #556B2F.
-        /// </summary>
-        public static readonly Color DarkOliveGreen = NamedColors<Color>.DarkOliveGreen;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FF8C00.
-        /// </summary>
-        public static readonly Color DarkOrange = NamedColors<Color>.DarkOrange;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #9932CC.
-        /// </summary>
-        public static readonly Color DarkOrchid = NamedColors<Color>.DarkOrchid;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #8B0000.
-        /// </summary>
-        public static readonly Color DarkRed = NamedColors<Color>.DarkRed;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #E9967A.
-        /// </summary>
-        public static readonly Color DarkSalmon = NamedColors<Color>.DarkSalmon;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #8FBC8B.
-        /// </summary>
-        public static readonly Color DarkSeaGreen = NamedColors<Color>.DarkSeaGreen;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #483D8B.
-        /// </summary>
-        public static readonly Color DarkSlateBlue = NamedColors<Color>.DarkSlateBlue;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #2F4F4F.
-        /// </summary>
-        public static readonly Color DarkSlateGray = NamedColors<Color>.DarkSlateGray;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #00CED1.
-        /// </summary>
-        public static readonly Color DarkTurquoise = NamedColors<Color>.DarkTurquoise;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #9400D3.
-        /// </summary>
-        public static readonly Color DarkViolet = NamedColors<Color>.DarkViolet;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FF1493.
-        /// </summary>
-        public static readonly Color DeepPink = NamedColors<Color>.DeepPink;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #00BFFF.
-        /// </summary>
-        public static readonly Color DeepSkyBlue = NamedColors<Color>.DeepSkyBlue;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #696969.
-        /// </summary>
-        public static readonly Color DimGray = NamedColors<Color>.DimGray;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #1E90FF.
-        /// </summary>
-        public static readonly Color DodgerBlue = NamedColors<Color>.DodgerBlue;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #B22222.
-        /// </summary>
-        public static readonly Color Firebrick = NamedColors<Color>.Firebrick;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FFFAF0.
-        /// </summary>
-        public static readonly Color FloralWhite = NamedColors<Color>.FloralWhite;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #228B22.
-        /// </summary>
-        public static readonly Color ForestGreen = NamedColors<Color>.ForestGreen;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FF00FF.
-        /// </summary>
-        public static readonly Color Fuchsia = NamedColors<Color>.Fuchsia;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #DCDCDC.
-        /// </summary>
-        public static readonly Color Gainsboro = NamedColors<Color>.Gainsboro;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #F8F8FF.
-        /// </summary>
-        public static readonly Color GhostWhite = NamedColors<Color>.GhostWhite;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FFD700.
-        /// </summary>
-        public static readonly Color Gold = NamedColors<Color>.Gold;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #DAA520.
-        /// </summary>
-        public static readonly Color Goldenrod = NamedColors<Color>.Goldenrod;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #808080.
-        /// </summary>
-        public static readonly Color Gray = NamedColors<Color>.Gray;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #008000.
-        /// </summary>
-        public static readonly Color Green = NamedColors<Color>.Green;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #ADFF2F.
-        /// </summary>
-        public static readonly Color GreenYellow = NamedColors<Color>.GreenYellow;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #F0FFF0.
-        /// </summary>
-        public static readonly Color Honeydew = NamedColors<Color>.Honeydew;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FF69B4.
-        /// </summary>
-        public static readonly Color HotPink = NamedColors<Color>.HotPink;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #CD5C5C.
-        /// </summary>
-        public static readonly Color IndianRed = NamedColors<Color>.IndianRed;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #4B0082.
-        /// </summary>
-        public static readonly Color Indigo = NamedColors<Color>.Indigo;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FFFFF0.
-        /// </summary>
-        public static readonly Color Ivory = NamedColors<Color>.Ivory;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #F0E68C.
-        /// </summary>
-        public static readonly Color Khaki = NamedColors<Color>.Khaki;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #E6E6FA.
-        /// </summary>
-        public static readonly Color Lavender = NamedColors<Color>.Lavender;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FFF0F5.
-        /// </summary>
-        public static readonly Color LavenderBlush = NamedColors<Color>.LavenderBlush;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #7CFC00.
-        /// </summary>
-        public static readonly Color LawnGreen = NamedColors<Color>.LawnGreen;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FFFACD.
-        /// </summary>
-        public static readonly Color LemonChiffon = NamedColors<Color>.LemonChiffon;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #ADD8E6.
-        /// </summary>
-        public static readonly Color LightBlue = NamedColors<Color>.LightBlue;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #F08080.
-        /// </summary>
-        public static readonly Color LightCoral = NamedColors<Color>.LightCoral;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #E0FFFF.
-        /// </summary>
-        public static readonly Color LightCyan = NamedColors<Color>.LightCyan;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FAFAD2.
-        /// </summary>
-        public static readonly Color LightGoldenrodYellow = NamedColors<Color>.LightGoldenrodYellow;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #D3D3D3.
-        /// </summary>
-        public static readonly Color LightGray = NamedColors<Color>.LightGray;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #90EE90.
-        /// </summary>
-        public static readonly Color LightGreen = NamedColors<Color>.LightGreen;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FFB6C1.
-        /// </summary>
-        public static readonly Color LightPink = NamedColors<Color>.LightPink;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FFA07A.
-        /// </summary>
-        public static readonly Color LightSalmon = NamedColors<Color>.LightSalmon;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #20B2AA.
-        /// </summary>
-        public static readonly Color LightSeaGreen = NamedColors<Color>.LightSeaGreen;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #87CEFA.
-        /// </summary>
-        public static readonly Color LightSkyBlue = NamedColors<Color>.LightSkyBlue;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #778899.
-        /// </summary>
-        public static readonly Color LightSlateGray = NamedColors<Color>.LightSlateGray;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #B0C4DE.
-        /// </summary>
-        public static readonly Color LightSteelBlue = NamedColors<Color>.LightSteelBlue;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FFFFE0.
-        /// </summary>
-        public static readonly Color LightYellow = NamedColors<Color>.LightYellow;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #00FF00.
-        /// </summary>
-        public static readonly Color Lime = NamedColors<Color>.Lime;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #32CD32.
-        /// </summary>
-        public static readonly Color LimeGreen = NamedColors<Color>.LimeGreen;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FAF0E6.
-        /// </summary>
-        public static readonly Color Linen = NamedColors<Color>.Linen;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FF00FF.
-        /// </summary>
-        public static readonly Color Magenta = NamedColors<Color>.Magenta;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #800000.
-        /// </summary>
-        public static readonly Color Maroon = NamedColors<Color>.Maroon;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #66CDAA.
-        /// </summary>
-        public static readonly Color MediumAquamarine = NamedColors<Color>.MediumAquamarine;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #0000CD.
-        /// </summary>
-        public static readonly Color MediumBlue = NamedColors<Color>.MediumBlue;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #BA55D3.
-        /// </summary>
-        public static readonly Color MediumOrchid = NamedColors<Color>.MediumOrchid;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #9370DB.
-        /// </summary>
-        public static readonly Color MediumPurple = NamedColors<Color>.MediumPurple;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #3CB371.
-        /// </summary>
-        public static readonly Color MediumSeaGreen = NamedColors<Color>.MediumSeaGreen;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #7B68EE.
-        /// </summary>
-        public static readonly Color MediumSlateBlue = NamedColors<Color>.MediumSlateBlue;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #00FA9A.
-        /// </summary>
-        public static readonly Color MediumSpringGreen = NamedColors<Color>.MediumSpringGreen;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #48D1CC.
-        /// </summary>
-        public static readonly Color MediumTurquoise = NamedColors<Color>.MediumTurquoise;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #C71585.
-        /// </summary>
-        public static readonly Color MediumVioletRed = NamedColors<Color>.MediumVioletRed;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #191970.
-        /// </summary>
-        public static readonly Color MidnightBlue = NamedColors<Color>.MidnightBlue;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #F5FFFA.
-        /// </summary>
-        public static readonly Color MintCream = NamedColors<Color>.MintCream;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FFE4E1.
-        /// </summary>
-        public static readonly Color MistyRose = NamedColors<Color>.MistyRose;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FFE4B5.
-        /// </summary>
-        public static readonly Color Moccasin = NamedColors<Color>.Moccasin;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FFDEAD.
-        /// </summary>
-        public static readonly Color NavajoWhite = NamedColors<Color>.NavajoWhite;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #000080.
-        /// </summary>
-        public static readonly Color Navy = NamedColors<Color>.Navy;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FDF5E6.
-        /// </summary>
-        public static readonly Color OldLace = NamedColors<Color>.OldLace;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #808000.
-        /// </summary>
-        public static readonly Color Olive = NamedColors<Color>.Olive;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #6B8E23.
-        /// </summary>
-        public static readonly Color OliveDrab = NamedColors<Color>.OliveDrab;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FFA500.
-        /// </summary>
-        public static readonly Color Orange = NamedColors<Color>.Orange;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FF4500.
-        /// </summary>
-        public static readonly Color OrangeRed = NamedColors<Color>.OrangeRed;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #DA70D6.
-        /// </summary>
-        public static readonly Color Orchid = NamedColors<Color>.Orchid;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #EEE8AA.
-        /// </summary>
-        public static readonly Color PaleGoldenrod = NamedColors<Color>.PaleGoldenrod;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #98FB98.
-        /// </summary>
-        public static readonly Color PaleGreen = NamedColors<Color>.PaleGreen;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #AFEEEE.
-        /// </summary>
-        public static readonly Color PaleTurquoise = NamedColors<Color>.PaleTurquoise;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #DB7093.
-        /// </summary>
-        public static readonly Color PaleVioletRed = NamedColors<Color>.PaleVioletRed;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FFEFD5.
-        /// </summary>
-        public static readonly Color PapayaWhip = NamedColors<Color>.PapayaWhip;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FFDAB9.
-        /// </summary>
-        public static readonly Color PeachPuff = NamedColors<Color>.PeachPuff;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #CD853F.
-        /// </summary>
-        public static readonly Color Peru = NamedColors<Color>.Peru;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FFC0CB.
-        /// </summary>
-        public static readonly Color Pink = NamedColors<Color>.Pink;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #DDA0DD.
-        /// </summary>
-        public static readonly Color Plum = NamedColors<Color>.Plum;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #B0E0E6.
-        /// </summary>
-        public static readonly Color PowderBlue = NamedColors<Color>.PowderBlue;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #800080.
-        /// </summary>
-        public static readonly Color Purple = NamedColors<Color>.Purple;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #663399.
-        /// </summary>
-        public static readonly Color RebeccaPurple = NamedColors<Color>.RebeccaPurple;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FF0000.
-        /// </summary>
-        public static readonly Color Red = NamedColors<Color>.Red;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #BC8F8F.
-        /// </summary>
-        public static readonly Color RosyBrown = NamedColors<Color>.RosyBrown;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #4169E1.
-        /// </summary>
-        public static readonly Color RoyalBlue = NamedColors<Color>.RoyalBlue;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #8B4513.
-        /// </summary>
-        public static readonly Color SaddleBrown = NamedColors<Color>.SaddleBrown;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FA8072.
-        /// </summary>
-        public static readonly Color Salmon = NamedColors<Color>.Salmon;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #F4A460.
-        /// </summary>
-        public static readonly Color SandyBrown = NamedColors<Color>.SandyBrown;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #2E8B57.
-        /// </summary>
-        public static readonly Color SeaGreen = NamedColors<Color>.SeaGreen;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FFF5EE.
-        /// </summary>
-        public static readonly Color SeaShell = NamedColors<Color>.SeaShell;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #A0522D.
-        /// </summary>
-        public static readonly Color Sienna = NamedColors<Color>.Sienna;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #C0C0C0.
-        /// </summary>
-        public static readonly Color Silver = NamedColors<Color>.Silver;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #87CEEB.
-        /// </summary>
-        public static readonly Color SkyBlue = NamedColors<Color>.SkyBlue;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #6A5ACD.
-        /// </summary>
-        public static readonly Color SlateBlue = NamedColors<Color>.SlateBlue;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #708090.
-        /// </summary>
-        public static readonly Color SlateGray = NamedColors<Color>.SlateGray;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FFFAFA.
-        /// </summary>
-        public static readonly Color Snow = NamedColors<Color>.Snow;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #00FF7F.
-        /// </summary>
-        public static readonly Color SpringGreen = NamedColors<Color>.SpringGreen;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #4682B4.
-        /// </summary>
-        public static readonly Color SteelBlue = NamedColors<Color>.SteelBlue;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #D2B48C.
-        /// </summary>
-        public static readonly Color Tan = NamedColors<Color>.Tan;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #008080.
-        /// </summary>
-        public static readonly Color Teal = NamedColors<Color>.Teal;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #D8BFD8.
-        /// </summary>
-        public static readonly Color Thistle = NamedColors<Color>.Thistle;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FF6347.
-        /// </summary>
-        public static readonly Color Tomato = NamedColors<Color>.Tomato;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FFFFFF.
-        /// </summary>
-        public static readonly Color Transparent = NamedColors<Color>.Transparent;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #40E0D0.
-        /// </summary>
-        public static readonly Color Turquoise = NamedColors<Color>.Turquoise;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #EE82EE.
-        /// </summary>
-        public static readonly Color Violet = NamedColors<Color>.Violet;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #F5DEB3.
-        /// </summary>
-        public static readonly Color Wheat = NamedColors<Color>.Wheat;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FFFFFF.
-        /// </summary>
-        public static readonly Color White = NamedColors<Color>.White;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #F5F5F5.
-        /// </summary>
-        public static readonly Color WhiteSmoke = NamedColors<Color>.WhiteSmoke;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #FFFF00.
-        /// </summary>
-        public static readonly Color Yellow = NamedColors<Color>.Yellow;
-
-        /// <summary>
-        /// Represents a <see cref="Color"/> matching the W3C definition that has an hex value of #9ACD32.
-        /// </summary>
-        public static readonly Color YellowGreen = NamedColors<Color>.YellowGreen;
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp/Colors/ColorConstants.cs b/src/ImageSharp/Colors/ColorConstants.cs
deleted file mode 100644
index 1397b6da6f..0000000000
--- a/src/ImageSharp/Colors/ColorConstants.cs
+++ /dev/null
@@ -1,179 +0,0 @@
-// <copyright file="ColorConstants.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using System;
-    using System.Collections.Generic;
-
-    /// <summary>
-    /// Provides useful color definitions.
-    /// </summary>
-    public static class ColorConstants
-    {
-        /// <summary>
-        /// Provides a lazy, one time method of returning the colors.
-        /// </summary>
-        private static readonly Lazy<Color[]> SafeColors = new Lazy<Color[]>(GetWebSafeColors);
-
-        /// <summary>
-        /// Gets a collection of named, web safe, colors as defined in the CSS Color Module Level 4.
-        /// </summary>
-        public static Color[] WebSafeColors => SafeColors.Value;
-
-        /// <summary>
-        /// Returns an array of web safe colors.
-        /// </summary>
-        /// <returns>The <see cref="T:Color[]"/></returns>
-        private static Color[] GetWebSafeColors()
-        {
-            return new List<Color>
-            {
-                Color.AliceBlue,
-                Color.AntiqueWhite,
-                Color.Aqua,
-                Color.Aquamarine,
-                Color.Azure,
-                Color.Beige,
-                Color.Bisque,
-                Color.Black,
-                Color.BlanchedAlmond,
-                Color.Blue,
-                Color.BlueViolet,
-                Color.Brown,
-                Color.BurlyWood,
-                Color.CadetBlue,
-                Color.Chartreuse,
-                Color.Chocolate,
-                Color.Coral,
-                Color.CornflowerBlue,
-                Color.Cornsilk,
-                Color.Crimson,
-                Color.Cyan,
-                Color.DarkBlue,
-                Color.DarkCyan,
-                Color.DarkGoldenrod,
-                Color.DarkGray,
-                Color.DarkGreen,
-                Color.DarkKhaki,
-                Color.DarkMagenta,
-                Color.DarkOliveGreen,
-                Color.DarkOrange,
-                Color.DarkOrchid,
-                Color.DarkRed,
-                Color.DarkSalmon,
-                Color.DarkSeaGreen,
-                Color.DarkSlateBlue,
-                Color.DarkSlateGray,
-                Color.DarkTurquoise,
-                Color.DarkViolet,
-                Color.DeepPink,
-                Color.DeepSkyBlue,
-                Color.DimGray,
-                Color.DodgerBlue,
-                Color.Firebrick,
-                Color.FloralWhite,
-                Color.ForestGreen,
-                Color.Fuchsia,
-                Color.Gainsboro,
-                Color.GhostWhite,
-                Color.Gold,
-                Color.Goldenrod,
-                Color.Gray,
-                Color.Green,
-                Color.GreenYellow,
-                Color.Honeydew,
-                Color.HotPink,
-                Color.IndianRed,
-                Color.Indigo,
-                Color.Ivory,
-                Color.Khaki,
-                Color.Lavender,
-                Color.LavenderBlush,
-                Color.LawnGreen,
-                Color.LemonChiffon,
-                Color.LightBlue,
-                Color.LightCoral,
-                Color.LightCyan,
-                Color.LightGoldenrodYellow,
-                Color.LightGray,
-                Color.LightGreen,
-                Color.LightPink,
-                Color.LightSalmon,
-                Color.LightSeaGreen,
-                Color.LightSkyBlue,
-                Color.LightSlateGray,
-                Color.LightSteelBlue,
-                Color.LightYellow,
-                Color.Lime,
-                Color.LimeGreen,
-                Color.Linen,
-                Color.Magenta,
-                Color.Maroon,
-                Color.MediumAquamarine,
-                Color.MediumBlue,
-                Color.MediumOrchid,
-                Color.MediumPurple,
-                Color.MediumSeaGreen,
-                Color.MediumSlateBlue,
-                Color.MediumSpringGreen,
-                Color.MediumTurquoise,
-                Color.MediumVioletRed,
-                Color.MidnightBlue,
-                Color.MintCream,
-                Color.MistyRose,
-                Color.Moccasin,
-                Color.NavajoWhite,
-                Color.Navy,
-                Color.OldLace,
-                Color.Olive,
-                Color.OliveDrab,
-                Color.Orange,
-                Color.OrangeRed,
-                Color.Orchid,
-                Color.PaleGoldenrod,
-                Color.PaleGreen,
-                Color.PaleTurquoise,
-                Color.PaleVioletRed,
-                Color.PapayaWhip,
-                Color.PeachPuff,
-                Color.Peru,
-                Color.Pink,
-                Color.Plum,
-                Color.PowderBlue,
-                Color.Purple,
-                Color.RebeccaPurple,
-                Color.Red,
-                Color.RosyBrown,
-                Color.RoyalBlue,
-                Color.SaddleBrown,
-                Color.Salmon,
-                Color.SandyBrown,
-                Color.SeaGreen,
-                Color.SeaShell,
-                Color.Sienna,
-                Color.Silver,
-                Color.SkyBlue,
-                Color.SlateBlue,
-                Color.SlateGray,
-                Color.Snow,
-                Color.SpringGreen,
-                Color.SteelBlue,
-                Color.Tan,
-                Color.Teal,
-                Color.Thistle,
-                Color.Tomato,
-                Color.Transparent,
-                Color.Turquoise,
-                Color.Violet,
-                Color.Wheat,
-                Color.White,
-                Color.WhiteSmoke,
-                Color.Yellow,
-                Color.YellowGreen
-            }.ToArray();
-        }
-    }
-}
diff --git a/src/ImageSharp/Colors/ColorVector.BulkOperations.cs b/src/ImageSharp/Colors/ColorVector.BulkOperations.cs
deleted file mode 100644
index ab32313c04..0000000000
--- a/src/ImageSharp/Colors/ColorVector.BulkOperations.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-namespace ImageSharp
-{
-    using System.Numerics;
-
-    /// <summary>
-    /// Unpacked pixel type containing four 16-bit unsigned normalized values typically ranging from 0 to 1.
-    /// The color components are stored in red, green, blue, and alpha order.
-    /// </summary>
-    /// <remarks>
-    /// This struct is fully mutable. This is done (against the guidelines) for the sake of performance,
-    /// as it avoids the need to create new values for modification operations.
-    /// </remarks>
-    public partial struct ColorVector
-    {
-        /// <summary>
-        /// <see cref="BulkPixelOperations{TColor}"/> implementation optimized for <see cref="ColorVector"/>.
-        /// </summary>
-        internal class BulkOperations : BulkPixelOperations<ColorVector>
-        {
-            /// <inheritdoc />
-            internal override unsafe void ToVector4(BufferSpan<ColorVector> sourceColors, BufferSpan<Vector4> destVectors, int count)
-            {
-                BufferSpan.Copy(sourceColors.AsBytes(), destVectors.AsBytes(), count * sizeof(Vector4));
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp/Colors/ColorVector.Definitions.cs b/src/ImageSharp/Colors/ColorVector.Definitions.cs
deleted file mode 100644
index 150b7209c7..0000000000
--- a/src/ImageSharp/Colors/ColorVector.Definitions.cs
+++ /dev/null
@@ -1,728 +0,0 @@
-// <copyright file="ColorVector.Definitions.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    /// <summary>
-    /// Unpacked pixel type containing four 16-bit floating-point values typically ranging from 0 to 1.
-    /// The color components are stored in red, green, blue, and alpha order.
-    /// </summary>
-    /// <remarks>
-    /// This struct is fully mutable. This is done (against the guidelines) for the sake of performance,
-    /// as it avoids the need to create new values for modification operations.
-    /// </remarks>
-    public partial struct ColorVector
-    {
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #F0F8FF.
-        /// </summary>
-        public static readonly ColorVector AliceBlue = NamedColors<ColorVector>.AliceBlue;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #FAEBD7.
-        /// </summary>
-        public static readonly ColorVector AntiqueWhite = NamedColors<ColorVector>.AntiqueWhite;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #00FFFF.
-        /// </summary>
-        public static readonly ColorVector Aqua = NamedColors<ColorVector>.Aqua;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #7FFFD4.
-        /// </summary>
-        public static readonly ColorVector Aquamarine = NamedColors<ColorVector>.Aquamarine;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #F0FFFF.
-        /// </summary>
-        public static readonly ColorVector Azure = NamedColors<ColorVector>.Azure;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #F5F5DC.
-        /// </summary>
-        public static readonly ColorVector Beige = NamedColors<ColorVector>.Beige;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #FFE4C4.
-        /// </summary>
-        public static readonly ColorVector Bisque = NamedColors<ColorVector>.Bisque;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #000000.
-        /// </summary>
-        public static readonly ColorVector Black = NamedColors<ColorVector>.Black;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #FFEBCD.
-        /// </summary>
-        public static readonly ColorVector BlanchedAlmond = NamedColors<ColorVector>.BlanchedAlmond;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #0000FF.
-        /// </summary>
-        public static readonly ColorVector Blue = NamedColors<ColorVector>.Blue;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #8A2BE2.
-        /// </summary>
-        public static readonly ColorVector BlueViolet = NamedColors<ColorVector>.BlueViolet;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #A52A2A.
-        /// </summary>
-        public static readonly ColorVector Brown = NamedColors<ColorVector>.Brown;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #DEB887.
-        /// </summary>
-        public static readonly ColorVector BurlyWood = NamedColors<ColorVector>.BurlyWood;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #5F9EA0.
-        /// </summary>
-        public static readonly ColorVector CadetBlue = NamedColors<ColorVector>.CadetBlue;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #7FFF00.
-        /// </summary>
-        public static readonly ColorVector Chartreuse = NamedColors<ColorVector>.Chartreuse;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #D2691E.
-        /// </summary>
-        public static readonly ColorVector Chocolate = NamedColors<ColorVector>.Chocolate;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #FF7F50.
-        /// </summary>
-        public static readonly ColorVector Coral = NamedColors<ColorVector>.Coral;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #6495ED.
-        /// </summary>
-        public static readonly ColorVector CornflowerBlue = NamedColors<ColorVector>.CornflowerBlue;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #FFF8DC.
-        /// </summary>
-        public static readonly ColorVector Cornsilk = NamedColors<ColorVector>.Cornsilk;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #DC143C.
-        /// </summary>
-        public static readonly ColorVector Crimson = NamedColors<ColorVector>.Crimson;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #00FFFF.
-        /// </summary>
-        public static readonly ColorVector Cyan = NamedColors<ColorVector>.Cyan;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #00008B.
-        /// </summary>
-        public static readonly ColorVector DarkBlue = NamedColors<ColorVector>.DarkBlue;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #008B8B.
-        /// </summary>
-        public static readonly ColorVector DarkCyan = NamedColors<ColorVector>.DarkCyan;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #B8860B.
-        /// </summary>
-        public static readonly ColorVector DarkGoldenrod = NamedColors<ColorVector>.DarkGoldenrod;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #A9A9A9.
-        /// </summary>
-        public static readonly ColorVector DarkGray = NamedColors<ColorVector>.DarkGray;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #006400.
-        /// </summary>
-        public static readonly ColorVector DarkGreen = NamedColors<ColorVector>.DarkGreen;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #BDB76B.
-        /// </summary>
-        public static readonly ColorVector DarkKhaki = NamedColors<ColorVector>.DarkKhaki;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #8B008B.
-        /// </summary>
-        public static readonly ColorVector DarkMagenta = NamedColors<ColorVector>.DarkMagenta;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #556B2F.
-        /// </summary>
-        public static readonly ColorVector DarkOliveGreen = NamedColors<ColorVector>.DarkOliveGreen;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #FF8C00.
-        /// </summary>
-        public static readonly ColorVector DarkOrange = NamedColors<ColorVector>.DarkOrange;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #9932CC.
-        /// </summary>
-        public static readonly ColorVector DarkOrchid = NamedColors<ColorVector>.DarkOrchid;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #8B0000.
-        /// </summary>
-        public static readonly ColorVector DarkRed = NamedColors<ColorVector>.DarkRed;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #E9967A.
-        /// </summary>
-        public static readonly ColorVector DarkSalmon = NamedColors<ColorVector>.DarkSalmon;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #8FBC8B.
-        /// </summary>
-        public static readonly ColorVector DarkSeaGreen = NamedColors<ColorVector>.DarkSeaGreen;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #483D8B.
-        /// </summary>
-        public static readonly ColorVector DarkSlateBlue = NamedColors<ColorVector>.DarkSlateBlue;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #2F4F4F.
-        /// </summary>
-        public static readonly ColorVector DarkSlateGray = NamedColors<ColorVector>.DarkSlateGray;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #00CED1.
-        /// </summary>
-        public static readonly ColorVector DarkTurquoise = NamedColors<ColorVector>.DarkTurquoise;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #9400D3.
-        /// </summary>
-        public static readonly ColorVector DarkViolet = NamedColors<ColorVector>.DarkViolet;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #FF1493.
-        /// </summary>
-        public static readonly ColorVector DeepPink = NamedColors<ColorVector>.DeepPink;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #00BFFF.
-        /// </summary>
-        public static readonly ColorVector DeepSkyBlue = NamedColors<ColorVector>.DeepSkyBlue;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #696969.
-        /// </summary>
-        public static readonly ColorVector DimGray = NamedColors<ColorVector>.DimGray;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #1E90FF.
-        /// </summary>
-        public static readonly ColorVector DodgerBlue = NamedColors<ColorVector>.DodgerBlue;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #B22222.
-        /// </summary>
-        public static readonly ColorVector Firebrick = NamedColors<ColorVector>.Firebrick;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #FFFAF0.
-        /// </summary>
-        public static readonly ColorVector FloralWhite = NamedColors<ColorVector>.FloralWhite;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #228B22.
-        /// </summary>
-        public static readonly ColorVector ForestGreen = NamedColors<ColorVector>.ForestGreen;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #FF00FF.
-        /// </summary>
-        public static readonly ColorVector Fuchsia = NamedColors<ColorVector>.Fuchsia;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #DCDCDC.
-        /// </summary>
-        public static readonly ColorVector Gainsboro = NamedColors<ColorVector>.Gainsboro;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #F8F8FF.
-        /// </summary>
-        public static readonly ColorVector GhostWhite = NamedColors<ColorVector>.GhostWhite;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #FFD700.
-        /// </summary>
-        public static readonly ColorVector Gold = NamedColors<ColorVector>.Gold;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #DAA520.
-        /// </summary>
-        public static readonly ColorVector Goldenrod = NamedColors<ColorVector>.Goldenrod;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #808080.
-        /// </summary>
-        public static readonly ColorVector Gray = NamedColors<ColorVector>.Gray;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #008000.
-        /// </summary>
-        public static readonly ColorVector Green = NamedColors<ColorVector>.Green;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #ADFF2F.
-        /// </summary>
-        public static readonly ColorVector GreenYellow = NamedColors<ColorVector>.GreenYellow;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #F0FFF0.
-        /// </summary>
-        public static readonly ColorVector Honeydew = NamedColors<ColorVector>.Honeydew;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #FF69B4.
-        /// </summary>
-        public static readonly ColorVector HotPink = NamedColors<ColorVector>.HotPink;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #CD5C5C.
-        /// </summary>
-        public static readonly ColorVector IndianRed = NamedColors<ColorVector>.IndianRed;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #4B0082.
-        /// </summary>
-        public static readonly ColorVector Indigo = NamedColors<ColorVector>.Indigo;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #FFFFF0.
-        /// </summary>
-        public static readonly ColorVector Ivory = NamedColors<ColorVector>.Ivory;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #F0E68C.
-        /// </summary>
-        public static readonly ColorVector Khaki = NamedColors<ColorVector>.Khaki;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #E6E6FA.
-        /// </summary>
-        public static readonly ColorVector Lavender = NamedColors<ColorVector>.Lavender;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #FFF0F5.
-        /// </summary>
-        public static readonly ColorVector LavenderBlush = NamedColors<ColorVector>.LavenderBlush;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #7CFC00.
-        /// </summary>
-        public static readonly ColorVector LawnGreen = NamedColors<ColorVector>.LawnGreen;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #FFFACD.
-        /// </summary>
-        public static readonly ColorVector LemonChiffon = NamedColors<ColorVector>.LemonChiffon;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #ADD8E6.
-        /// </summary>
-        public static readonly ColorVector LightBlue = NamedColors<ColorVector>.LightBlue;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #F08080.
-        /// </summary>
-        public static readonly ColorVector LightCoral = NamedColors<ColorVector>.LightCoral;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #E0FFFF.
-        /// </summary>
-        public static readonly ColorVector LightCyan = NamedColors<ColorVector>.LightCyan;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #FAFAD2.
-        /// </summary>
-        public static readonly ColorVector LightGoldenrodYellow = NamedColors<ColorVector>.LightGoldenrodYellow;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #D3D3D3.
-        /// </summary>
-        public static readonly ColorVector LightGray = NamedColors<ColorVector>.LightGray;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #90EE90.
-        /// </summary>
-        public static readonly ColorVector LightGreen = NamedColors<ColorVector>.LightGreen;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #FFB6C1.
-        /// </summary>
-        public static readonly ColorVector LightPink = NamedColors<ColorVector>.LightPink;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #FFA07A.
-        /// </summary>
-        public static readonly ColorVector LightSalmon = NamedColors<ColorVector>.LightSalmon;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #20B2AA.
-        /// </summary>
-        public static readonly ColorVector LightSeaGreen = NamedColors<ColorVector>.LightSeaGreen;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #87CEFA.
-        /// </summary>
-        public static readonly ColorVector LightSkyBlue = NamedColors<ColorVector>.LightSkyBlue;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #778899.
-        /// </summary>
-        public static readonly ColorVector LightSlateGray = NamedColors<ColorVector>.LightSlateGray;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #B0C4DE.
-        /// </summary>
-        public static readonly ColorVector LightSteelBlue = NamedColors<ColorVector>.LightSteelBlue;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #FFFFE0.
-        /// </summary>
-        public static readonly ColorVector LightYellow = NamedColors<ColorVector>.LightYellow;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #00FF00.
-        /// </summary>
-        public static readonly ColorVector Lime = NamedColors<ColorVector>.Lime;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #32CD32.
-        /// </summary>
-        public static readonly ColorVector LimeGreen = NamedColors<ColorVector>.LimeGreen;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #FAF0E6.
-        /// </summary>
-        public static readonly ColorVector Linen = NamedColors<ColorVector>.Linen;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #FF00FF.
-        /// </summary>
-        public static readonly ColorVector Magenta = NamedColors<ColorVector>.Magenta;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #800000.
-        /// </summary>
-        public static readonly ColorVector Maroon = NamedColors<ColorVector>.Maroon;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #66CDAA.
-        /// </summary>
-        public static readonly ColorVector MediumAquamarine = NamedColors<ColorVector>.MediumAquamarine;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #0000CD.
-        /// </summary>
-        public static readonly ColorVector MediumBlue = NamedColors<ColorVector>.MediumBlue;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #BA55D3.
-        /// </summary>
-        public static readonly ColorVector MediumOrchid = NamedColors<ColorVector>.MediumOrchid;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #9370DB.
-        /// </summary>
-        public static readonly ColorVector MediumPurple = NamedColors<ColorVector>.MediumPurple;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #3CB371.
-        /// </summary>
-        public static readonly ColorVector MediumSeaGreen = NamedColors<ColorVector>.MediumSeaGreen;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #7B68EE.
-        /// </summary>
-        public static readonly ColorVector MediumSlateBlue = NamedColors<ColorVector>.MediumSlateBlue;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #00FA9A.
-        /// </summary>
-        public static readonly ColorVector MediumSpringGreen = NamedColors<ColorVector>.MediumSpringGreen;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #48D1CC.
-        /// </summary>
-        public static readonly ColorVector MediumTurquoise = NamedColors<ColorVector>.MediumTurquoise;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #C71585.
-        /// </summary>
-        public static readonly ColorVector MediumVioletRed = NamedColors<ColorVector>.MediumVioletRed;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #191970.
-        /// </summary>
-        public static readonly ColorVector MidnightBlue = NamedColors<ColorVector>.MidnightBlue;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #F5FFFA.
-        /// </summary>
-        public static readonly ColorVector MintCream = NamedColors<ColorVector>.MintCream;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #FFE4E1.
-        /// </summary>
-        public static readonly ColorVector MistyRose = NamedColors<ColorVector>.MistyRose;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #FFE4B5.
-        /// </summary>
-        public static readonly ColorVector Moccasin = NamedColors<ColorVector>.Moccasin;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #FFDEAD.
-        /// </summary>
-        public static readonly ColorVector NavajoWhite = NamedColors<ColorVector>.NavajoWhite;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #000080.
-        /// </summary>
-        public static readonly ColorVector Navy = NamedColors<ColorVector>.Navy;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #FDF5E6.
-        /// </summary>
-        public static readonly ColorVector OldLace = NamedColors<ColorVector>.OldLace;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #808000.
-        /// </summary>
-        public static readonly ColorVector Olive = NamedColors<ColorVector>.Olive;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #6B8E23.
-        /// </summary>
-        public static readonly ColorVector OliveDrab = NamedColors<ColorVector>.OliveDrab;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #FFA500.
-        /// </summary>
-        public static readonly ColorVector Orange = NamedColors<ColorVector>.Orange;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #FF4500.
-        /// </summary>
-        public static readonly ColorVector OrangeRed = NamedColors<ColorVector>.OrangeRed;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #DA70D6.
-        /// </summary>
-        public static readonly ColorVector Orchid = NamedColors<ColorVector>.Orchid;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #EEE8AA.
-        /// </summary>
-        public static readonly ColorVector PaleGoldenrod = NamedColors<ColorVector>.PaleGoldenrod;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #98FB98.
-        /// </summary>
-        public static readonly ColorVector PaleGreen = NamedColors<ColorVector>.PaleGreen;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #AFEEEE.
-        /// </summary>
-        public static readonly ColorVector PaleTurquoise = NamedColors<ColorVector>.PaleTurquoise;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #DB7093.
-        /// </summary>
-        public static readonly ColorVector PaleVioletRed = NamedColors<ColorVector>.PaleVioletRed;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #FFEFD5.
-        /// </summary>
-        public static readonly ColorVector PapayaWhip = NamedColors<ColorVector>.PapayaWhip;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #FFDAB9.
-        /// </summary>
-        public static readonly ColorVector PeachPuff = NamedColors<ColorVector>.PeachPuff;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #CD853F.
-        /// </summary>
-        public static readonly ColorVector Peru = NamedColors<ColorVector>.Peru;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #FFC0CB.
-        /// </summary>
-        public static readonly ColorVector Pink = NamedColors<ColorVector>.Pink;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #DDA0DD.
-        /// </summary>
-        public static readonly ColorVector Plum = NamedColors<ColorVector>.Plum;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #B0E0E6.
-        /// </summary>
-        public static readonly ColorVector PowderBlue = NamedColors<ColorVector>.PowderBlue;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #800080.
-        /// </summary>
-        public static readonly ColorVector Purple = NamedColors<ColorVector>.Purple;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #663399.
-        /// </summary>
-        public static readonly ColorVector RebeccaPurple = NamedColors<ColorVector>.RebeccaPurple;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #FF0000.
-        /// </summary>
-        public static readonly ColorVector Red = NamedColors<ColorVector>.Red;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #BC8F8F.
-        /// </summary>
-        public static readonly ColorVector RosyBrown = NamedColors<ColorVector>.RosyBrown;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #4169E1.
-        /// </summary>
-        public static readonly ColorVector RoyalBlue = NamedColors<ColorVector>.RoyalBlue;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #8B4513.
-        /// </summary>
-        public static readonly ColorVector SaddleBrown = NamedColors<ColorVector>.SaddleBrown;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #FA8072.
-        /// </summary>
-        public static readonly ColorVector Salmon = NamedColors<ColorVector>.Salmon;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #F4A460.
-        /// </summary>
-        public static readonly ColorVector SandyBrown = NamedColors<ColorVector>.SandyBrown;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #2E8B57.
-        /// </summary>
-        public static readonly ColorVector SeaGreen = NamedColors<ColorVector>.SeaGreen;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #FFF5EE.
-        /// </summary>
-        public static readonly ColorVector SeaShell = NamedColors<ColorVector>.SeaShell;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #A0522D.
-        /// </summary>
-        public static readonly ColorVector Sienna = NamedColors<ColorVector>.Sienna;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #C0C0C0.
-        /// </summary>
-        public static readonly ColorVector Silver = NamedColors<ColorVector>.Silver;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #87CEEB.
-        /// </summary>
-        public static readonly ColorVector SkyBlue = NamedColors<ColorVector>.SkyBlue;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #6A5ACD.
-        /// </summary>
-        public static readonly ColorVector SlateBlue = NamedColors<ColorVector>.SlateBlue;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #708090.
-        /// </summary>
-        public static readonly ColorVector SlateGray = NamedColors<ColorVector>.SlateGray;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #FFFAFA.
-        /// </summary>
-        public static readonly ColorVector Snow = NamedColors<ColorVector>.Snow;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #00FF7F.
-        /// </summary>
-        public static readonly ColorVector SpringGreen = NamedColors<ColorVector>.SpringGreen;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #4682B4.
-        /// </summary>
-        public static readonly ColorVector SteelBlue = NamedColors<ColorVector>.SteelBlue;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #D2B48C.
-        /// </summary>
-        public static readonly ColorVector Tan = NamedColors<ColorVector>.Tan;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #008080.
-        /// </summary>
-        public static readonly ColorVector Teal = NamedColors<ColorVector>.Teal;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #D8BFD8.
-        /// </summary>
-        public static readonly ColorVector Thistle = NamedColors<ColorVector>.Thistle;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #FF6347.
-        /// </summary>
-        public static readonly ColorVector Tomato = NamedColors<ColorVector>.Tomato;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #FFFFFF.
-        /// </summary>
-        public static readonly ColorVector Transparent = NamedColors<ColorVector>.Transparent;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #40E0D0.
-        /// </summary>
-        public static readonly ColorVector Turquoise = NamedColors<ColorVector>.Turquoise;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #EE82EE.
-        /// </summary>
-        public static readonly ColorVector Violet = NamedColors<ColorVector>.Violet;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #F5DEB3.
-        /// </summary>
-        public static readonly ColorVector Wheat = NamedColors<ColorVector>.Wheat;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #FFFFFF.
-        /// </summary>
-        public static readonly ColorVector White = NamedColors<ColorVector>.White;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #F5F5F5.
-        /// </summary>
-        public static readonly ColorVector WhiteSmoke = NamedColors<ColorVector>.WhiteSmoke;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #FFFF00.
-        /// </summary>
-        public static readonly ColorVector Yellow = NamedColors<ColorVector>.Yellow;
-
-        /// <summary>
-        /// Represents a <see cref="ColorVector"/> matching the W3C definition that has an hex value of #9ACD32.
-        /// </summary>
-        public static readonly ColorVector YellowGreen = NamedColors<ColorVector>.YellowGreen;
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp/Colors/NamedColors{TColor}.cs b/src/ImageSharp/Colors/NamedColors{TColor}.cs
deleted file mode 100644
index f8080195d0..0000000000
--- a/src/ImageSharp/Colors/NamedColors{TColor}.cs
+++ /dev/null
@@ -1,727 +0,0 @@
-// <copyright file="NamedColors{TColor}.cs" company="James Jackson-South">
-// Copyright (c) James Jackson-South and contributors.
-// Licensed under the Apache License, Version 2.0.
-// </copyright>
-
-namespace ImageSharp
-{
-    using System;
-
-    /// <summary>
-    /// A set of named colors mapped to the provided color space.
-    /// </summary>
-    /// <typeparam name="TColor">The type of the color.</typeparam>
-    public static class NamedColors<TColor>
-        where TColor : struct, IPixel<TColor>
-    {
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #F0F8FF.
-        /// </summary>
-        public static readonly TColor AliceBlue = ColorBuilder<TColor>.FromRGBA(240, 248, 255, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #FAEBD7.
-        /// </summary>
-        public static readonly TColor AntiqueWhite = ColorBuilder<TColor>.FromRGBA(250, 235, 215, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #00FFFF.
-        /// </summary>
-        public static readonly TColor Aqua = ColorBuilder<TColor>.FromRGBA(0, 255, 255, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #7FFFD4.
-        /// </summary>
-        public static readonly TColor Aquamarine = ColorBuilder<TColor>.FromRGBA(127, 255, 212, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #F0FFFF.
-        /// </summary>
-        public static readonly TColor Azure = ColorBuilder<TColor>.FromRGBA(240, 255, 255, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #F5F5DC.
-        /// </summary>
-        public static readonly TColor Beige = ColorBuilder<TColor>.FromRGBA(245, 245, 220, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #FFE4C4.
-        /// </summary>
-        public static readonly TColor Bisque = ColorBuilder<TColor>.FromRGBA(255, 228, 196, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #000000.
-        /// </summary>
-        public static readonly TColor Black = ColorBuilder<TColor>.FromRGBA(0, 0, 0, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #FFEBCD.
-        /// </summary>
-        public static readonly TColor BlanchedAlmond = ColorBuilder<TColor>.FromRGBA(255, 235, 205, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #0000FF.
-        /// </summary>
-        public static readonly TColor Blue = ColorBuilder<TColor>.FromRGBA(0, 0, 255, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #8A2BE2.
-        /// </summary>
-        public static readonly TColor BlueViolet = ColorBuilder<TColor>.FromRGBA(138, 43, 226, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #A52A2A.
-        /// </summary>
-        public static readonly TColor Brown = ColorBuilder<TColor>.FromRGBA(165, 42, 42, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #DEB887.
-        /// </summary>
-        public static readonly TColor BurlyWood = ColorBuilder<TColor>.FromRGBA(222, 184, 135, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #5F9EA0.
-        /// </summary>
-        public static readonly TColor CadetBlue = ColorBuilder<TColor>.FromRGBA(95, 158, 160, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #7FFF00.
-        /// </summary>
-        public static readonly TColor Chartreuse = ColorBuilder<TColor>.FromRGBA(127, 255, 0, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #D2691E.
-        /// </summary>
-        public static readonly TColor Chocolate = ColorBuilder<TColor>.FromRGBA(210, 105, 30, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #FF7F50.
-        /// </summary>
-        public static readonly TColor Coral = ColorBuilder<TColor>.FromRGBA(255, 127, 80, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #6495ED.
-        /// </summary>
-        public static readonly TColor CornflowerBlue = ColorBuilder<TColor>.FromRGBA(100, 149, 237, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #FFF8DC.
-        /// </summary>
-        public static readonly TColor Cornsilk = ColorBuilder<TColor>.FromRGBA(255, 248, 220, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #DC143C.
-        /// </summary>
-        public static readonly TColor Crimson = ColorBuilder<TColor>.FromRGBA(220, 20, 60, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #00FFFF.
-        /// </summary>
-        public static readonly TColor Cyan = ColorBuilder<TColor>.FromRGBA(0, 255, 255, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #00008B.
-        /// </summary>
-        public static readonly TColor DarkBlue = ColorBuilder<TColor>.FromRGBA(0, 0, 139, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #008B8B.
-        /// </summary>
-        public static readonly TColor DarkCyan = ColorBuilder<TColor>.FromRGBA(0, 139, 139, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #B8860B.
-        /// </summary>
-        public static readonly TColor DarkGoldenrod = ColorBuilder<TColor>.FromRGBA(184, 134, 11, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #A9A9A9.
-        /// </summary>
-        public static readonly TColor DarkGray = ColorBuilder<TColor>.FromRGBA(169, 169, 169, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #006400.
-        /// </summary>
-        public static readonly TColor DarkGreen = ColorBuilder<TColor>.FromRGBA(0, 100, 0, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #BDB76B.
-        /// </summary>
-        public static readonly TColor DarkKhaki = ColorBuilder<TColor>.FromRGBA(189, 183, 107, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #8B008B.
-        /// </summary>
-        public static readonly TColor DarkMagenta = ColorBuilder<TColor>.FromRGBA(139, 0, 139, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #556B2F.
-        /// </summary>
-        public static readonly TColor DarkOliveGreen = ColorBuilder<TColor>.FromRGBA(85, 107, 47, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #FF8C00.
-        /// </summary>
-        public static readonly TColor DarkOrange = ColorBuilder<TColor>.FromRGBA(255, 140, 0, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #9932CC.
-        /// </summary>
-        public static readonly TColor DarkOrchid = ColorBuilder<TColor>.FromRGBA(153, 50, 204, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #8B0000.
-        /// </summary>
-        public static readonly TColor DarkRed = ColorBuilder<TColor>.FromRGBA(139, 0, 0, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #E9967A.
-        /// </summary>
-        public static readonly TColor DarkSalmon = ColorBuilder<TColor>.FromRGBA(233, 150, 122, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #8FBC8B.
-        /// </summary>
-        public static readonly TColor DarkSeaGreen = ColorBuilder<TColor>.FromRGBA(143, 188, 139, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #483D8B.
-        /// </summary>
-        public static readonly TColor DarkSlateBlue = ColorBuilder<TColor>.FromRGBA(72, 61, 139, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #2F4F4F.
-        /// </summary>
-        public static readonly TColor DarkSlateGray = ColorBuilder<TColor>.FromRGBA(47, 79, 79, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #00CED1.
-        /// </summary>
-        public static readonly TColor DarkTurquoise = ColorBuilder<TColor>.FromRGBA(0, 206, 209, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #9400D3.
-        /// </summary>
-        public static readonly TColor DarkViolet = ColorBuilder<TColor>.FromRGBA(148, 0, 211, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #FF1493.
-        /// </summary>
-        public static readonly TColor DeepPink = ColorBuilder<TColor>.FromRGBA(255, 20, 147, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #00BFFF.
-        /// </summary>
-        public static readonly TColor DeepSkyBlue = ColorBuilder<TColor>.FromRGBA(0, 191, 255, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #696969.
-        /// </summary>
-        public static readonly TColor DimGray = ColorBuilder<TColor>.FromRGBA(105, 105, 105, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #1E90FF.
-        /// </summary>
-        public static readonly TColor DodgerBlue = ColorBuilder<TColor>.FromRGBA(30, 144, 255, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #B22222.
-        /// </summary>
-        public static readonly TColor Firebrick = ColorBuilder<TColor>.FromRGBA(178, 34, 34, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #FFFAF0.
-        /// </summary>
-        public static readonly TColor FloralWhite = ColorBuilder<TColor>.FromRGBA(255, 250, 240, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #228B22.
-        /// </summary>
-        public static readonly TColor ForestGreen = ColorBuilder<TColor>.FromRGBA(34, 139, 34, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #FF00FF.
-        /// </summary>
-        public static readonly TColor Fuchsia = ColorBuilder<TColor>.FromRGBA(255, 0, 255, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #DCDCDC.
-        /// </summary>
-        public static readonly TColor Gainsboro = ColorBuilder<TColor>.FromRGBA(220, 220, 220, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #F8F8FF.
-        /// </summary>
-        public static readonly TColor GhostWhite = ColorBuilder<TColor>.FromRGBA(248, 248, 255, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #FFD700.
-        /// </summary>
-        public static readonly TColor Gold = ColorBuilder<TColor>.FromRGBA(255, 215, 0, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #DAA520.
-        /// </summary>
-        public static readonly TColor Goldenrod = ColorBuilder<TColor>.FromRGBA(218, 165, 32, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #808080.
-        /// </summary>
-        public static readonly TColor Gray = ColorBuilder<TColor>.FromRGBA(128, 128, 128, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #008000.
-        /// </summary>
-        public static readonly TColor Green = ColorBuilder<TColor>.FromRGBA(0, 128, 0, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #ADFF2F.
-        /// </summary>
-        public static readonly TColor GreenYellow = ColorBuilder<TColor>.FromRGBA(173, 255, 47, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #F0FFF0.
-        /// </summary>
-        public static readonly TColor Honeydew = ColorBuilder<TColor>.FromRGBA(240, 255, 240, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #FF69B4.
-        /// </summary>
-        public static readonly TColor HotPink = ColorBuilder<TColor>.FromRGBA(255, 105, 180, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #CD5C5C.
-        /// </summary>
-        public static readonly TColor IndianRed = ColorBuilder<TColor>.FromRGBA(205, 92, 92, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #4B0082.
-        /// </summary>
-        public static readonly TColor Indigo = ColorBuilder<TColor>.FromRGBA(75, 0, 130, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #FFFFF0.
-        /// </summary>
-        public static readonly TColor Ivory = ColorBuilder<TColor>.FromRGBA(255, 255, 240, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #F0E68C.
-        /// </summary>
-        public static readonly TColor Khaki = ColorBuilder<TColor>.FromRGBA(240, 230, 140, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #E6E6FA.
-        /// </summary>
-        public static readonly TColor Lavender = ColorBuilder<TColor>.FromRGBA(230, 230, 250, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #FFF0F5.
-        /// </summary>
-        public static readonly TColor LavenderBlush = ColorBuilder<TColor>.FromRGBA(255, 240, 245, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #7CFC00.
-        /// </summary>
-        public static readonly TColor LawnGreen = ColorBuilder<TColor>.FromRGBA(124, 252, 0, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #FFFACD.
-        /// </summary>
-        public static readonly TColor LemonChiffon = ColorBuilder<TColor>.FromRGBA(255, 250, 205, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #ADD8E6.
-        /// </summary>
-        public static readonly TColor LightBlue = ColorBuilder<TColor>.FromRGBA(173, 216, 230, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #F08080.
-        /// </summary>
-        public static readonly TColor LightCoral = ColorBuilder<TColor>.FromRGBA(240, 128, 128, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #E0FFFF.
-        /// </summary>
-        public static readonly TColor LightCyan = ColorBuilder<TColor>.FromRGBA(224, 255, 255, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #FAFAD2.
-        /// </summary>
-        public static readonly TColor LightGoldenrodYellow = ColorBuilder<TColor>.FromRGBA(250, 250, 210, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #D3D3D3.
-        /// </summary>
-        public static readonly TColor LightGray = ColorBuilder<TColor>.FromRGBA(211, 211, 211, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #90EE90.
-        /// </summary>
-        public static readonly TColor LightGreen = ColorBuilder<TColor>.FromRGBA(144, 238, 144, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #FFB6C1.
-        /// </summary>
-        public static readonly TColor LightPink = ColorBuilder<TColor>.FromRGBA(255, 182, 193, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #FFA07A.
-        /// </summary>
-        public static readonly TColor LightSalmon = ColorBuilder<TColor>.FromRGBA(255, 160, 122, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #20B2AA.
-        /// </summary>
-        public static readonly TColor LightSeaGreen = ColorBuilder<TColor>.FromRGBA(32, 178, 170, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #87CEFA.
-        /// </summary>
-        public static readonly TColor LightSkyBlue = ColorBuilder<TColor>.FromRGBA(135, 206, 250, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #778899.
-        /// </summary>
-        public static readonly TColor LightSlateGray = ColorBuilder<TColor>.FromRGBA(119, 136, 153, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #B0C4DE.
-        /// </summary>
-        public static readonly TColor LightSteelBlue = ColorBuilder<TColor>.FromRGBA(176, 196, 222, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #FFFFE0.
-        /// </summary>
-        public static readonly TColor LightYellow = ColorBuilder<TColor>.FromRGBA(255, 255, 224, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #00FF00.
-        /// </summary>
-        public static readonly TColor Lime = ColorBuilder<TColor>.FromRGBA(0, 255, 0, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #32CD32.
-        /// </summary>
-        public static readonly TColor LimeGreen = ColorBuilder<TColor>.FromRGBA(50, 205, 50, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #FAF0E6.
-        /// </summary>
-        public static readonly TColor Linen = ColorBuilder<TColor>.FromRGBA(250, 240, 230, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #FF00FF.
-        /// </summary>
-        public static readonly TColor Magenta = ColorBuilder<TColor>.FromRGBA(255, 0, 255, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #800000.
-        /// </summary>
-        public static readonly TColor Maroon = ColorBuilder<TColor>.FromRGBA(128, 0, 0, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #66CDAA.
-        /// </summary>
-        public static readonly TColor MediumAquamarine = ColorBuilder<TColor>.FromRGBA(102, 205, 170, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #0000CD.
-        /// </summary>
-        public static readonly TColor MediumBlue = ColorBuilder<TColor>.FromRGBA(0, 0, 205, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #BA55D3.
-        /// </summary>
-        public static readonly TColor MediumOrchid = ColorBuilder<TColor>.FromRGBA(186, 85, 211, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #9370DB.
-        /// </summary>
-        public static readonly TColor MediumPurple = ColorBuilder<TColor>.FromRGBA(147, 112, 219, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #3CB371.
-        /// </summary>
-        public static readonly TColor MediumSeaGreen = ColorBuilder<TColor>.FromRGBA(60, 179, 113, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #7B68EE.
-        /// </summary>
-        public static readonly TColor MediumSlateBlue = ColorBuilder<TColor>.FromRGBA(123, 104, 238, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #00FA9A.
-        /// </summary>
-        public static readonly TColor MediumSpringGreen = ColorBuilder<TColor>.FromRGBA(0, 250, 154, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #48D1CC.
-        /// </summary>
-        public static readonly TColor MediumTurquoise = ColorBuilder<TColor>.FromRGBA(72, 209, 204, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #C71585.
-        /// </summary>
-        public static readonly TColor MediumVioletRed = ColorBuilder<TColor>.FromRGBA(199, 21, 133, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #191970.
-        /// </summary>
-        public static readonly TColor MidnightBlue = ColorBuilder<TColor>.FromRGBA(25, 25, 112, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #F5FFFA.
-        /// </summary>
-        public static readonly TColor MintCream = ColorBuilder<TColor>.FromRGBA(245, 255, 250, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #FFE4E1.
-        /// </summary>
-        public static readonly TColor MistyRose = ColorBuilder<TColor>.FromRGBA(255, 228, 225, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #FFE4B5.
-        /// </summary>
-        public static readonly TColor Moccasin = ColorBuilder<TColor>.FromRGBA(255, 228, 181, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #FFDEAD.
-        /// </summary>
-        public static readonly TColor NavajoWhite = ColorBuilder<TColor>.FromRGBA(255, 222, 173, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #000080.
-        /// </summary>
-        public static readonly TColor Navy = ColorBuilder<TColor>.FromRGBA(0, 0, 128, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #FDF5E6.
-        /// </summary>
-        public static readonly TColor OldLace = ColorBuilder<TColor>.FromRGBA(253, 245, 230, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #808000.
-        /// </summary>
-        public static readonly TColor Olive = ColorBuilder<TColor>.FromRGBA(128, 128, 0, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #6B8E23.
-        /// </summary>
-        public static readonly TColor OliveDrab = ColorBuilder<TColor>.FromRGBA(107, 142, 35, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #FFA500.
-        /// </summary>
-        public static readonly TColor Orange = ColorBuilder<TColor>.FromRGBA(255, 165, 0, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #FF4500.
-        /// </summary>
-        public static readonly TColor OrangeRed = ColorBuilder<TColor>.FromRGBA(255, 69, 0, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #DA70D6.
-        /// </summary>
-        public static readonly TColor Orchid = ColorBuilder<TColor>.FromRGBA(218, 112, 214, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #EEE8AA.
-        /// </summary>
-        public static readonly TColor PaleGoldenrod = ColorBuilder<TColor>.FromRGBA(238, 232, 170, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #98FB98.
-        /// </summary>
-        public static readonly TColor PaleGreen = ColorBuilder<TColor>.FromRGBA(152, 251, 152, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #AFEEEE.
-        /// </summary>
-        public static readonly TColor PaleTurquoise = ColorBuilder<TColor>.FromRGBA(175, 238, 238, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #DB7093.
-        /// </summary>
-        public static readonly TColor PaleVioletRed = ColorBuilder<TColor>.FromRGBA(219, 112, 147, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #FFEFD5.
-        /// </summary>
-        public static readonly TColor PapayaWhip = ColorBuilder<TColor>.FromRGBA(255, 239, 213, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #FFDAB9.
-        /// </summary>
-        public static readonly TColor PeachPuff = ColorBuilder<TColor>.FromRGBA(255, 218, 185, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #CD853F.
-        /// </summary>
-        public static readonly TColor Peru = ColorBuilder<TColor>.FromRGBA(205, 133, 63, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #FFC0CB.
-        /// </summary>
-        public static readonly TColor Pink = ColorBuilder<TColor>.FromRGBA(255, 192, 203, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #DDA0DD.
-        /// </summary>
-        public static readonly TColor Plum = ColorBuilder<TColor>.FromRGBA(221, 160, 221, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #B0E0E6.
-        /// </summary>
-        public static readonly TColor PowderBlue = ColorBuilder<TColor>.FromRGBA(176, 224, 230, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #800080.
-        /// </summary>
-        public static readonly TColor Purple = ColorBuilder<TColor>.FromRGBA(128, 0, 128, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #663399.
-        /// </summary>
-        public static readonly TColor RebeccaPurple = ColorBuilder<TColor>.FromRGBA(102, 51, 153, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #FF0000.
-        /// </summary>
-        public static readonly TColor Red = ColorBuilder<TColor>.FromRGBA(255, 0, 0, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #BC8F8F.
-        /// </summary>
-        public static readonly TColor RosyBrown = ColorBuilder<TColor>.FromRGBA(188, 143, 143, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #4169E1.
-        /// </summary>
-        public static readonly TColor RoyalBlue = ColorBuilder<TColor>.FromRGBA(65, 105, 225, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #8B4513.
-        /// </summary>
-        public static readonly TColor SaddleBrown = ColorBuilder<TColor>.FromRGBA(139, 69, 19, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #FA8072.
-        /// </summary>
-        public static readonly TColor Salmon = ColorBuilder<TColor>.FromRGBA(250, 128, 114, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #F4A460.
-        /// </summary>
-        public static readonly TColor SandyBrown = ColorBuilder<TColor>.FromRGBA(244, 164, 96, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #2E8B57.
-        /// </summary>
-        public static readonly TColor SeaGreen = ColorBuilder<TColor>.FromRGBA(46, 139, 87, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #FFF5EE.
-        /// </summary>
-        public static readonly TColor SeaShell = ColorBuilder<TColor>.FromRGBA(255, 245, 238, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #A0522D.
-        /// </summary>
-        public static readonly TColor Sienna = ColorBuilder<TColor>.FromRGBA(160, 82, 45, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #C0C0C0.
-        /// </summary>
-        public static readonly TColor Silver = ColorBuilder<TColor>.FromRGBA(192, 192, 192, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #87CEEB.
-        /// </summary>
-        public static readonly TColor SkyBlue = ColorBuilder<TColor>.FromRGBA(135, 206, 235, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #6A5ACD.
-        /// </summary>
-        public static readonly TColor SlateBlue = ColorBuilder<TColor>.FromRGBA(106, 90, 205, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #708090.
-        /// </summary>
-        public static readonly TColor SlateGray = ColorBuilder<TColor>.FromRGBA(112, 128, 144, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #FFFAFA.
-        /// </summary>
-        public static readonly TColor Snow = ColorBuilder<TColor>.FromRGBA(255, 250, 250, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #00FF7F.
-        /// </summary>
-        public static readonly TColor SpringGreen = ColorBuilder<TColor>.FromRGBA(0, 255, 127, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #4682B4.
-        /// </summary>
-        public static readonly TColor SteelBlue = ColorBuilder<TColor>.FromRGBA(70, 130, 180, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #D2B48C.
-        /// </summary>
-        public static readonly TColor Tan = ColorBuilder<TColor>.FromRGBA(210, 180, 140, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #008080.
-        /// </summary>
-        public static readonly TColor Teal = ColorBuilder<TColor>.FromRGBA(0, 128, 128, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #D8BFD8.
-        /// </summary>
-        public static readonly TColor Thistle = ColorBuilder<TColor>.FromRGBA(216, 191, 216, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #FF6347.
-        /// </summary>
-        public static readonly TColor Tomato = ColorBuilder<TColor>.FromRGBA(255, 99, 71, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #FFFFFF.
-        /// </summary>
-        public static readonly TColor Transparent = ColorBuilder<TColor>.FromRGBA(255, 255, 255, 0);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #40E0D0.
-        /// </summary>
-        public static readonly TColor Turquoise = ColorBuilder<TColor>.FromRGBA(64, 224, 208, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #EE82EE.
-        /// </summary>
-        public static readonly TColor Violet = ColorBuilder<TColor>.FromRGBA(238, 130, 238, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #F5DEB3.
-        /// </summary>
-        public static readonly TColor Wheat = ColorBuilder<TColor>.FromRGBA(245, 222, 179, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #FFFFFF.
-        /// </summary>
-        public static readonly TColor White = ColorBuilder<TColor>.FromRGBA(255, 255, 255, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #F5F5F5.
-        /// </summary>
-        public static readonly TColor WhiteSmoke = ColorBuilder<TColor>.FromRGBA(245, 245, 245, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #FFFF00.
-        /// </summary>
-        public static readonly TColor Yellow = ColorBuilder<TColor>.FromRGBA(255, 255, 0, 255);
-
-        /// <summary>
-        /// Represents a <see paramref="TColor"/> matching the W3C definition that has an hex value of #9ACD32.
-        /// </summary>
-        public static readonly TColor YellowGreen = ColorBuilder<TColor>.FromRGBA(154, 205, 50, 255);
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp/Colors/Spaces/Bgra32.cs b/src/ImageSharp/Colors/Spaces/Bgra32.cs
index cbd1d61194..b1f72033d3 100644
--- a/src/ImageSharp/Colors/Spaces/Bgra32.cs
+++ b/src/ImageSharp/Colors/Spaces/Bgra32.cs
@@ -8,6 +8,7 @@ namespace ImageSharp.Colors.Spaces
     using System;
     using System.ComponentModel;
     using System.Numerics;
+    using ImageSharp.PixelFormats;
 
     /// <summary>
     /// Represents an BGRA (blue, green, red, alpha) color.
@@ -79,16 +80,16 @@ namespace ImageSharp.Colors.Spaces
         public bool IsEmpty => this.Equals(Empty);
 
         /// <summary>
-        /// Allows the implicit conversion of an instance of <see cref="Color"/> to a
+        /// Allows the implicit conversion of an instance of <see cref="Rgba32"/> to a
         /// <see cref="Bgra32"/>.
         /// </summary>
         /// <param name="color">
-        /// The instance of <see cref="Color"/> to convert.
+        /// The instance of <see cref="Rgba32"/> to convert.
         /// </param>
         /// <returns>
         /// An instance of <see cref="Bgra32"/>.
         /// </returns>
-        public static implicit operator Bgra32(Color color)
+        public static implicit operator Bgra32(Rgba32 color)
         {
             return new Bgra32(color.B, color.G, color.R, color.A);
         }
diff --git a/src/ImageSharp/Colors/Spaces/CieLab.cs b/src/ImageSharp/Colors/Spaces/CieLab.cs
index 921158174c..c1e5cba5a0 100644
--- a/src/ImageSharp/Colors/Spaces/CieLab.cs
+++ b/src/ImageSharp/Colors/Spaces/CieLab.cs
@@ -8,6 +8,7 @@ namespace ImageSharp.Colors.Spaces
     using System;
     using System.ComponentModel;
     using System.Numerics;
+    using ImageSharp.PixelFormats;
 
     /// <summary>
     /// Represents an CIE LAB 1976 color.
@@ -72,16 +73,16 @@ namespace ImageSharp.Colors.Spaces
         public bool IsEmpty => this.Equals(Empty);
 
         /// <summary>
-        /// Allows the implicit conversion of an instance of <see cref="Color"/> to a
+        /// Allows the implicit conversion of an instance of <see cref="Rgba32"/> to a
         /// <see cref="CieLab"/>.
         /// </summary>
         /// <param name="color">
-        /// The instance of <see cref="Color"/> to convert.
+        /// The instance of <see cref="Rgba32"/> to convert.
         /// </param>
         /// <returns>
         /// An instance of <see cref="CieLab"/>.
         /// </returns>
-        public static implicit operator CieLab(Color color)
+        public static implicit operator CieLab(Rgba32 color)
         {
             // First convert to CIE XYZ
             Vector4 vector = color.ToVector4().Expand();
diff --git a/src/ImageSharp/Colors/Spaces/CieXyz.cs b/src/ImageSharp/Colors/Spaces/CieXyz.cs
index 5bd1eac634..9c6c9bf60f 100644
--- a/src/ImageSharp/Colors/Spaces/CieXyz.cs
+++ b/src/ImageSharp/Colors/Spaces/CieXyz.cs
@@ -8,6 +8,7 @@ namespace ImageSharp.Colors.Spaces
     using System;
     using System.ComponentModel;
     using System.Numerics;
+    using ImageSharp.PixelFormats;
 
     /// <summary>
     /// Represents an CIE 1931 color
@@ -63,16 +64,16 @@ namespace ImageSharp.Colors.Spaces
         public bool IsEmpty => this.Equals(Empty);
 
         /// <summary>
-        /// Allows the implicit conversion of an instance of <see cref="Color"/> to a
+        /// Allows the implicit conversion of an instance of <see cref="Rgba32"/> to a
         /// <see cref="CieXyz"/>.
         /// </summary>
         /// <param name="color">
-        /// The instance of <see cref="Color"/> to convert.
+        /// The instance of <see cref="Rgba32"/> to convert.
         /// </param>
         /// <returns>
         /// An instance of <see cref="CieXyz"/>.
         /// </returns>
-        public static implicit operator CieXyz(Color color)
+        public static implicit operator CieXyz(Rgba32 color)
         {
             Vector4 vector = color.ToVector4().Expand();
 
diff --git a/src/ImageSharp/Colors/Spaces/Cmyk.cs b/src/ImageSharp/Colors/Spaces/Cmyk.cs
index c81a55c0bb..4ca9f018c6 100644
--- a/src/ImageSharp/Colors/Spaces/Cmyk.cs
+++ b/src/ImageSharp/Colors/Spaces/Cmyk.cs
@@ -8,6 +8,7 @@ namespace ImageSharp.Colors.Spaces
     using System;
     using System.ComponentModel;
     using System.Numerics;
+    using ImageSharp.PixelFormats;
 
     /// <summary>
     /// Represents an CMYK (cyan, magenta, yellow, keyline) color.
@@ -78,7 +79,7 @@ namespace ImageSharp.Colors.Spaces
         public bool IsEmpty => this.Equals(Empty);
 
         /// <summary>
-        /// Allows the implicit conversion of an instance of <see cref="Color"/> to a
+        /// Allows the implicit conversion of an instance of <see cref="Rgba32"/> to a
         /// <see cref="Cmyk"/>.
         /// </summary>
         /// <param name="color">
@@ -87,7 +88,7 @@ namespace ImageSharp.Colors.Spaces
         /// <returns>
         /// An instance of <see cref="Cmyk"/>.
         /// </returns>
-        public static implicit operator Cmyk(Color color)
+        public static implicit operator Cmyk(Rgba32 color)
         {
             float c = 1f - (color.R / 255F);
             float m = 1f - (color.G / 255F);
diff --git a/src/ImageSharp/Colors/Spaces/Hsl.cs b/src/ImageSharp/Colors/Spaces/Hsl.cs
index 1d655ec326..de706c3506 100644
--- a/src/ImageSharp/Colors/Spaces/Hsl.cs
+++ b/src/ImageSharp/Colors/Spaces/Hsl.cs
@@ -8,6 +8,7 @@ namespace ImageSharp.Colors.Spaces
     using System;
     using System.ComponentModel;
     using System.Numerics;
+    using ImageSharp.PixelFormats;
 
     /// <summary>
     /// Represents a Hsl (hue, saturation, lightness) color.
@@ -70,14 +71,14 @@ namespace ImageSharp.Colors.Spaces
         public bool IsEmpty => this.Equals(Empty);
 
         /// <summary>
-        /// Allows the implicit conversion of an instance of <see cref="Color"/> to a
+        /// Allows the implicit conversion of an instance of <see cref="Rgba32"/> to a
         /// <see cref="Hsl"/>.
         /// </summary>
-        /// <param name="color">The instance of <see cref="Color"/> to convert.</param>
+        /// <param name="color">The instance of <see cref="Rgba32"/> to convert.</param>
         /// <returns>
         /// An instance of <see cref="Hsl"/>.
         /// </returns>
-        public static implicit operator Hsl(Color color)
+        public static implicit operator Hsl(Rgba32 color)
         {
             float r = color.R / 255F;
             float g = color.G / 255F;
diff --git a/src/ImageSharp/Colors/Spaces/Hsv.cs b/src/ImageSharp/Colors/Spaces/Hsv.cs
index e171c95282..2b3d79afe9 100644
--- a/src/ImageSharp/Colors/Spaces/Hsv.cs
+++ b/src/ImageSharp/Colors/Spaces/Hsv.cs
@@ -8,6 +8,7 @@ namespace ImageSharp.Colors.Spaces
     using System;
     using System.ComponentModel;
     using System.Numerics;
+    using ImageSharp.PixelFormats;
 
     /// <summary>
     /// Represents a HSV (hue, saturation, value) color. Also known as HSB (hue, saturation, brightness).
@@ -70,14 +71,14 @@ namespace ImageSharp.Colors.Spaces
         public bool IsEmpty => this.Equals(Empty);
 
         /// <summary>
-        /// Allows the implicit conversion of an instance of <see cref="Color"/> to a
+        /// Allows the implicit conversion of an instance of <see cref="Rgba32"/> to a
         /// <see cref="Hsv"/>.
         /// </summary>
-        /// <param name="color">The instance of <see cref="Color"/> to convert.</param>
+        /// <param name="color">The instance of <see cref="Rgba32"/> to convert.</param>
         /// <returns>
         /// An instance of <see cref="Hsv"/>.
         /// </returns>
-        public static implicit operator Hsv(Color color)
+        public static implicit operator Hsv(Rgba32 color)
         {
             float r = color.R / 255F;
             float g = color.G / 255F;
diff --git a/src/ImageSharp/Colors/Spaces/IAlmostEquatable.cs b/src/ImageSharp/Colors/Spaces/IAlmostEquatable.cs
index a2183d396c..04ea91cbad 100644
--- a/src/ImageSharp/Colors/Spaces/IAlmostEquatable.cs
+++ b/src/ImageSharp/Colors/Spaces/IAlmostEquatable.cs
@@ -11,9 +11,9 @@ namespace ImageSharp.Colors.Spaces
     /// Defines a generalized method that a value type or class implements to create
     /// a type-specific method for determining approximate equality of instances.
     /// </summary>
-    /// <typeparam name="TColor">The type of objects to compare.</typeparam>
+    /// <typeparam name="TPixel">The type of objects to compare.</typeparam>
     /// <typeparam name="TPrecision">The object specifying the type to specify precision with.</typeparam>
-    public interface IAlmostEquatable<in TColor, in TPrecision>
+    public interface IAlmostEquatable<in TPixel, in TPrecision>
         where TPrecision : struct, IComparable<TPrecision>
     {
         /// <summary>
@@ -25,6 +25,6 @@ namespace ImageSharp.Colors.Spaces
         /// <returns>
         /// true if the current object is equal to the other parameter; otherwise, false.
         /// </returns>
-        bool AlmostEquals(TColor other, TPrecision precision);
+        bool AlmostEquals(TPixel other, TPrecision precision);
     }
 }
diff --git a/src/ImageSharp/Colors/Spaces/YCbCr.cs b/src/ImageSharp/Colors/Spaces/YCbCr.cs
index ef9f4462b1..06696af9ea 100644
--- a/src/ImageSharp/Colors/Spaces/YCbCr.cs
+++ b/src/ImageSharp/Colors/Spaces/YCbCr.cs
@@ -8,6 +8,7 @@ namespace ImageSharp.Colors.Spaces
     using System;
     using System.ComponentModel;
     using System.Numerics;
+    using ImageSharp.PixelFormats;
 
     /// <summary>
     /// Represents an YCbCr (luminance, blue chroma, red chroma) color conforming to the full range standard used in digital imaging systems.
@@ -72,16 +73,16 @@ namespace ImageSharp.Colors.Spaces
         public bool IsEmpty => this.Equals(Empty);
 
         /// <summary>
-        /// Allows the implicit conversion of an instance of <see cref="Color"/> to a
+        /// Allows the implicit conversion of an instance of <see cref="Rgba32"/> to a
         /// <see cref="YCbCr"/>.
         /// </summary>
         /// <param name="color">
-        /// The instance of <see cref="Color"/> to convert.
+        /// The instance of <see cref="Rgba32"/> to convert.
         /// </param>
         /// <returns>
         /// An instance of <see cref="YCbCr"/>.
         /// </returns>
-        public static implicit operator YCbCr(Color color)
+        public static implicit operator YCbCr(Rgba32 color)
         {
             byte r = color.R;
             byte g = color.G;
diff --git a/src/ImageSharp/Common/Extensions/Vector4Extensions.cs b/src/ImageSharp/Common/Extensions/Vector4Extensions.cs
index 9f3aa405ed..31f3f32ae7 100644
--- a/src/ImageSharp/Common/Extensions/Vector4Extensions.cs
+++ b/src/ImageSharp/Common/Extensions/Vector4Extensions.cs
@@ -8,6 +8,7 @@ namespace ImageSharp
     using System;
     using System.Numerics;
     using System.Runtime.CompilerServices;
+    using ImageSharp.PixelFormats;
 
     /// <summary>
     /// Extension methods for the <see cref="Vector4"/> struct.
@@ -32,7 +33,7 @@ namespace ImageSharp
         /// <see href="http://www.4p8.com/eric.brasseur/gamma.html#formulas"/>
         /// <see href="http://entropymine.com/imageworsener/srgbformula/"/>
         /// </summary>
-        /// <param name="gamma">The <see cref="Color"/> whose signal to expand.</param>
+        /// <param name="gamma">The <see cref="Rgba32"/> whose signal to expand.</param>
         /// <returns>The <see cref="Vector4"/>.</returns>
         public static Vector4 Expand(this Vector4 gamma)
         {
diff --git a/src/ImageSharp/Common/Helpers/ImageMaths.cs b/src/ImageSharp/Common/Helpers/ImageMaths.cs
index 1be7bd6197..cf0ac5c297 100644
--- a/src/ImageSharp/Common/Helpers/ImageMaths.cs
+++ b/src/ImageSharp/Common/Helpers/ImageMaths.cs
@@ -10,6 +10,8 @@ namespace ImageSharp
     using System.Numerics;
     using System.Runtime.CompilerServices;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// Provides common mathematical methods.
     /// </summary>
@@ -156,22 +158,22 @@ namespace ImageSharp
         /// Finds the bounding rectangle based on the first instance of any color component other
         /// than the given one.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="bitmap">The <see cref="Image"/> to search within.</param>
         /// <param name="componentValue">The color component value to remove.</param>
         /// <param name="channel">The <see cref="RgbaComponent"/> channel to test against.</param>
         /// <returns>
         /// The <see cref="Rectangle"/>.
         /// </returns>
-        public static Rectangle GetFilteredBoundingRectangle<TColor>(ImageBase<TColor> bitmap, float componentValue, RgbaComponent channel = RgbaComponent.B)
-            where TColor : struct, IPixel<TColor>
+        public static Rectangle GetFilteredBoundingRectangle<TPixel>(ImageBase<TPixel> bitmap, float componentValue, RgbaComponent channel = RgbaComponent.B)
+            where TPixel : struct, IPixel<TPixel>
         {
             int width = bitmap.Width;
             int height = bitmap.Height;
             Point topLeft = default(Point);
             Point bottomRight = default(Point);
 
-            Func<PixelAccessor<TColor>, int, int, float, bool> delegateFunc;
+            Func<PixelAccessor<TPixel>, int, int, float, bool> delegateFunc;
 
             // Determine which channel to check against
             switch (channel)
@@ -193,7 +195,7 @@ namespace ImageSharp
                     break;
             }
 
-            Func<PixelAccessor<TColor>, int> getMinY = pixels =>
+            Func<PixelAccessor<TPixel>, int> getMinY = pixels =>
             {
                 for (int y = 0; y < height; y++)
                 {
@@ -209,7 +211,7 @@ namespace ImageSharp
                 return 0;
             };
 
-            Func<PixelAccessor<TColor>, int> getMaxY = pixels =>
+            Func<PixelAccessor<TPixel>, int> getMaxY = pixels =>
             {
                 for (int y = height - 1; y > -1; y--)
                 {
@@ -225,7 +227,7 @@ namespace ImageSharp
                 return height;
             };
 
-            Func<PixelAccessor<TColor>, int> getMinX = pixels =>
+            Func<PixelAccessor<TPixel>, int> getMinX = pixels =>
             {
                 for (int x = 0; x < width; x++)
                 {
@@ -241,7 +243,7 @@ namespace ImageSharp
                 return 0;
             };
 
-            Func<PixelAccessor<TColor>, int> getMaxX = pixels =>
+            Func<PixelAccessor<TPixel>, int> getMaxX = pixels =>
             {
                 for (int x = width - 1; x > -1; x--)
                 {
@@ -257,7 +259,7 @@ namespace ImageSharp
                 return height;
             };
 
-            using (PixelAccessor<TColor> bitmapPixels = bitmap.Lock())
+            using (PixelAccessor<TPixel> bitmapPixels = bitmap.Lock())
             {
                 topLeft.Y = getMinY(bitmapPixels);
                 topLeft.X = getMinX(bitmapPixels);
diff --git a/src/ImageSharp/Common/Memory/PixelDataPool{T}.cs b/src/ImageSharp/Common/Memory/PixelDataPool{T}.cs
index f5c7871409..0ec367d246 100644
--- a/src/ImageSharp/Common/Memory/PixelDataPool{T}.cs
+++ b/src/ImageSharp/Common/Memory/PixelDataPool{T}.cs
@@ -8,6 +8,8 @@ namespace ImageSharp
     using System;
     using System.Buffers;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// Provides a resource pool that enables reusing instances of value type arrays for image data <see cref="T:T[]"/>.
     /// </summary>
@@ -24,7 +26,7 @@ namespace ImageSharp
         /// Rents the pixel array from the pool.
         /// </summary>
         /// <param name="minimumLength">The minimum length of the array to return.</param>
-        /// <returns>The <see cref="T:TColor[]"/></returns>
+        /// <returns>The <see cref="T:TPixel[]"/></returns>
         public static T[] Rent(int minimumLength)
         {
             return ArrayPool.Rent(minimumLength);
diff --git a/src/ImageSharp/Dithering/ErrorDiffusion/ErrorDiffuser.cs b/src/ImageSharp/Dithering/ErrorDiffusion/ErrorDiffuser.cs
index d6ab8eb64a..5d0ecde6ba 100644
--- a/src/ImageSharp/Dithering/ErrorDiffusion/ErrorDiffuser.cs
+++ b/src/ImageSharp/Dithering/ErrorDiffusion/ErrorDiffuser.cs
@@ -8,6 +8,8 @@ namespace ImageSharp.Dithering
     using System.Numerics;
     using System.Runtime.CompilerServices;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// The base class for performing error diffusion based dithering.
     /// </summary>
@@ -68,16 +70,16 @@ namespace ImageSharp.Dithering
 
         /// <inheritdoc />
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public void Dither<TColor>(PixelAccessor<TColor> pixels, TColor source, TColor transformed, int x, int y, int width, int height)
-            where TColor : struct, IPixel<TColor>
+        public void Dither<TPixel>(PixelAccessor<TPixel> pixels, TPixel source, TPixel transformed, int x, int y, int width, int height)
+            where TPixel : struct, IPixel<TPixel>
         {
             this.Dither(pixels, source, transformed, x, y, width, height, true);
         }
 
         /// <inheritdoc />
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public void Dither<TColor>(PixelAccessor<TColor> pixels, TColor source, TColor transformed, int x, int y, int width, int height, bool replacePixel)
-            where TColor : struct, IPixel<TColor>
+        public void Dither<TPixel>(PixelAccessor<TPixel> pixels, TPixel source, TPixel transformed, int x, int y, int width, int height, bool replacePixel)
+            where TPixel : struct, IPixel<TPixel>
         {
             if (replacePixel)
             {
@@ -113,7 +115,7 @@ namespace ImageSharp.Dithering
                         Vector4 result = ((error * coefficientVector) / this.divisorVector) + offsetColor;
                         result.W = offsetColor.W;
 
-                        TColor packed = default(TColor);
+                        TPixel packed = default(TPixel);
                         packed.PackFromVector4(result);
                         pixels[matrixX, matrixY] = packed;
                     }
diff --git a/src/ImageSharp/Dithering/ErrorDiffusion/IErrorDiffuser.cs b/src/ImageSharp/Dithering/ErrorDiffusion/IErrorDiffuser.cs
index 66ec3d5155..f49e7e62d2 100644
--- a/src/ImageSharp/Dithering/ErrorDiffusion/IErrorDiffuser.cs
+++ b/src/ImageSharp/Dithering/ErrorDiffusion/IErrorDiffuser.cs
@@ -5,7 +5,7 @@
 
 namespace ImageSharp.Dithering
 {
-    using System;
+    using ImageSharp.PixelFormats;
 
     /// <summary>
     /// Encapsulates properties and methods required to perfom diffused error dithering on an image.
@@ -22,9 +22,9 @@ namespace ImageSharp.Dithering
         /// <param name="y">The row index.</param>
         /// <param name="width">The image width.</param>
         /// <param name="height">The image height.</param>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        void Dither<TColor>(PixelAccessor<TColor> pixels, TColor source, TColor transformed, int x, int y, int width, int height)
-            where TColor : struct, IPixel<TColor>;
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
+        void Dither<TPixel>(PixelAccessor<TPixel> pixels, TPixel source, TPixel transformed, int x, int y, int width, int height)
+            where TPixel : struct, IPixel<TPixel>;
 
         /// <summary>
         /// Transforms the image applying the dither matrix. This method alters the input pixels array
@@ -40,8 +40,8 @@ namespace ImageSharp.Dithering
         /// Whether to replace the pixel at the given coordinates with the transformed value.
         /// Generally this would be true for standard two-color dithering but when used in conjunction with color quantization this should be false.
         /// </param>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        void Dither<TColor>(PixelAccessor<TColor> pixels, TColor source, TColor transformed, int x, int y, int width, int height, bool replacePixel)
-            where TColor : struct, IPixel<TColor>;
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
+        void Dither<TPixel>(PixelAccessor<TPixel> pixels, TPixel source, TPixel transformed, int x, int y, int width, int height, bool replacePixel)
+            where TPixel : struct, IPixel<TPixel>;
     }
 }
diff --git a/src/ImageSharp/Dithering/Ordered/IOrderedDither.cs b/src/ImageSharp/Dithering/Ordered/IOrderedDither.cs
index 5c98973747..3f7cf49885 100644
--- a/src/ImageSharp/Dithering/Ordered/IOrderedDither.cs
+++ b/src/ImageSharp/Dithering/Ordered/IOrderedDither.cs
@@ -5,6 +5,8 @@
 
 namespace ImageSharp.Dithering
 {
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// Encapsulates properties and methods required to perfom ordered dithering on an image.
     /// </summary>
@@ -23,8 +25,8 @@ namespace ImageSharp.Dithering
         /// <param name="y">The row index.</param>
         /// <param name="width">The image width.</param>
         /// <param name="height">The image height.</param>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        void Dither<TColor>(PixelAccessor<TColor> pixels, TColor source, TColor upper, TColor lower, byte[] bytes, int index, int x, int y, int width, int height)
-            where TColor : struct, IPixel<TColor>;
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
+        void Dither<TPixel>(PixelAccessor<TPixel> pixels, TPixel source, TPixel upper, TPixel lower, byte[] bytes, int index, int x, int y, int width, int height)
+            where TPixel : struct, IPixel<TPixel>;
     }
 }
\ No newline at end of file
diff --git a/src/ImageSharp/Dithering/Ordered/OrderedDither4x4.cs b/src/ImageSharp/Dithering/Ordered/OrderedDither4x4.cs
index c2b55d98eb..917f573182 100644
--- a/src/ImageSharp/Dithering/Ordered/OrderedDither4x4.cs
+++ b/src/ImageSharp/Dithering/Ordered/OrderedDither4x4.cs
@@ -5,6 +5,8 @@
 
 namespace ImageSharp.Dithering.Ordered
 {
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// The base class for performing ordered ditheroing using a 4x4 matrix.
     /// </summary>
@@ -25,8 +27,8 @@ namespace ImageSharp.Dithering.Ordered
         }
 
         /// <inheritdoc />
-        public void Dither<TColor>(PixelAccessor<TColor> pixels, TColor source, TColor upper, TColor lower, byte[] bytes, int index, int x, int y, int width, int height)
-            where TColor : struct, IPixel<TColor>
+        public void Dither<TPixel>(PixelAccessor<TPixel> pixels, TPixel source, TPixel upper, TPixel lower, byte[] bytes, int index, int x, int y, int width, int height)
+            where TPixel : struct, IPixel<TPixel>
         {
             // TODO: This doesn't really cut it for me.
             // I'd rather be using float but we need to add some sort of movalization vector methods to all IPixel implementations
diff --git a/src/ImageSharp/Formats/Bmp/BmpDecoder.cs b/src/ImageSharp/Formats/Bmp/BmpDecoder.cs
index da5d246372..9090e9a8cd 100644
--- a/src/ImageSharp/Formats/Bmp/BmpDecoder.cs
+++ b/src/ImageSharp/Formats/Bmp/BmpDecoder.cs
@@ -8,6 +8,8 @@ namespace ImageSharp.Formats
     using System;
     using System.IO;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// Image decoder for generating an image out of a Windows bitmap stream.
     /// </summary>
@@ -26,13 +28,13 @@ namespace ImageSharp.Formats
     public class BmpDecoder : IImageDecoder
     {
         /// <inheritdoc/>
-        public Image<TColor> Decode<TColor>(Configuration configuration, Stream stream, IDecoderOptions options)
+        public Image<TPixel> Decode<TPixel>(Configuration configuration, Stream stream, IDecoderOptions options)
 
-            where TColor : struct, IPixel<TColor>
+            where TPixel : struct, IPixel<TPixel>
         {
             Guard.NotNull(stream, "stream");
 
-            return new BmpDecoderCore(configuration).Decode<TColor>(stream);
+            return new BmpDecoderCore(configuration).Decode<TPixel>(stream);
         }
     }
 }
diff --git a/src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs b/src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs
index 18e4e858b8..a9aac5efa7 100644
--- a/src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs
+++ b/src/ImageSharp/Formats/Bmp/BmpDecoderCore.cs
@@ -7,6 +7,8 @@ namespace ImageSharp.Formats
     using System;
     using System.IO;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// Performs the bmp decoding operation.
     /// </summary>
@@ -58,15 +60,15 @@ namespace ImageSharp.Formats
         /// Decodes the image from the specified this._stream and sets
         /// the data to image.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="stream">The stream, where the image should be
         /// decoded from. Cannot be null (Nothing in Visual Basic).</param>
         /// <exception cref="System.ArgumentNullException">
         ///    <para><paramref name="stream"/> is null.</para>
         /// </exception>
         /// <returns>The decoded image.</returns>
-        public Image<TColor> Decode<TColor>(Stream stream)
-            where TColor : struct, IPixel<TColor>
+        public Image<TPixel> Decode<TPixel>(Stream stream)
+            where TPixel : struct, IPixel<TPixel>
         {
             this.currentStream = stream;
 
@@ -118,15 +120,15 @@ namespace ImageSharp.Formats
                     this.currentStream.Read(palette, 0, colorMapSize);
                 }
 
-                if (this.infoHeader.Width > Image<TColor>.MaxWidth || this.infoHeader.Height > Image<TColor>.MaxHeight)
+                if (this.infoHeader.Width > Image<TPixel>.MaxWidth || this.infoHeader.Height > Image<TPixel>.MaxHeight)
                 {
                     throw new ArgumentOutOfRangeException(
                         $"The input bitmap '{this.infoHeader.Width}x{this.infoHeader.Height}' is "
-                        + $"bigger then the max allowed size '{Image<TColor>.MaxWidth}x{Image<TColor>.MaxHeight}'");
+                        + $"bigger then the max allowed size '{Image<TPixel>.MaxWidth}x{Image<TPixel>.MaxHeight}'");
                 }
 
-                Image<TColor> image = Image.Create<TColor>(this.infoHeader.Width, this.infoHeader.Height, this.configuration);
-                using (PixelAccessor<TColor> pixels = image.Lock())
+                Image<TPixel> image = Image.Create<TPixel>(this.infoHeader.Width, this.infoHeader.Height, this.configuration);
+                using (PixelAccessor<TPixel> pixels = image.Lock())
                 {
                     switch (this.infoHeader.Compression)
                     {
@@ -213,15 +215,15 @@ namespace ImageSharp.Formats
         /// <summary>
         /// Reads the color palette from the stream.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <param name="pixels">The <see cref="PixelAccessor{TColor}"/> to assign the palette to.</param>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
+        /// <param name="pixels">The <see cref="PixelAccessor{TPixel}"/> to assign the palette to.</param>
         /// <param name="colors">The <see cref="T:byte[]"/> containing the colors.</param>
         /// <param name="width">The width of the bitmap.</param>
         /// <param name="height">The height of the bitmap.</param>
         /// <param name="bits">The number of bits per pixel.</param>
         /// <param name="inverted">Whether the bitmap is inverted.</param>
-        private void ReadRgbPalette<TColor>(PixelAccessor<TColor> pixels, byte[] colors, int width, int height, int bits, bool inverted)
-            where TColor : struct, IPixel<TColor>
+        private void ReadRgbPalette<TPixel>(PixelAccessor<TPixel> pixels, byte[] colors, int width, int height, int bits, bool inverted)
+            where TPixel : struct, IPixel<TPixel>
         {
             // Pixels per byte (bits per pixel)
             int ppb = 8 / bits;
@@ -239,7 +241,7 @@ namespace ImageSharp.Formats
             }
 
             byte[] row = new byte[arrayWidth + padding];
-            TColor color = default(TColor);
+            TPixel color = default(TPixel);
 
             for (int y = 0; y < height; y++)
             {
@@ -270,21 +272,21 @@ namespace ImageSharp.Formats
         /// <summary>
         /// Reads the 16 bit color palette from the stream
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <param name="pixels">The <see cref="PixelAccessor{TColor}"/> to assign the palette to.</param>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
+        /// <param name="pixels">The <see cref="PixelAccessor{TPixel}"/> to assign the palette to.</param>
         /// <param name="width">The width of the bitmap.</param>
         /// <param name="height">The height of the bitmap.</param>
         /// <param name="inverted">Whether the bitmap is inverted.</param>
-        private void ReadRgb16<TColor>(PixelAccessor<TColor> pixels, int width, int height, bool inverted)
-            where TColor : struct, IPixel<TColor>
+        private void ReadRgb16<TPixel>(PixelAccessor<TPixel> pixels, int width, int height, bool inverted)
+            where TPixel : struct, IPixel<TPixel>
         {
             // We divide here as we will store the colors in our floating point format.
             const int ScaleR = 8; // 256/32
             const int ScaleG = 4; // 256/64
             const int ComponentCount = 2;
 
-            TColor color = default(TColor);
-            using (PixelArea<TColor> row = new PixelArea<TColor>(width, ComponentOrder.Xyz))
+            TPixel color = default(TPixel);
+            using (PixelArea<TPixel> row = new PixelArea<TPixel>(width, ComponentOrder.Xyz))
             {
                 for (int y = 0; y < height; y++)
                 {
@@ -312,16 +314,16 @@ namespace ImageSharp.Formats
         /// <summary>
         /// Reads the 24 bit color palette from the stream
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <param name="pixels">The <see cref="PixelAccessor{TColor}"/> to assign the palette to.</param>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
+        /// <param name="pixels">The <see cref="PixelAccessor{TPixel}"/> to assign the palette to.</param>
         /// <param name="width">The width of the bitmap.</param>
         /// <param name="height">The height of the bitmap.</param>
         /// <param name="inverted">Whether the bitmap is inverted.</param>
-        private void ReadRgb24<TColor>(PixelAccessor<TColor> pixels, int width, int height, bool inverted)
-            where TColor : struct, IPixel<TColor>
+        private void ReadRgb24<TPixel>(PixelAccessor<TPixel> pixels, int width, int height, bool inverted)
+            where TPixel : struct, IPixel<TPixel>
         {
             int padding = CalculatePadding(width, 3);
-            using (PixelArea<TColor> row = new PixelArea<TColor>(width, ComponentOrder.Zyx, padding))
+            using (PixelArea<TPixel> row = new PixelArea<TPixel>(width, ComponentOrder.Zyx, padding))
             {
                 for (int y = 0; y < height; y++)
                 {
@@ -336,16 +338,16 @@ namespace ImageSharp.Formats
         /// <summary>
         /// Reads the 32 bit color palette from the stream
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <param name="pixels">The <see cref="PixelAccessor{TColor}"/> to assign the palette to.</param>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
+        /// <param name="pixels">The <see cref="PixelAccessor{TPixel}"/> to assign the palette to.</param>
         /// <param name="width">The width of the bitmap.</param>
         /// <param name="height">The height of the bitmap.</param>
         /// <param name="inverted">Whether the bitmap is inverted.</param>
-        private void ReadRgb32<TColor>(PixelAccessor<TColor> pixels, int width, int height, bool inverted)
-            where TColor : struct, IPixel<TColor>
+        private void ReadRgb32<TPixel>(PixelAccessor<TPixel> pixels, int width, int height, bool inverted)
+            where TPixel : struct, IPixel<TPixel>
         {
             int padding = CalculatePadding(width, 4);
-            using (PixelArea<TColor> row = new PixelArea<TColor>(width, ComponentOrder.Zyxw, padding))
+            using (PixelArea<TPixel> row = new PixelArea<TPixel>(width, ComponentOrder.Zyxw, padding))
             {
                 for (int y = 0; y < height; y++)
                 {
diff --git a/src/ImageSharp/Formats/Bmp/BmpEncoder.cs b/src/ImageSharp/Formats/Bmp/BmpEncoder.cs
index d0a3550f6f..dc2bc0e972 100644
--- a/src/ImageSharp/Formats/Bmp/BmpEncoder.cs
+++ b/src/ImageSharp/Formats/Bmp/BmpEncoder.cs
@@ -8,6 +8,8 @@ namespace ImageSharp.Formats
     using System;
     using System.IO;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// Image encoder for writing an image to a stream as a Windows bitmap.
     /// </summary>
@@ -15,8 +17,8 @@ namespace ImageSharp.Formats
     public class BmpEncoder : IImageEncoder
     {
         /// <inheritdoc/>
-        public void Encode<TColor>(Image<TColor> image, Stream stream, IEncoderOptions options)
-            where TColor : struct, IPixel<TColor>
+        public void Encode<TPixel>(Image<TPixel> image, Stream stream, IEncoderOptions options)
+            where TPixel : struct, IPixel<TPixel>
         {
             IBmpEncoderOptions bmpOptions = BmpEncoderOptions.Create(options);
 
@@ -24,14 +26,14 @@ namespace ImageSharp.Formats
         }
 
         /// <summary>
-        /// Encodes the image to the specified stream from the <see cref="Image{TColor}"/>.
+        /// Encodes the image to the specified stream from the <see cref="Image{TPixel}"/>.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <param name="image">The <see cref="Image{TColor}"/> to encode from.</param>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
+        /// <param name="image">The <see cref="Image{TPixel}"/> to encode from.</param>
         /// <param name="stream">The <see cref="Stream"/> to encode the image data to.</param>
         /// <param name="options">The options for the encoder.</param>
-        public void Encode<TColor>(Image<TColor> image, Stream stream, IBmpEncoderOptions options)
-            where TColor : struct, IPixel<TColor>
+        public void Encode<TPixel>(Image<TPixel> image, Stream stream, IBmpEncoderOptions options)
+            where TPixel : struct, IPixel<TPixel>
         {
             BmpEncoderCore encoder = new BmpEncoderCore(options);
             encoder.Encode(image, stream);
diff --git a/src/ImageSharp/Formats/Bmp/BmpEncoderCore.cs b/src/ImageSharp/Formats/Bmp/BmpEncoderCore.cs
index df62fb6f40..617edde8eb 100644
--- a/src/ImageSharp/Formats/Bmp/BmpEncoderCore.cs
+++ b/src/ImageSharp/Formats/Bmp/BmpEncoderCore.cs
@@ -8,6 +8,8 @@ namespace ImageSharp.Formats
     using System;
     using System.IO;
 
+    using ImageSharp.PixelFormats;
+
     using IO;
 
     /// <summary>
@@ -35,13 +37,13 @@ namespace ImageSharp.Formats
         }
 
         /// <summary>
-        /// Encodes the image to the specified stream from the <see cref="ImageBase{TColor}"/>.
+        /// Encodes the image to the specified stream from the <see cref="ImageBase{TPixel}"/>.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <param name="image">The <see cref="ImageBase{TColor}"/> to encode from.</param>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
+        /// <param name="image">The <see cref="ImageBase{TPixel}"/> to encode from.</param>
         /// <param name="stream">The <see cref="Stream"/> to encode the image data to.</param>
-        public void Encode<TColor>(ImageBase<TColor> image, Stream stream)
-            where TColor : struct, IPixel<TColor>
+        public void Encode<TPixel>(ImageBase<TPixel> image, Stream stream)
+            where TPixel : struct, IPixel<TPixel>
         {
             Guard.NotNull(image, nameof(image));
             Guard.NotNull(stream, nameof(stream));
@@ -124,15 +126,15 @@ namespace ImageSharp.Formats
         /// <summary>
         /// Writes the pixel data to the binary stream.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="writer">The <see cref="EndianBinaryWriter"/> containing the stream to write to.</param>
         /// <param name="image">
-        /// The <see cref="ImageBase{TColor}"/> containing pixel data.
+        /// The <see cref="ImageBase{TPixel}"/> containing pixel data.
         /// </param>
-        private void WriteImage<TColor>(EndianBinaryWriter writer, ImageBase<TColor> image)
-            where TColor : struct, IPixel<TColor>
+        private void WriteImage<TPixel>(EndianBinaryWriter writer, ImageBase<TPixel> image)
+            where TPixel : struct, IPixel<TPixel>
         {
-            using (PixelAccessor<TColor> pixels = image.Lock())
+            using (PixelAccessor<TPixel> pixels = image.Lock())
             {
                 switch (this.options.BitsPerPixel)
                 {
@@ -150,13 +152,13 @@ namespace ImageSharp.Formats
         /// <summary>
         /// Writes the 32bit color palette to the stream.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="writer">The <see cref="EndianBinaryWriter"/> containing the stream to write to.</param>
-        /// <param name="pixels">The <see cref="PixelAccessor{TColor}"/> containing pixel data.</param>
-        private void Write32Bit<TColor>(EndianBinaryWriter writer, PixelAccessor<TColor> pixels)
-            where TColor : struct, IPixel<TColor>
+        /// <param name="pixels">The <see cref="PixelAccessor{TPixel}"/> containing pixel data.</param>
+        private void Write32Bit<TPixel>(EndianBinaryWriter writer, PixelAccessor<TPixel> pixels)
+            where TPixel : struct, IPixel<TPixel>
         {
-            using (PixelArea<TColor> row = new PixelArea<TColor>(pixels.Width, ComponentOrder.Zyxw, this.padding))
+            using (PixelArea<TPixel> row = new PixelArea<TPixel>(pixels.Width, ComponentOrder.Zyxw, this.padding))
             {
                 for (int y = pixels.Height - 1; y >= 0; y--)
                 {
@@ -169,13 +171,13 @@ namespace ImageSharp.Formats
         /// <summary>
         /// Writes the 24bit color palette to the stream.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="writer">The <see cref="EndianBinaryWriter"/> containing the stream to write to.</param>
-        /// <param name="pixels">The <see cref="PixelAccessor{TColor}"/> containing pixel data.</param>
-        private void Write24Bit<TColor>(EndianBinaryWriter writer, PixelAccessor<TColor> pixels)
-            where TColor : struct, IPixel<TColor>
+        /// <param name="pixels">The <see cref="PixelAccessor{TPixel}"/> containing pixel data.</param>
+        private void Write24Bit<TPixel>(EndianBinaryWriter writer, PixelAccessor<TPixel> pixels)
+            where TPixel : struct, IPixel<TPixel>
         {
-            using (PixelArea<TColor> row = new PixelArea<TColor>(pixels.Width, ComponentOrder.Zyx, this.padding))
+            using (PixelArea<TPixel> row = new PixelArea<TPixel>(pixels.Width, ComponentOrder.Zyx, this.padding))
             {
                 for (int y = pixels.Height - 1; y >= 0; y--)
                 {
diff --git a/src/ImageSharp/Formats/Bmp/ImageExtensions.cs b/src/ImageSharp/Formats/Bmp/ImageExtensions.cs
index 5b92b90d63..aba24f9997 100644
--- a/src/ImageSharp/Formats/Bmp/ImageExtensions.cs
+++ b/src/ImageSharp/Formats/Bmp/ImageExtensions.cs
@@ -10,23 +10,25 @@ namespace ImageSharp
 
     using Formats;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
-    /// Extension methods for the <see cref="Image{TColor}"/> type.
+    /// Extension methods for the <see cref="Image{TPixel}"/> type.
     /// </summary>
     public static partial class ImageExtensions
     {
         /// <summary>
         /// Saves the image to the given stream with the bmp format.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="stream">The stream to save the image to.</param>
         /// <exception cref="System.ArgumentNullException">Thrown if the stream is null.</exception>
         /// <returns>
-        /// The <see cref="Image{TColoR}"/>.
+        /// The <see cref="Image{TPixel}"/>.
         /// </returns>
-        public static Image<TColor> SaveAsBmp<TColor>(this Image<TColor> source, Stream stream)
-            where TColor : struct, IPixel<TColor>
+        public static Image<TPixel> SaveAsBmp<TPixel>(this Image<TPixel> source, Stream stream)
+            where TPixel : struct, IPixel<TPixel>
                         => source.Save(stream, new BmpEncoder());
     }
 }
diff --git a/src/ImageSharp/Formats/Gif/GifDecoder.cs b/src/ImageSharp/Formats/Gif/GifDecoder.cs
index 2eb89de8ff..88aaccf6a4 100644
--- a/src/ImageSharp/Formats/Gif/GifDecoder.cs
+++ b/src/ImageSharp/Formats/Gif/GifDecoder.cs
@@ -8,33 +8,35 @@ namespace ImageSharp.Formats
     using System;
     using System.IO;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// Decoder for generating an image out of a gif encoded stream.
     /// </summary>
     public class GifDecoder : IImageDecoder
     {
         /// <inheritdoc/>
-        public Image<TColor> Decode<TColor>(Configuration configuration, Stream stream, IDecoderOptions options)
+        public Image<TPixel> Decode<TPixel>(Configuration configuration, Stream stream, IDecoderOptions options)
 
-            where TColor : struct, IPixel<TColor>
+            where TPixel : struct, IPixel<TPixel>
         {
             IGifDecoderOptions gifOptions = GifDecoderOptions.Create(options);
 
-            return this.Decode<TColor>(configuration, stream, gifOptions);
+            return this.Decode<TPixel>(configuration, stream, gifOptions);
         }
 
         /// <summary>
-        /// Decodes the image from the specified stream to the <see cref="ImageBase{TColor}"/>.
+        /// Decodes the image from the specified stream to the <see cref="ImageBase{TPixel}"/>.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="configuration">The configuration.</param>
         /// <param name="stream">The <see cref="Stream"/> containing image data.</param>
         /// <param name="options">The options for the decoder.</param>
         /// <returns>The image thats been decoded.</returns>
-        public Image<TColor> Decode<TColor>(Configuration configuration, Stream stream, IGifDecoderOptions options)
-            where TColor : struct, IPixel<TColor>
+        public Image<TPixel> Decode<TPixel>(Configuration configuration, Stream stream, IGifDecoderOptions options)
+            where TPixel : struct, IPixel<TPixel>
         {
-            return new GifDecoderCore<TColor>(options, configuration).Decode(stream);
+            return new GifDecoderCore<TPixel>(options, configuration).Decode(stream);
         }
     }
 }
diff --git a/src/ImageSharp/Formats/Gif/GifDecoderCore.cs b/src/ImageSharp/Formats/Gif/GifDecoderCore.cs
index 4c119ca737..93d0bcaf18 100644
--- a/src/ImageSharp/Formats/Gif/GifDecoderCore.cs
+++ b/src/ImageSharp/Formats/Gif/GifDecoderCore.cs
@@ -10,12 +10,14 @@ namespace ImageSharp.Formats
     using System.IO;
     using System.Text;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// Performs the gif decoding operation.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    internal class GifDecoderCore<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    internal class GifDecoderCore<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
         /// The temp buffer used to reduce allocations.
@@ -50,7 +52,7 @@ namespace ImageSharp.Formats
         /// <summary>
         /// The previous frame.
         /// </summary>
-        private ImageFrame<TColor> previousFrame;
+        private ImageFrame<TPixel> previousFrame;
 
         /// <summary>
         /// The area to restore.
@@ -75,10 +77,10 @@ namespace ImageSharp.Formats
         /// <summary>
         /// The image to decode the information to.
         /// </summary>
-        private Image<TColor> image;
+        private Image<TPixel> image;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="GifDecoderCore{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="GifDecoderCore{TPixel}"/> class.
         /// </summary>
         /// <param name="options">The decoder options.</param>
         /// <param name="configuration">The configuration.</param>
@@ -93,7 +95,7 @@ namespace ImageSharp.Formats
         /// </summary>
         /// <param name="stream">The stream containing image data. </param>
         /// <returns>The decoded image</returns>
-        public Image<TColor> Decode(Stream stream)
+        public Image<TPixel> Decode(Stream stream)
         {
             try
             {
@@ -227,10 +229,10 @@ namespace ImageSharp.Formats
             }
 
             /* // No point doing this as the max width/height is always int.Max and that always bigger than the max size of a gif which is stored in a short.
-            if (this.logicalScreenDescriptor.Width > Image<TColor>.MaxWidth || this.logicalScreenDescriptor.Height > Image<TColor>.MaxHeight)
+            if (this.logicalScreenDescriptor.Width > Image<TPixel>.MaxWidth || this.logicalScreenDescriptor.Height > Image<TPixel>.MaxHeight)
             {
                 throw new ArgumentOutOfRangeException(
-                    $"The input gif '{this.logicalScreenDescriptor.Width}x{this.logicalScreenDescriptor.Height}' is bigger then the max allowed size '{Image<TColor>.MaxWidth}x{Image<TColor>.MaxHeight}'");
+                    $"The input gif '{this.logicalScreenDescriptor.Width}x{this.logicalScreenDescriptor.Height}' is bigger then the max allowed size '{Image<TPixel>.MaxWidth}x{Image<TPixel>.MaxHeight}'");
             }
             */
         }
@@ -351,18 +353,18 @@ namespace ImageSharp.Formats
             int imageWidth = this.logicalScreenDescriptor.Width;
             int imageHeight = this.logicalScreenDescriptor.Height;
 
-            ImageFrame<TColor> previousFrame = null;
+            ImageFrame<TPixel> previousFrame = null;
 
-            ImageFrame<TColor> currentFrame = null;
+            ImageFrame<TPixel> currentFrame = null;
 
-            ImageBase<TColor> image;
+            ImageBase<TPixel> image;
 
             if (this.previousFrame == null)
             {
                 this.metaData.Quality = colorTableLength / 3;
 
                 // This initializes the image to become fully transparent because the alpha channel is zero.
-                this.image = Image.Create<TColor>(imageWidth, imageHeight, this.metaData, this.configuration);
+                this.image = Image.Create<TPixel>(imageWidth, imageHeight, this.metaData, this.configuration);
 
                 this.SetFrameDelay(this.metaData);
 
@@ -392,7 +394,7 @@ namespace ImageSharp.Formats
             int interlaceIncrement = 8; // The interlacing line increment
             int interlaceY = 0; // The current interlaced line
 
-            using (PixelAccessor<TColor> pixelAccessor = image.Lock())
+            using (PixelAccessor<TPixel> pixelAccessor = image.Lock())
             {
                 for (int y = descriptor.Top; y < descriptor.Top + descriptor.Height; y++)
                 {
@@ -441,7 +443,7 @@ namespace ImageSharp.Formats
                         {
                             int indexOffset = index * 3;
 
-                            TColor pixel = default(TColor);
+                            TPixel pixel = default(TPixel);
                             pixel.PackFromBytes(colorTable[indexOffset], colorTable[indexOffset + 1], colorTable[indexOffset + 2], 255);
                             pixelAccessor[x, writeY] = pixel;
                         }
@@ -470,7 +472,7 @@ namespace ImageSharp.Formats
         /// Restores the current frame area to the background.
         /// </summary>
         /// <param name="frame">The frame.</param>
-        private void RestoreToBackground(ImageBase<TColor> frame)
+        private void RestoreToBackground(ImageBase<TPixel> frame)
         {
             if (this.restoreArea == null)
             {
@@ -481,16 +483,16 @@ namespace ImageSharp.Formats
             if (this.restoreArea.Value.Width == this.image.Width &&
                 this.restoreArea.Value.Height == this.image.Height)
             {
-                using (PixelAccessor<TColor> pixelAccessor = frame.Lock())
+                using (PixelAccessor<TPixel> pixelAccessor = frame.Lock())
                 {
                     pixelAccessor.Reset();
                 }
             }
             else
             {
-                using (PixelArea<TColor> emptyRow = new PixelArea<TColor>(this.restoreArea.Value.Width, ComponentOrder.Xyzw))
+                using (PixelArea<TPixel> emptyRow = new PixelArea<TPixel>(this.restoreArea.Value.Width, ComponentOrder.Xyzw))
                 {
-                    using (PixelAccessor<TColor> pixelAccessor = frame.Lock())
+                    using (PixelAccessor<TPixel> pixelAccessor = frame.Lock())
                     {
                         for (int y = this.restoreArea.Value.Top; y < this.restoreArea.Value.Top + this.restoreArea.Value.Height; y++)
                         {
diff --git a/src/ImageSharp/Formats/Gif/GifEncoder.cs b/src/ImageSharp/Formats/Gif/GifEncoder.cs
index cc8516ed9d..b5cadd834e 100644
--- a/src/ImageSharp/Formats/Gif/GifEncoder.cs
+++ b/src/ImageSharp/Formats/Gif/GifEncoder.cs
@@ -8,14 +8,16 @@ namespace ImageSharp.Formats
     using System;
     using System.IO;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// Image encoder for writing image data to a stream in gif format.
     /// </summary>
     public class GifEncoder : IImageEncoder
     {
         /// <inheritdoc/>
-        public void Encode<TColor>(Image<TColor> image, Stream stream, IEncoderOptions options)
-            where TColor : struct, IPixel<TColor>
+        public void Encode<TPixel>(Image<TPixel> image, Stream stream, IEncoderOptions options)
+            where TPixel : struct, IPixel<TPixel>
         {
             IGifEncoderOptions gifOptions = GifEncoderOptions.Create(options);
 
@@ -23,14 +25,14 @@ namespace ImageSharp.Formats
         }
 
         /// <summary>
-        /// Encodes the image to the specified stream from the <see cref="Image{TColor}"/>.
+        /// Encodes the image to the specified stream from the <see cref="Image{TPixel}"/>.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <param name="image">The <see cref="Image{TColor}"/> to encode from.</param>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
+        /// <param name="image">The <see cref="Image{TPixel}"/> to encode from.</param>
         /// <param name="stream">The <see cref="Stream"/> to encode the image data to.</param>
         /// <param name="options">The options for the encoder.</param>
-        public void Encode<TColor>(Image<TColor> image, Stream stream, IGifEncoderOptions options)
-            where TColor : struct, IPixel<TColor>
+        public void Encode<TPixel>(Image<TPixel> image, Stream stream, IGifEncoderOptions options)
+            where TPixel : struct, IPixel<TPixel>
         {
             GifEncoderCore encoder = new GifEncoderCore(options);
             encoder.Encode(image, stream);
diff --git a/src/ImageSharp/Formats/Gif/GifEncoderCore.cs b/src/ImageSharp/Formats/Gif/GifEncoderCore.cs
index 38cbba8500..82f32323e8 100644
--- a/src/ImageSharp/Formats/Gif/GifEncoderCore.cs
+++ b/src/ImageSharp/Formats/Gif/GifEncoderCore.cs
@@ -10,6 +10,8 @@ namespace ImageSharp.Formats
     using System.IO;
     using System.Linq;
 
+    using ImageSharp.PixelFormats;
+
     using IO;
     using Quantizers;
 
@@ -48,18 +50,18 @@ namespace ImageSharp.Formats
         public IQuantizer Quantizer { get; set; }
 
         /// <summary>
-        /// Encodes the image to the specified stream from the <see cref="Image{TColor}"/>.
+        /// Encodes the image to the specified stream from the <see cref="Image{TPixel}"/>.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <param name="image">The <see cref="Image{TColor}"/> to encode from.</param>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
+        /// <param name="image">The <see cref="Image{TPixel}"/> to encode from.</param>
         /// <param name="stream">The <see cref="Stream"/> to encode the image data to.</param>
-        public void Encode<TColor>(Image<TColor> image, Stream stream)
-            where TColor : struct, IPixel<TColor>
+        public void Encode<TPixel>(Image<TPixel> image, Stream stream)
+            where TPixel : struct, IPixel<TPixel>
         {
             Guard.NotNull(image, nameof(image));
             Guard.NotNull(stream, nameof(stream));
 
-            this.Quantizer = this.options.Quantizer ?? new OctreeQuantizer<TColor>();
+            this.Quantizer = this.options.Quantizer ?? new OctreeQuantizer<TPixel>();
 
             // Do not use IDisposable pattern here as we want to preserve the stream.
             EndianBinaryWriter writer = new EndianBinaryWriter(Endianness.LittleEndian, stream);
@@ -72,7 +74,7 @@ namespace ImageSharp.Formats
             this.bitDepth = ImageMaths.GetBitsNeededForColorDepth(quality);
 
             // Quantize the image returning a palette.
-            QuantizedImage<TColor> quantized = ((IQuantizer<TColor>)this.Quantizer).Quantize(image, quality);
+            QuantizedImage<TPixel> quantized = ((IQuantizer<TPixel>)this.Quantizer).Quantize(image, quality);
 
             int index = this.GetTransparentIndex(quantized);
 
@@ -97,8 +99,8 @@ namespace ImageSharp.Formats
                 // ReSharper disable once ForCanBeConvertedToForeach
                 for (int i = 0; i < image.Frames.Count; i++)
                 {
-                    ImageFrame<TColor> frame = image.Frames[i];
-                    QuantizedImage<TColor> quantizedFrame = ((IQuantizer<TColor>)this.Quantizer).Quantize(frame, quality);
+                    ImageFrame<TPixel> frame = image.Frames[i];
+                    QuantizedImage<TPixel> quantizedFrame = ((IQuantizer<TPixel>)this.Quantizer).Quantize(frame, quality);
 
                     this.WriteGraphicalControlExtension(frame, writer, this.GetTransparentIndex(quantizedFrame));
                     this.WriteImageDescriptor(frame, writer);
@@ -117,12 +119,12 @@ namespace ImageSharp.Formats
         /// <param name="quantized">
         /// The quantized.
         /// </param>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <returns>
         /// The <see cref="int"/>.
         /// </returns>
-        private int GetTransparentIndex<TColor>(QuantizedImage<TColor> quantized)
-            where TColor : struct, IPixel<TColor>
+        private int GetTransparentIndex<TPixel>(QuantizedImage<TPixel> quantized)
+            where TPixel : struct, IPixel<TPixel>
         {
             // Find the lowest alpha value and make it the transparent index.
             int index = 255;
@@ -167,12 +169,12 @@ namespace ImageSharp.Formats
         /// <summary>
         /// Writes the logical screen descriptor to the stream.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="image">The image to encode.</param>
         /// <param name="writer">The writer to write to the stream with.</param>
         /// <param name="tranparencyIndex">The transparency index to set the default background index to.</param>
-        private void WriteLogicalScreenDescriptor<TColor>(Image<TColor> image, EndianBinaryWriter writer, int tranparencyIndex)
-            where TColor : struct, IPixel<TColor>
+        private void WriteLogicalScreenDescriptor<TPixel>(Image<TPixel> image, EndianBinaryWriter writer, int tranparencyIndex)
+            where TPixel : struct, IPixel<TPixel>
         {
             GifLogicalScreenDescriptor descriptor = new GifLogicalScreenDescriptor
             {
@@ -233,11 +235,11 @@ namespace ImageSharp.Formats
         /// <summary>
         /// Writes the image comments to the stream.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <param name="image">The <see cref="ImageBase{TColor}"/> to be encoded.</param>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
+        /// <param name="image">The <see cref="ImageBase{TPixel}"/> to be encoded.</param>
         /// <param name="writer">The stream to write to.</param>
-        private void WriteComments<TColor>(Image<TColor> image, EndianBinaryWriter writer)
-            where TColor : struct, IPixel<TColor>
+        private void WriteComments<TPixel>(Image<TPixel> image, EndianBinaryWriter writer)
+            where TPixel : struct, IPixel<TPixel>
         {
             if (this.options.IgnoreMetadata == true)
             {
@@ -266,12 +268,12 @@ namespace ImageSharp.Formats
         /// <summary>
         /// Writes the graphics control extension to the stream.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <param name="image">The <see cref="Image{TColor}"/> to encode.</param>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
+        /// <param name="image">The <see cref="Image{TPixel}"/> to encode.</param>
         /// <param name="writer">The stream to write to.</param>
         /// <param name="transparencyIndex">The index of the color in the color palette to make transparent.</param>
-        private void WriteGraphicalControlExtension<TColor>(Image<TColor> image, EndianBinaryWriter writer, int transparencyIndex)
-            where TColor : struct, IPixel<TColor>
+        private void WriteGraphicalControlExtension<TPixel>(Image<TPixel> image, EndianBinaryWriter writer, int transparencyIndex)
+            where TPixel : struct, IPixel<TPixel>
         {
             this.WriteGraphicalControlExtension(image, image.MetaData, writer, transparencyIndex);
         }
@@ -279,12 +281,12 @@ namespace ImageSharp.Formats
         /// <summary>
         /// Writes the graphics control extension to the stream.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <param name="imageFrame">The <see cref="ImageFrame{TColor}"/> to encode.</param>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
+        /// <param name="imageFrame">The <see cref="ImageFrame{TPixel}"/> to encode.</param>
         /// <param name="writer">The stream to write to.</param>
         /// <param name="transparencyIndex">The index of the color in the color palette to make transparent.</param>
-        private void WriteGraphicalControlExtension<TColor>(ImageFrame<TColor> imageFrame, EndianBinaryWriter writer, int transparencyIndex)
-            where TColor : struct, IPixel<TColor>
+        private void WriteGraphicalControlExtension<TPixel>(ImageFrame<TPixel> imageFrame, EndianBinaryWriter writer, int transparencyIndex)
+            where TPixel : struct, IPixel<TPixel>
         {
             this.WriteGraphicalControlExtension(imageFrame, imageFrame.MetaData, writer, transparencyIndex);
         }
@@ -292,13 +294,13 @@ namespace ImageSharp.Formats
         /// <summary>
         /// Writes the graphics control extension to the stream.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <param name="image">The <see cref="ImageBase{TColor}"/> to encode.</param>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
+        /// <param name="image">The <see cref="ImageBase{TPixel}"/> to encode.</param>
         /// <param name="metaData">The metadata of the image or frame.</param>
         /// <param name="writer">The stream to write to.</param>
         /// <param name="transparencyIndex">The index of the color in the color palette to make transparent.</param>
-        private void WriteGraphicalControlExtension<TColor>(ImageBase<TColor> image, IMetaData metaData, EndianBinaryWriter writer, int transparencyIndex)
-            where TColor : struct, IPixel<TColor>
+        private void WriteGraphicalControlExtension<TPixel>(ImageBase<TPixel> image, IMetaData metaData, EndianBinaryWriter writer, int transparencyIndex)
+            where TPixel : struct, IPixel<TPixel>
         {
             // TODO: Check transparency logic.
             bool hasTransparent = transparencyIndex < 255;
@@ -336,11 +338,11 @@ namespace ImageSharp.Formats
         /// <summary>
         /// Writes the image descriptor to the stream.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <param name="image">The <see cref="ImageBase{TColor}"/> to be encoded.</param>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
+        /// <param name="image">The <see cref="ImageBase{TPixel}"/> to be encoded.</param>
         /// <param name="writer">The stream to write to.</param>
-        private void WriteImageDescriptor<TColor>(ImageBase<TColor> image, EndianBinaryWriter writer)
-            where TColor : struct, IPixel<TColor>
+        private void WriteImageDescriptor<TPixel>(ImageBase<TPixel> image, EndianBinaryWriter writer)
+            where TPixel : struct, IPixel<TPixel>
         {
             writer.Write(GifConstants.ImageDescriptorLabel); // 2c
 
@@ -362,11 +364,11 @@ namespace ImageSharp.Formats
         /// <summary>
         /// Writes the color table to the stream.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <param name="image">The <see cref="ImageBase{TColor}"/> to encode.</param>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
+        /// <param name="image">The <see cref="ImageBase{TPixel}"/> to encode.</param>
         /// <param name="writer">The writer to write to the stream with.</param>
-        private void WriteColorTable<TColor>(QuantizedImage<TColor> image, EndianBinaryWriter writer)
-            where TColor : struct, IPixel<TColor>
+        private void WriteColorTable<TPixel>(QuantizedImage<TPixel> image, EndianBinaryWriter writer)
+            where TPixel : struct, IPixel<TPixel>
         {
             // Grab the palette and write it to the stream.
             int pixelCount = image.Palette.Length;
@@ -397,11 +399,11 @@ namespace ImageSharp.Formats
         /// <summary>
         /// Writes the image pixel data to the stream.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <param name="image">The <see cref="QuantizedImage{TColor}"/> containing indexed pixels.</param>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
+        /// <param name="image">The <see cref="QuantizedImage{TPixel}"/> containing indexed pixels.</param>
         /// <param name="writer">The stream to write to.</param>
-        private void WriteImageData<TColor>(QuantizedImage<TColor> image, EndianBinaryWriter writer)
-            where TColor : struct, IPixel<TColor>
+        private void WriteImageData<TPixel>(QuantizedImage<TPixel> image, EndianBinaryWriter writer)
+            where TPixel : struct, IPixel<TPixel>
         {
             using (LzwEncoder encoder = new LzwEncoder(image.Pixels, (byte)this.bitDepth))
             {
diff --git a/src/ImageSharp/Formats/Gif/ImageExtensions.cs b/src/ImageSharp/Formats/Gif/ImageExtensions.cs
index 1ba03ed351..d64203f6ce 100644
--- a/src/ImageSharp/Formats/Gif/ImageExtensions.cs
+++ b/src/ImageSharp/Formats/Gif/ImageExtensions.cs
@@ -10,23 +10,25 @@ namespace ImageSharp
 
     using Formats;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
-    /// Extension methods for the <see cref="Image{TColor}"/> type.
+    /// Extension methods for the <see cref="Image{TPixel}"/> type.
     /// </summary>
     public static partial class ImageExtensions
     {
         /// <summary>
         /// Saves the image to the given stream with the gif format.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="stream">The stream to save the image to.</param>
         /// <exception cref="System.ArgumentNullException">Thrown if the stream is null.</exception>
         /// <returns>
-        /// The <see cref="Image{TColor}"/>.
+        /// The <see cref="Image{TPixel}"/>.
         /// </returns>
-        public static Image<TColor> SaveAsGif<TColor>(this Image<TColor> source, Stream stream)
-            where TColor : struct, IPixel<TColor>
+        public static Image<TPixel> SaveAsGif<TPixel>(this Image<TPixel> source, Stream stream)
+            where TPixel : struct, IPixel<TPixel>
         {
             return SaveAsGif(source, stream, null);
         }
@@ -34,16 +36,16 @@ namespace ImageSharp
         /// <summary>
         /// Saves the image to the given stream with the gif format.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="stream">The stream to save the image to.</param>
         /// <param name="options">The options for the encoder.</param>
         /// <exception cref="System.ArgumentNullException">Thrown if the stream is null.</exception>
         /// <returns>
-        /// The <see cref="Image{TColor}"/>.
+        /// The <see cref="Image{TPixel}"/>.
         /// </returns>
-        public static Image<TColor> SaveAsGif<TColor>(this Image<TColor> source, Stream stream, IGifEncoderOptions options)
-            where TColor : struct, IPixel<TColor>
+        public static Image<TPixel> SaveAsGif<TPixel>(this Image<TPixel> source, Stream stream, IGifEncoderOptions options)
+            where TPixel : struct, IPixel<TPixel>
         {
             GifEncoder encoder = new GifEncoder();
             encoder.Encode(source, stream, options);
diff --git a/src/ImageSharp/Formats/IImageDecoder.cs b/src/ImageSharp/Formats/IImageDecoder.cs
index c85fbef101..4fd25df13e 100644
--- a/src/ImageSharp/Formats/IImageDecoder.cs
+++ b/src/ImageSharp/Formats/IImageDecoder.cs
@@ -8,20 +8,22 @@ namespace ImageSharp.Formats
     using System;
     using System.IO;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// Encapsulates properties and methods required for decoding an image from a stream.
     /// </summary>
     public interface IImageDecoder
     {
         /// <summary>
-        /// Decodes the image from the specified stream to the <see cref="ImageBase{TColor}"/>.
+        /// Decodes the image from the specified stream to the <see cref="ImageBase{TPixel}"/>.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="configuration">The configuration for the image.</param>
         /// <param name="stream">The <see cref="Stream"/> containing image data.</param>
         /// <param name="options">The options for the decoder.</param>
         /// <returns>The decoded image</returns>
-        Image<TColor> Decode<TColor>(Configuration configuration, Stream stream, IDecoderOptions options)
-            where TColor : struct, IPixel<TColor>;
+        Image<TPixel> Decode<TPixel>(Configuration configuration, Stream stream, IDecoderOptions options)
+            where TPixel : struct, IPixel<TPixel>;
     }
 }
diff --git a/src/ImageSharp/Formats/IImageEncoder.cs b/src/ImageSharp/Formats/IImageEncoder.cs
index 918f0d273c..a28511c173 100644
--- a/src/ImageSharp/Formats/IImageEncoder.cs
+++ b/src/ImageSharp/Formats/IImageEncoder.cs
@@ -8,19 +8,21 @@ namespace ImageSharp.Formats
     using System;
     using System.IO;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// Encapsulates properties and methods required for encoding an image to a stream.
     /// </summary>
     public interface IImageEncoder
     {
         /// <summary>
-        /// Encodes the image to the specified stream from the <see cref="Image{TColor}"/>.
+        /// Encodes the image to the specified stream from the <see cref="Image{TPixel}"/>.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <param name="image">The <see cref="Image{TColor}"/> to encode from.</param>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
+        /// <param name="image">The <see cref="Image{TPixel}"/> to encode from.</param>
         /// <param name="stream">The <see cref="Stream"/> to encode the image data to.</param>
         /// <param name="options">The options for the encoder.</param>
-        void Encode<TColor>(Image<TColor> image, Stream stream, IEncoderOptions options)
-            where TColor : struct, IPixel<TColor>;
+        void Encode<TPixel>(Image<TPixel> image, Stream stream, IEncoderOptions options)
+            where TPixel : struct, IPixel<TPixel>;
     }
 }
diff --git a/src/ImageSharp/Formats/Jpeg/ImageExtensions.cs b/src/ImageSharp/Formats/Jpeg/ImageExtensions.cs
index 351275ebb7..420af6b742 100644
--- a/src/ImageSharp/Formats/Jpeg/ImageExtensions.cs
+++ b/src/ImageSharp/Formats/Jpeg/ImageExtensions.cs
@@ -10,23 +10,25 @@ namespace ImageSharp
 
     using Formats;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
-    /// Extension methods for the <see cref="Image{TColor}"/> type.
+    /// Extension methods for the <see cref="Image{TPixel}"/> type.
     /// </summary>
     public static partial class ImageExtensions
     {
         /// <summary>
         /// Saves the image to the given stream with the jpeg format.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="stream">The stream to save the image to.</param>
         /// <exception cref="System.ArgumentNullException">Thrown if the stream is null.</exception>
         /// <returns>
-        /// The <see cref="Image{TColor}"/>.
+        /// The <see cref="Image{TPixel}"/>.
         /// </returns>
-        public static Image<TColor> SaveAsJpeg<TColor>(this Image<TColor> source, Stream stream)
-            where TColor : struct, IPixel<TColor>
+        public static Image<TPixel> SaveAsJpeg<TPixel>(this Image<TPixel> source, Stream stream)
+            where TPixel : struct, IPixel<TPixel>
         {
             return SaveAsJpeg(source, stream, null);
         }
@@ -34,16 +36,16 @@ namespace ImageSharp
         /// <summary>
         /// Saves the image to the given stream with the jpeg format.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="stream">The stream to save the image to.</param>
         /// <param name="options">The options for the encoder.</param>
         /// <exception cref="System.ArgumentNullException">Thrown if the stream is null.</exception>
         /// <returns>
-        /// The <see cref="Image{TColor}"/>.
+        /// The <see cref="Image{TPixel}"/>.
         /// </returns>
-        public static Image<TColor> SaveAsJpeg<TColor>(this Image<TColor> source, Stream stream, IJpegEncoderOptions options)
-            where TColor : struct, IPixel<TColor>
+        public static Image<TPixel> SaveAsJpeg<TPixel>(this Image<TPixel> source, Stream stream, IJpegEncoderOptions options)
+            where TPixel : struct, IPixel<TPixel>
         {
             JpegEncoder encoder = new JpegEncoder();
             encoder.Encode(source, stream, options);
diff --git a/src/ImageSharp/Formats/Jpeg/JpegDecoder.cs b/src/ImageSharp/Formats/Jpeg/JpegDecoder.cs
index 0aac316035..56d025504d 100644
--- a/src/ImageSharp/Formats/Jpeg/JpegDecoder.cs
+++ b/src/ImageSharp/Formats/Jpeg/JpegDecoder.cs
@@ -8,20 +8,22 @@ namespace ImageSharp.Formats
     using System;
     using System.IO;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// Image decoder for generating an image out of a jpg stream.
     /// </summary>
     public class JpegDecoder : IImageDecoder
     {
         /// <inheritdoc/>
-        public Image<TColor> Decode<TColor>(Configuration configuration, Stream stream, IDecoderOptions options)
-            where TColor : struct, IPixel<TColor>
+        public Image<TPixel> Decode<TPixel>(Configuration configuration, Stream stream, IDecoderOptions options)
+            where TPixel : struct, IPixel<TPixel>
         {
             Guard.NotNull(stream, "stream");
 
             using (JpegDecoderCore decoder = new JpegDecoderCore(options, configuration))
             {
-                return decoder.Decode<TColor>(stream);
+                return decoder.Decode<TPixel>(stream);
             }
         }
     }
diff --git a/src/ImageSharp/Formats/Jpeg/JpegDecoderCore.cs b/src/ImageSharp/Formats/Jpeg/JpegDecoderCore.cs
index 33533aa12b..186c1e5282 100644
--- a/src/ImageSharp/Formats/Jpeg/JpegDecoderCore.cs
+++ b/src/ImageSharp/Formats/Jpeg/JpegDecoderCore.cs
@@ -11,6 +11,7 @@ namespace ImageSharp.Formats
     using System.Threading.Tasks;
 
     using ImageSharp.Formats.Jpg;
+    using ImageSharp.PixelFormats;
 
     /// <summary>
     /// Performs the jpeg decoding operation.
@@ -121,7 +122,7 @@ namespace ImageSharp.Formats
         /// <summary>
         /// Gets the array of <see cref="DecodedBlockArray"/>-s storing the "raw" frequency-domain decoded blocks.
         /// We need to apply IDCT, dequantiazition and unzigging to transform them into color-space blocks.
-        /// This is done by <see cref="ProcessBlocksIntoJpegImageChannels{TColor}"/>.
+        /// This is done by <see cref="ProcessBlocksIntoJpegImageChannels{TPixel}"/>.
         /// When <see cref="IsProgressive"/>==true, we are touching these blocks multiple times - each time we process a Scan.
         /// </summary>
         public DecodedBlockArray[] DecodedBlocks { get; }
@@ -186,16 +187,16 @@ namespace ImageSharp.Formats
         /// Decodes the image from the specified <see cref="Stream"/>  and sets
         /// the data to image.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="stream">The stream, where the image should be.</param>
         /// <returns>The decoded image.</returns>
-        public Image<TColor> Decode<TColor>(Stream stream)
-            where TColor : struct, IPixel<TColor>
+        public Image<TPixel> Decode<TPixel>(Stream stream)
+            where TPixel : struct, IPixel<TPixel>
         {
             ImageMetaData metadata = new ImageMetaData();
             this.ProcessStream(metadata, stream, false);
-            this.ProcessBlocksIntoJpegImageChannels<TColor>();
-            Image<TColor> image = this.ConvertJpegPixelsToImagePixels<TColor>(metadata);
+            this.ProcessBlocksIntoJpegImageChannels<TPixel>();
+            Image<TPixel> image = this.ConvertJpegPixelsToImagePixels<TPixel>(metadata);
 
             return image;
         }
@@ -254,14 +255,14 @@ namespace ImageSharp.Formats
         /// Optimized method to pack bytes to the image from the YCbCr color space.
         /// This is faster than implicit casting as it avoids double packing.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="packed">The packed pixel.</param>
         /// <param name="y">The y luminance component.</param>
         /// <param name="cb">The cb chroma component.</param>
         /// <param name="cr">The cr chroma component.</param>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static void PackYcbCr<TColor>(ref TColor packed, byte y, byte cb, byte cr)
-            where TColor : struct, IPixel<TColor>
+        private static void PackYcbCr<TPixel>(ref TPixel packed, byte y, byte cb, byte cr)
+            where TPixel : struct, IPixel<TPixel>
         {
             int ccb = cb - 128;
             int ccr = cr - 128;
@@ -481,9 +482,9 @@ namespace ImageSharp.Formats
         /// <see cref="DecodedBlocks"/> are in a "raw" frequency-domain form. We need to apply IDCT, dequantization and unzigging to transform them into color-space blocks.
         /// We can copy these blocks into <see cref="JpegPixelArea"/>-s afterwards.
         /// </summary>
-        /// <typeparam name="TColor">The pixel type</typeparam>
-        private void ProcessBlocksIntoJpegImageChannels<TColor>()
-            where TColor : struct, IPixel<TColor>
+        /// <typeparam name="TPixel">The pixel type</typeparam>
+        private void ProcessBlocksIntoJpegImageChannels<TPixel>()
+            where TPixel : struct, IPixel<TPixel>
         {
             Parallel.For(
                 0,
@@ -497,15 +498,15 @@ namespace ImageSharp.Formats
         }
 
         /// <summary>
-        /// Convert the pixel data in <see cref="YCbCrImage"/> and/or <see cref="JpegPixelArea"/> into pixels of <see cref="Image{TColor}"/>
+        /// Convert the pixel data in <see cref="YCbCrImage"/> and/or <see cref="JpegPixelArea"/> into pixels of <see cref="Image{TPixel}"/>
         /// </summary>
-        /// <typeparam name="TColor">The pixel type</typeparam>
+        /// <typeparam name="TPixel">The pixel type</typeparam>
         /// <param name="metadata">The metadata for the image.</param>
         /// <returns>The decoded image.</returns>
-        private Image<TColor> ConvertJpegPixelsToImagePixels<TColor>(ImageMetaData metadata)
-            where TColor : struct, IPixel<TColor>
+        private Image<TPixel> ConvertJpegPixelsToImagePixels<TPixel>(ImageMetaData metadata)
+            where TPixel : struct, IPixel<TPixel>
         {
-            Image<TColor> image = Image.Create<TColor>(this.ImageWidth, this.ImageHeight, metadata, this.configuration);
+            Image<TPixel> image = Image.Create<TPixel>(this.ImageWidth, this.ImageHeight, metadata, this.configuration);
 
             if (this.grayImage.IsInitialized)
             {
@@ -561,10 +562,10 @@ namespace ImageSharp.Formats
         /// <summary>
         /// Assigns the horizontal and vertical resolution to the image if it has a JFIF header.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="image">The image to assign the resolution to.</param>
-        private void AssignResolution<TColor>(Image<TColor> image)
-            where TColor : struct, IPixel<TColor>
+        private void AssignResolution<TPixel>(Image<TPixel> image)
+            where TPixel : struct, IPixel<TPixel>
         {
             if (this.isJfif && this.horizontalResolution > 0 && this.verticalResolution > 0)
             {
@@ -589,14 +590,14 @@ namespace ImageSharp.Formats
         /// <summary>
         /// Converts the image from the original CMYK image pixels.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="image">The image.</param>
-        private void ConvertFromCmyk<TColor>(Image<TColor> image)
-            where TColor : struct, IPixel<TColor>
+        private void ConvertFromCmyk<TPixel>(Image<TPixel> image)
+            where TPixel : struct, IPixel<TPixel>
         {
             int scale = this.ComponentArray[0].HorizontalFactor / this.ComponentArray[1].HorizontalFactor;
 
-            using (PixelAccessor<TColor> pixels = image.Lock())
+            using (PixelAccessor<TPixel> pixels = image.Lock())
             {
                 Parallel.For(
                     0,
@@ -613,7 +614,7 @@ namespace ImageSharp.Formats
                             byte magenta = this.ycbcrImage.CbChannel.Pixels[co + (x / scale)];
                             byte yellow = this.ycbcrImage.CrChannel.Pixels[co + (x / scale)];
 
-                            TColor packed = default(TColor);
+                            TPixel packed = default(TPixel);
                             this.PackCmyk(ref packed, cyan, magenta, yellow, x, y);
                             pixels[x, y] = packed;
                         }
@@ -626,12 +627,12 @@ namespace ImageSharp.Formats
         /// <summary>
         /// Converts the image from the original grayscale image pixels.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="image">The image.</param>
-        private void ConvertFromGrayScale<TColor>(Image<TColor> image)
-            where TColor : struct, IPixel<TColor>
+        private void ConvertFromGrayScale<TPixel>(Image<TPixel> image)
+            where TPixel : struct, IPixel<TPixel>
         {
-            using (PixelAccessor<TColor> pixels = image.Lock())
+            using (PixelAccessor<TPixel> pixels = image.Lock())
             {
                 Parallel.For(
                     0,
@@ -644,7 +645,7 @@ namespace ImageSharp.Formats
                         {
                             byte rgb = this.grayImage.Pixels[yoff + x];
 
-                            TColor packed = default(TColor);
+                            TPixel packed = default(TPixel);
                             packed.PackFromBytes(rgb, rgb, rgb, 255);
                             pixels[x, y] = packed;
                         }
@@ -657,14 +658,14 @@ namespace ImageSharp.Formats
         /// <summary>
         /// Converts the image from the original RBG image pixels.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="image">The image.</param>
-        private void ConvertFromRGB<TColor>(Image<TColor> image)
-            where TColor : struct, IPixel<TColor>
+        private void ConvertFromRGB<TPixel>(Image<TPixel> image)
+            where TPixel : struct, IPixel<TPixel>
         {
             int scale = this.ComponentArray[0].HorizontalFactor / this.ComponentArray[1].HorizontalFactor;
 
-            using (PixelAccessor<TColor> pixels = image.Lock())
+            using (PixelAccessor<TPixel> pixels = image.Lock())
             {
                 Parallel.For(
                     0,
@@ -682,7 +683,7 @@ namespace ImageSharp.Formats
                             byte green = this.ycbcrImage.CbChannel.Pixels[co + (x / scale)];
                             byte blue = this.ycbcrImage.CrChannel.Pixels[co + (x / scale)];
 
-                            TColor packed = default(TColor);
+                            TPixel packed = default(TPixel);
                             packed.PackFromBytes(red, green, blue, 255);
                             pixels[x, y] = packed;
                         }
@@ -695,13 +696,13 @@ namespace ImageSharp.Formats
         /// <summary>
         /// Converts the image from the original YCbCr image pixels.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="image">The image.</param>
-        private void ConvertFromYCbCr<TColor>(Image<TColor> image)
-            where TColor : struct, IPixel<TColor>
+        private void ConvertFromYCbCr<TPixel>(Image<TPixel> image)
+            where TPixel : struct, IPixel<TPixel>
         {
             int scale = this.ComponentArray[0].HorizontalFactor / this.ComponentArray[1].HorizontalFactor;
-            using (PixelAccessor<TColor> pixels = image.Lock())
+            using (PixelAccessor<TPixel> pixels = image.Lock())
             {
                 Parallel.For(
                     0,
@@ -719,8 +720,8 @@ namespace ImageSharp.Formats
                             byte cb = this.ycbcrImage.CbChannel.Pixels[co + (x / scale)];
                             byte cr = this.ycbcrImage.CrChannel.Pixels[co + (x / scale)];
 
-                            TColor packed = default(TColor);
-                            PackYcbCr<TColor>(ref packed, yy, cb, cr);
+                            TPixel packed = default(TPixel);
+                            PackYcbCr<TPixel>(ref packed, yy, cb, cr);
                             pixels[x, y] = packed;
                         }
                     });
@@ -732,14 +733,14 @@ namespace ImageSharp.Formats
         /// <summary>
         /// Converts the image from the original YCCK image pixels.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="image">The image.</param>
-        private void ConvertFromYcck<TColor>(Image<TColor> image)
-            where TColor : struct, IPixel<TColor>
+        private void ConvertFromYcck<TPixel>(Image<TPixel> image)
+            where TPixel : struct, IPixel<TPixel>
         {
             int scale = this.ComponentArray[0].HorizontalFactor / this.ComponentArray[1].HorizontalFactor;
 
-            using (PixelAccessor<TColor> pixels = image.Lock())
+            using (PixelAccessor<TPixel> pixels = image.Lock())
             {
                 Parallel.For(
                     0,
@@ -756,7 +757,7 @@ namespace ImageSharp.Formats
                             byte cb = this.ycbcrImage.CbChannel.Pixels[co + (x / scale)];
                             byte cr = this.ycbcrImage.CrChannel.Pixels[co + (x / scale)];
 
-                            TColor packed = default(TColor);
+                            TPixel packed = default(TPixel);
                             this.PackYcck(ref packed, yy, cb, cr, x, y);
                             pixels[x, y] = packed;
                         }
@@ -850,15 +851,15 @@ namespace ImageSharp.Formats
         /// Optimized method to pack bytes to the image from the CMYK color space.
         /// This is faster than implicit casting as it avoids double packing.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="packed">The packed pixel.</param>
         /// <param name="c">The cyan component.</param>
         /// <param name="m">The magenta component.</param>
         /// <param name="y">The yellow component.</param>
         /// <param name="xx">The x-position within the image.</param>
         /// <param name="yy">The y-position within the image.</param>
-        private void PackCmyk<TColor>(ref TColor packed, byte c, byte m, byte y, int xx, int yy)
-            where TColor : struct, IPixel<TColor>
+        private void PackCmyk<TPixel>(ref TPixel packed, byte c, byte m, byte y, int xx, int yy)
+            where TPixel : struct, IPixel<TPixel>
         {
             // Get keyline
             float keyline = (255 - this.blackImage[xx, yy]) / 255F;
@@ -875,15 +876,15 @@ namespace ImageSharp.Formats
         /// Optimized method to pack bytes to the image from the YCCK color space.
         /// This is faster than implicit casting as it avoids double packing.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="packed">The packed pixel.</param>
         /// <param name="y">The y luminance component.</param>
         /// <param name="cb">The cb chroma component.</param>
         /// <param name="cr">The cr chroma component.</param>
         /// <param name="xx">The x-position within the image.</param>
         /// <param name="yy">The y-position within the image.</param>
-        private void PackYcck<TColor>(ref TColor packed, byte y, byte cb, byte cr, int xx, int yy)
-            where TColor : struct, IPixel<TColor>
+        private void PackYcck<TPixel>(ref TPixel packed, byte y, byte cb, byte cr, int xx, int yy)
+            where TPixel : struct, IPixel<TPixel>
         {
             // Convert the YCbCr part of the YCbCrK to RGB, invert the RGB to get
             // CMY, and patch in the original K. The RGB to CMY inversion cancels
diff --git a/src/ImageSharp/Formats/Jpeg/JpegEncoder.cs b/src/ImageSharp/Formats/Jpeg/JpegEncoder.cs
index 2f2823fa28..152fd2c64c 100644
--- a/src/ImageSharp/Formats/Jpeg/JpegEncoder.cs
+++ b/src/ImageSharp/Formats/Jpeg/JpegEncoder.cs
@@ -7,14 +7,16 @@ namespace ImageSharp.Formats
 {
     using System.IO;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// Encoder for writing the data image to a stream in jpeg format.
     /// </summary>
     public class JpegEncoder : IImageEncoder
     {
         /// <inheritdoc/>
-        public void Encode<TColor>(Image<TColor> image, Stream stream, IEncoderOptions options)
-            where TColor : struct, IPixel<TColor>
+        public void Encode<TPixel>(Image<TPixel> image, Stream stream, IEncoderOptions options)
+            where TPixel : struct, IPixel<TPixel>
         {
             IJpegEncoderOptions gifOptions = JpegEncoderOptions.Create(options);
 
@@ -22,14 +24,14 @@ namespace ImageSharp.Formats
         }
 
         /// <summary>
-        /// Encodes the image to the specified stream from the <see cref="Image{TColor}"/>.
+        /// Encodes the image to the specified stream from the <see cref="Image{TPixel}"/>.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <param name="image">The <see cref="Image{TColor}"/> to encode from.</param>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
+        /// <param name="image">The <see cref="Image{TPixel}"/> to encode from.</param>
         /// <param name="stream">The <see cref="Stream"/> to encode the image data to.</param>
         /// <param name="options">The options for the encoder.</param>
-        public void Encode<TColor>(Image<TColor> image, Stream stream, IJpegEncoderOptions options)
-            where TColor : struct, IPixel<TColor>
+        public void Encode<TPixel>(Image<TPixel> image, Stream stream, IJpegEncoderOptions options)
+            where TPixel : struct, IPixel<TPixel>
         {
             JpegEncoderCore encode = new JpegEncoderCore(options);
             encode.Encode(image, stream);
diff --git a/src/ImageSharp/Formats/Jpeg/JpegEncoderCore.cs b/src/ImageSharp/Formats/Jpeg/JpegEncoderCore.cs
index c3cf75a0f6..eb083c35d9 100644
--- a/src/ImageSharp/Formats/Jpeg/JpegEncoderCore.cs
+++ b/src/ImageSharp/Formats/Jpeg/JpegEncoderCore.cs
@@ -12,6 +12,7 @@ namespace ImageSharp.Formats
 
     using ImageSharp.Formats.Jpg;
     using ImageSharp.Formats.Jpg.Components;
+    using ImageSharp.PixelFormats;
 
     /// <summary>
     /// Image encoder for writing an image to a stream as a jpeg.
@@ -165,11 +166,11 @@ namespace ImageSharp.Formats
         /// <summary>
         /// Encode writes the image to the jpeg baseline format with the given options.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="image">The image to write from.</param>
         /// <param name="stream">The stream to write to.</param>
-        public void Encode<TColor>(Image<TColor> image, Stream stream)
-            where TColor : struct, IPixel<TColor>
+        public void Encode<TPixel>(Image<TPixel> image, Stream stream)
+            where TPixel : struct, IPixel<TPixel>
         {
             Guard.NotNull(image, nameof(image));
             Guard.NotNull(stream, nameof(stream));
@@ -225,7 +226,7 @@ namespace ImageSharp.Formats
             this.WriteDefineHuffmanTables(componentCount);
 
             // Write the image data.
-            using (PixelAccessor<TColor> pixels = image.Lock())
+            using (PixelAccessor<TPixel> pixels = image.Lock())
             {
                 this.WriteStartOfScan(pixels);
             }
@@ -282,23 +283,23 @@ namespace ImageSharp.Formats
         /// <summary>
         /// Converts the 8x8 region of the image whose top-left corner is x,y to its YCbCr values.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="pixels">The pixel accessor.</param>
         /// <param name="x">The x-position within the image.</param>
         /// <param name="y">The y-position within the image.</param>
         /// <param name="yBlock">The luminance block.</param>
         /// <param name="cbBlock">The red chroma block.</param>
         /// <param name="crBlock">The blue chroma block.</param>
-        /// <param name="rgbBytes">Temporal <see cref="PixelArea{TColor}"/> provided by the caller</param>
-        private static void ToYCbCr<TColor>(
-            PixelAccessor<TColor> pixels,
+        /// <param name="rgbBytes">Temporal <see cref="PixelArea{TPixel}"/> provided by the caller</param>
+        private static void ToYCbCr<TPixel>(
+            PixelAccessor<TPixel> pixels,
             int x,
             int y,
             Block8x8F* yBlock,
             Block8x8F* cbBlock,
             Block8x8F* crBlock,
-            PixelArea<TColor> rgbBytes)
-            where TColor : struct, IPixel<TColor>
+            PixelArea<TPixel> rgbBytes)
+            where TPixel : struct, IPixel<TPixel>
         {
             float* yBlockRaw = (float*)yBlock;
             float* cbBlockRaw = (float*)cbBlock;
@@ -442,12 +443,12 @@ namespace ImageSharp.Formats
         /// <summary>
         /// Encodes the image with no subsampling.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="pixels">The pixel accessor providing access to the image pixels.</param>
-        private void Encode444<TColor>(PixelAccessor<TColor> pixels)
-            where TColor : struct, IPixel<TColor>
+        private void Encode444<TPixel>(PixelAccessor<TPixel> pixels)
+            where TPixel : struct, IPixel<TPixel>
         {
-            // TODO: Need a JpegScanEncoder<TColor> class or struct that encapsulates the scan-encoding implementation. (Similar to JpegScanDecoder.)
+            // TODO: Need a JpegScanEncoder<TPixel> class or struct that encapsulates the scan-encoding implementation. (Similar to JpegScanDecoder.)
             Block8x8F b = default(Block8x8F);
             Block8x8F cb = default(Block8x8F);
             Block8x8F cr = default(Block8x8F);
@@ -463,7 +464,7 @@ namespace ImageSharp.Formats
             // ReSharper disable once InconsistentNaming
             int prevDCY = 0, prevDCCb = 0, prevDCCr = 0;
 
-            using (PixelArea<TColor> rgbBytes = new PixelArea<TColor>(8, 8, ComponentOrder.Xyz))
+            using (PixelArea<TPixel> rgbBytes = new PixelArea<TPixel>(8, 8, ComponentOrder.Xyz))
             {
                 for (int y = 0; y < pixels.Height; y += 8)
                 {
@@ -714,9 +715,9 @@ namespace ImageSharp.Formats
         /// Writes the metadata profiles to the image.
         /// </summary>
         /// <param name="image">The image.</param>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        private void WriteProfiles<TColor>(Image<TColor> image)
-            where TColor : struct, IPixel<TColor>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
+        private void WriteProfiles<TPixel>(Image<TPixel> image)
+            where TPixel : struct, IPixel<TPixel>
         {
             if (this.options.IgnoreMetadata)
             {
@@ -786,12 +787,12 @@ namespace ImageSharp.Formats
         /// <summary>
         /// Writes the StartOfScan marker.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="pixels">The pixel accessor providing access to the image pixels.</param>
-        private void WriteStartOfScan<TColor>(PixelAccessor<TColor> pixels)
-            where TColor : struct, IPixel<TColor>
+        private void WriteStartOfScan<TPixel>(PixelAccessor<TPixel> pixels)
+            where TPixel : struct, IPixel<TPixel>
         {
-            // TODO: Need a JpegScanEncoder<TColor> class or struct that encapsulates the scan-encoding implementation. (Similar to JpegScanDecoder.)
+            // TODO: Need a JpegScanEncoder<TPixel> class or struct that encapsulates the scan-encoding implementation. (Similar to JpegScanDecoder.)
             // TODO: We should allow grayscale writing.
             this.outputStream.Write(SosHeaderYCbCr, 0, SosHeaderYCbCr.Length);
 
@@ -813,12 +814,12 @@ namespace ImageSharp.Formats
         /// Encodes the image with subsampling. The Cb and Cr components are each subsampled
         /// at a factor of 2 both horizontally and vertically.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="pixels">The pixel accessor providing access to the image pixels.</param>
-        private void Encode420<TColor>(PixelAccessor<TColor> pixels)
-            where TColor : struct, IPixel<TColor>
+        private void Encode420<TPixel>(PixelAccessor<TPixel> pixels)
+            where TPixel : struct, IPixel<TPixel>
         {
-            // TODO: Need a JpegScanEncoder<TColor> class or struct that encapsulates the scan-encoding implementation. (Similar to JpegScanDecoder.)
+            // TODO: Need a JpegScanEncoder<TPixel> class or struct that encapsulates the scan-encoding implementation. (Similar to JpegScanDecoder.)
             Block8x8F b = default(Block8x8F);
 
             BlockQuad cb = default(BlockQuad);
@@ -837,7 +838,7 @@ namespace ImageSharp.Formats
             // ReSharper disable once InconsistentNaming
             int prevDCY = 0, prevDCCb = 0, prevDCCr = 0;
 
-            using (PixelArea<TColor> rgbBytes = new PixelArea<TColor>(8, 8, ComponentOrder.Xyz))
+            using (PixelArea<TPixel> rgbBytes = new PixelArea<TPixel>(8, 8, ComponentOrder.Xyz))
             {
                 for (int y = 0; y < pixels.Height; y += 16)
                 {
diff --git a/src/ImageSharp/Formats/Jpeg/Utils/JpegUtils.cs b/src/ImageSharp/Formats/Jpeg/Utils/JpegUtils.cs
index ace309812a..afb8e07007 100644
--- a/src/ImageSharp/Formats/Jpeg/Utils/JpegUtils.cs
+++ b/src/ImageSharp/Formats/Jpeg/Utils/JpegUtils.cs
@@ -8,6 +8,8 @@ namespace ImageSharp.Formats.Jpg
     using System.Runtime.CompilerServices;
     using System.Runtime.InteropServices;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     ///     Jpeg specific utilities and extension methods
     /// </summary>
@@ -16,17 +18,17 @@ namespace ImageSharp.Formats.Jpg
         /// <summary>
         /// Copy a region of an image into dest. De "outlier" area will be stretched out with pixels on the right and bottom of the image.
         /// </summary>
-        /// <typeparam name="TColor">The pixel type</typeparam>
+        /// <typeparam name="TPixel">The pixel type</typeparam>
         /// <param name="pixels">The input pixel acessor</param>
-        /// <param name="dest">The destination <see cref="PixelArea{TColor}"/></param>
+        /// <param name="dest">The destination <see cref="PixelArea{TPixel}"/></param>
         /// <param name="sourceY">Starting Y coord</param>
         /// <param name="sourceX">Starting X coord</param>
-        public static void CopyRGBBytesStretchedTo<TColor>(
-            this PixelAccessor<TColor> pixels,
-            PixelArea<TColor> dest,
+        public static void CopyRGBBytesStretchedTo<TPixel>(
+            this PixelAccessor<TPixel> pixels,
+            PixelArea<TPixel> dest,
             int sourceY,
             int sourceX)
-            where TColor : struct, IPixel<TColor>
+            where TPixel : struct, IPixel<TPixel>
         {
             pixels.SafeCopyTo(dest, sourceY, sourceX);
             int stretchFromX = pixels.Width - sourceX;
@@ -36,14 +38,14 @@ namespace ImageSharp.Formats.Jpg
 
         // Nothing to stretch if (fromX, fromY) is outside the area, or is at (0,0)
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static bool IsInvalidStretchStartingPosition<TColor>(PixelArea<TColor> area, int fromX, int fromY)
-            where TColor : struct, IPixel<TColor>
+        private static bool IsInvalidStretchStartingPosition<TPixel>(PixelArea<TPixel> area, int fromX, int fromY)
+            where TPixel : struct, IPixel<TPixel>
         {
             return fromX <= 0 || fromY <= 0 || fromX >= area.Width || fromY >= area.Height;
         }
 
-        private static void StretchPixels<TColor>(PixelArea<TColor> area, int fromX, int fromY)
-            where TColor : struct, IPixel<TColor>
+        private static void StretchPixels<TPixel>(PixelArea<TPixel> area, int fromX, int fromY)
+            where TPixel : struct, IPixel<TPixel>
         {
             if (IsInvalidStretchStartingPosition(area, fromX, fromY))
             {
@@ -75,8 +77,8 @@ namespace ImageSharp.Formats.Jpg
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static ref RGB24 GetRowStart<TColor>(PixelArea<TColor> area, int y)
-            where TColor : struct, IPixel<TColor>
+        private static ref RGB24 GetRowStart<TPixel>(PixelArea<TPixel> area, int y)
+            where TPixel : struct, IPixel<TPixel>
         {
             return ref Unsafe.As<byte, RGB24>(ref area.GetRowSpan(y).DangerousGetPinnableReference());
         }
diff --git a/src/ImageSharp/Formats/Png/ImageExtensions.cs b/src/ImageSharp/Formats/Png/ImageExtensions.cs
index 79e96175c1..44f242b3f8 100644
--- a/src/ImageSharp/Formats/Png/ImageExtensions.cs
+++ b/src/ImageSharp/Formats/Png/ImageExtensions.cs
@@ -9,23 +9,25 @@ namespace ImageSharp
 
     using Formats;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
-    /// Extension methods for the <see cref="Image{TColor}"/> type.
+    /// Extension methods for the <see cref="Image{TPixel}"/> type.
     /// </summary>
     public static partial class ImageExtensions
     {
         /// <summary>
         /// Saves the image to the given stream with the png format.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="stream">The stream to save the image to.</param>
         /// <exception cref="System.ArgumentNullException">Thrown if the stream is null.</exception>
         /// <returns>
-        /// The <see cref="Image{TColor}"/>.
+        /// The <see cref="Image{TPixel}"/>.
         /// </returns>
-        public static Image<TColor> SaveAsPng<TColor>(this Image<TColor> source, Stream stream)
-            where TColor : struct, IPixel<TColor>
+        public static Image<TPixel> SaveAsPng<TPixel>(this Image<TPixel> source, Stream stream)
+            where TPixel : struct, IPixel<TPixel>
         {
             return SaveAsPng(source, stream, null);
         }
@@ -33,16 +35,16 @@ namespace ImageSharp
         /// <summary>
         /// Saves the image to the given stream with the png format.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="stream">The stream to save the image to.</param>
         /// <param name="options">The options for the encoder.</param>
         /// <exception cref="System.ArgumentNullException">Thrown if the stream is null.</exception>
         /// <returns>
-        /// The <see cref="Image{TColor}"/>.
+        /// The <see cref="Image{TPixel}"/>.
         /// </returns>
-        public static Image<TColor> SaveAsPng<TColor>(this Image<TColor> source, Stream stream, IPngEncoderOptions options)
-            where TColor : struct, IPixel<TColor>
+        public static Image<TPixel> SaveAsPng<TPixel>(this Image<TPixel> source, Stream stream, IPngEncoderOptions options)
+            where TPixel : struct, IPixel<TPixel>
         {
             PngEncoder encoder = new PngEncoder();
             encoder.Encode(source, stream, options);
diff --git a/src/ImageSharp/Formats/Png/PngDecoder.cs b/src/ImageSharp/Formats/Png/PngDecoder.cs
index d0a820c17f..3a34147e2c 100644
--- a/src/ImageSharp/Formats/Png/PngDecoder.cs
+++ b/src/ImageSharp/Formats/Png/PngDecoder.cs
@@ -8,6 +8,8 @@ namespace ImageSharp.Formats
     using System;
     using System.IO;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// Encoder for generating an image out of a png encoded stream.
     /// </summary>
@@ -31,27 +33,27 @@ namespace ImageSharp.Formats
     public class PngDecoder : IImageDecoder
     {
         /// <inheritdoc/>
-        public Image<TColor> Decode<TColor>(Configuration configuration, Stream stream, IDecoderOptions options)
+        public Image<TPixel> Decode<TPixel>(Configuration configuration, Stream stream, IDecoderOptions options)
 
-            where TColor : struct, IPixel<TColor>
+            where TPixel : struct, IPixel<TPixel>
         {
             IPngDecoderOptions pngOptions = PngDecoderOptions.Create(options);
 
-            return this.Decode<TColor>(configuration, stream, pngOptions);
+            return this.Decode<TPixel>(configuration, stream, pngOptions);
         }
 
         /// <summary>
-        /// Decodes the image from the specified stream to the <see cref="ImageBase{TColor}"/>.
+        /// Decodes the image from the specified stream to the <see cref="ImageBase{TPixel}"/>.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="configuration">The configuration for the image.</param>
         /// <param name="stream">The <see cref="Stream"/> containing image data.</param>
         /// <param name="options">The options for the decoder.</param>
         /// <returns>The decoded image.</returns>
-        public Image<TColor> Decode<TColor>(Configuration configuration, Stream stream, IPngDecoderOptions options)
-            where TColor : struct, IPixel<TColor>
+        public Image<TPixel> Decode<TPixel>(Configuration configuration, Stream stream, IPngDecoderOptions options)
+            where TPixel : struct, IPixel<TPixel>
         {
-            return new PngDecoderCore(options, configuration).Decode<TColor>(stream);
+            return new PngDecoderCore(options, configuration).Decode<TPixel>(stream);
         }
     }
 }
diff --git a/src/ImageSharp/Formats/Png/PngDecoderCore.cs b/src/ImageSharp/Formats/Png/PngDecoderCore.cs
index 5ce9b5eb06..58cfa6a70b 100644
--- a/src/ImageSharp/Formats/Png/PngDecoderCore.cs
+++ b/src/ImageSharp/Formats/Png/PngDecoderCore.cs
@@ -12,6 +12,8 @@ namespace ImageSharp.Formats
     using System.Linq;
     using System.Runtime.CompilerServices;
 
+    using ImageSharp.PixelFormats;
+
     using static ComparableExtensions;
 
     /// <summary>
@@ -154,7 +156,7 @@ namespace ImageSharp.Formats
         /// <summary>
         /// Decodes the stream to the image.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="stream">The stream containing image data. </param>
         /// <exception cref="ImageFormatException">
         /// Thrown if the stream does not contain and end chunk.
@@ -163,8 +165,8 @@ namespace ImageSharp.Formats
         /// Thrown if the image is larger than the maximum allowable size.
         /// </exception>
         /// <returns>The decoded image</returns>
-        public Image<TColor> Decode<TColor>(Stream stream)
-            where TColor : struct, IPixel<TColor>
+        public Image<TPixel> Decode<TPixel>(Stream stream)
+            where TPixel : struct, IPixel<TPixel>
         {
             ImageMetaData metadata = new ImageMetaData();
             this.currentStream = stream;
@@ -215,14 +217,14 @@ namespace ImageSharp.Formats
                     }
                 }
 
-                if (this.header.Width > Image<TColor>.MaxWidth || this.header.Height > Image<TColor>.MaxHeight)
+                if (this.header.Width > Image<TPixel>.MaxWidth || this.header.Height > Image<TPixel>.MaxHeight)
                 {
-                    throw new ArgumentOutOfRangeException($"The input png '{this.header.Width}x{this.header.Height}' is bigger than the max allowed size '{Image<TColor>.MaxWidth}x{Image<TColor>.MaxHeight}'");
+                    throw new ArgumentOutOfRangeException($"The input png '{this.header.Width}x{this.header.Height}' is bigger than the max allowed size '{Image<TPixel>.MaxWidth}x{Image<TPixel>.MaxHeight}'");
                 }
 
-                Image<TColor> image = Image.Create<TColor>(this.header.Width, this.header.Height, metadata, this.configuration);
+                Image<TPixel> image = Image.Create<TPixel>(this.header.Width, this.header.Height, metadata, this.configuration);
 
-                using (PixelAccessor<TColor> pixels = image.Lock())
+                using (PixelAccessor<TPixel> pixels = image.Lock())
                 {
                     this.ReadScanlines(dataStream, pixels);
                 }
@@ -340,11 +342,11 @@ namespace ImageSharp.Formats
         /// <summary>
         /// Reads the scanlines within the image.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="dataStream">The <see cref="MemoryStream"/> containing data.</param>
         /// <param name="pixels"> The pixel data.</param>
-        private void ReadScanlines<TColor>(MemoryStream dataStream, PixelAccessor<TColor> pixels)
-            where TColor : struct, IPixel<TColor>
+        private void ReadScanlines<TPixel>(MemoryStream dataStream, PixelAccessor<TPixel> pixels)
+            where TPixel : struct, IPixel<TPixel>
         {
             this.bytesPerPixel = this.CalculateBytesPerPixel();
             this.bytesPerScanline = this.CalculateScanlineLength(this.header.Width) + 1;
@@ -371,11 +373,11 @@ namespace ImageSharp.Formats
         /// <summary>
         /// Decodes the raw pixel data row by row
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="compressedStream">The compressed pixel data stream.</param>
         /// <param name="pixels">The image pixel accessor.</param>
-        private void DecodePixelData<TColor>(Stream compressedStream, PixelAccessor<TColor> pixels)
-            where TColor : struct, IPixel<TColor>
+        private void DecodePixelData<TPixel>(Stream compressedStream, PixelAccessor<TPixel> pixels)
+            where TPixel : struct, IPixel<TPixel>
         {
             byte[] previousScanline = ArrayPool<byte>.Shared.Rent(this.bytesPerScanline);
             byte[] scanline = ArrayPool<byte>.Shared.Rent(this.bytesPerScanline);
@@ -444,11 +446,11 @@ namespace ImageSharp.Formats
         /// Decodes the raw interlaced pixel data row by row
         /// <see href="https://github.com/juehv/DentalImageViewer/blob/8a1a4424b15d6cc453b5de3f273daf3ff5e3a90d/DentalImageViewer/lib/jiu-0.14.3/net/sourceforge/jiu/codecs/PNGCodec.java"/>
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="compressedStream">The compressed pixel data stream.</param>
         /// <param name="pixels">The image pixel accessor.</param>
-        private void DecodeInterlacedPixelData<TColor>(Stream compressedStream, PixelAccessor<TColor> pixels)
-            where TColor : struct, IPixel<TColor>
+        private void DecodeInterlacedPixelData<TPixel>(Stream compressedStream, PixelAccessor<TPixel> pixels)
+            where TPixel : struct, IPixel<TPixel>
         {
             byte[] previousScanline = ArrayPool<byte>.Shared.Rent(this.bytesPerScanline);
             byte[] scanline = ArrayPool<byte>.Shared.Rent(this.bytesPerScanline);
@@ -532,14 +534,14 @@ namespace ImageSharp.Formats
         /// <summary>
         /// Processes the de-filtered scanline filling the image pixel data
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="defilteredScanline">The de-filtered scanline</param>
         /// <param name="row">The current image row.</param>
         /// <param name="pixels">The image pixels</param>
-        private void ProcessDefilteredScanline<TColor>(byte[] defilteredScanline, int row, PixelAccessor<TColor> pixels)
-            where TColor : struct, IPixel<TColor>
+        private void ProcessDefilteredScanline<TPixel>(byte[] defilteredScanline, int row, PixelAccessor<TPixel> pixels)
+            where TPixel : struct, IPixel<TPixel>
         {
-            TColor color = default(TColor);
+            TPixel color = default(TPixel);
             switch (this.PngColorType)
             {
                 case PngColorType.Grayscale:
@@ -655,16 +657,16 @@ namespace ImageSharp.Formats
         /// <summary>
         /// Processes the interlaced de-filtered scanline filling the image pixel data
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="defilteredScanline">The de-filtered scanline</param>
         /// <param name="row">The current image row.</param>
         /// <param name="pixels">The image pixels</param>
         /// <param name="pixelOffset">The column start index. Always 0 for none interlaced images.</param>
         /// <param name="increment">The column increment. Always 1 for none interlaced images.</param>
-        private void ProcessInterlacedDefilteredScanline<TColor>(byte[] defilteredScanline, int row, PixelAccessor<TColor> pixels, int pixelOffset = 0, int increment = 1)
-            where TColor : struct, IPixel<TColor>
+        private void ProcessInterlacedDefilteredScanline<TPixel>(byte[] defilteredScanline, int row, PixelAccessor<TPixel> pixels, int pixelOffset = 0, int increment = 1)
+            where TPixel : struct, IPixel<TPixel>
         {
-            TColor color = default(TColor);
+            TPixel color = default(TPixel);
 
             switch (this.PngColorType)
             {
diff --git a/src/ImageSharp/Formats/Png/PngEncoder.cs b/src/ImageSharp/Formats/Png/PngEncoder.cs
index e583f381fb..e7b6bf30ef 100644
--- a/src/ImageSharp/Formats/Png/PngEncoder.cs
+++ b/src/ImageSharp/Formats/Png/PngEncoder.cs
@@ -7,14 +7,16 @@ namespace ImageSharp.Formats
 {
     using System.IO;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// Image encoder for writing image data to a stream in png format.
     /// </summary>
     public class PngEncoder : IImageEncoder
     {
         /// <inheritdoc/>
-        public void Encode<TColor>(Image<TColor> image, Stream stream, IEncoderOptions options)
-            where TColor : struct, IPixel<TColor>
+        public void Encode<TPixel>(Image<TPixel> image, Stream stream, IEncoderOptions options)
+            where TPixel : struct, IPixel<TPixel>
         {
             IPngEncoderOptions pngOptions = PngEncoderOptions.Create(options);
 
@@ -22,14 +24,14 @@ namespace ImageSharp.Formats
         }
 
         /// <summary>
-        /// Encodes the image to the specified stream from the <see cref="Image{TColor}"/>.
+        /// Encodes the image to the specified stream from the <see cref="Image{TPixel}"/>.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <param name="image">The <see cref="Image{TColor}"/> to encode from.</param>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
+        /// <param name="image">The <see cref="Image{TPixel}"/> to encode from.</param>
         /// <param name="stream">The <see cref="Stream"/> to encode the image data to.</param>
         /// <param name="options">The options for the encoder.</param>
-        public void Encode<TColor>(Image<TColor> image, Stream stream, IPngEncoderOptions options)
-            where TColor : struct, IPixel<TColor>
+        public void Encode<TPixel>(Image<TPixel> image, Stream stream, IPngEncoderOptions options)
+            where TPixel : struct, IPixel<TPixel>
         {
             PngEncoderCore encode = new PngEncoderCore(options);
             encode.Encode(image, stream);
diff --git a/src/ImageSharp/Formats/Png/PngEncoderCore.cs b/src/ImageSharp/Formats/Png/PngEncoderCore.cs
index c11fc94dfe..e30f9791e1 100644
--- a/src/ImageSharp/Formats/Png/PngEncoderCore.cs
+++ b/src/ImageSharp/Formats/Png/PngEncoderCore.cs
@@ -10,6 +10,8 @@ namespace ImageSharp.Formats
     using System.IO;
     using System.Linq;
 
+    using ImageSharp.PixelFormats;
+
     using Quantizers;
 
     using static ComparableExtensions;
@@ -114,13 +116,13 @@ namespace ImageSharp.Formats
         }
 
         /// <summary>
-        /// Encodes the image to the specified stream from the <see cref="Image{TColor}"/>.
+        /// Encodes the image to the specified stream from the <see cref="Image{TPixel}"/>.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
-        /// <param name="image">The <see cref="ImageBase{TColor}"/> to encode from.</param>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
+        /// <param name="image">The <see cref="ImageBase{TPixel}"/> to encode from.</param>
         /// <param name="stream">The <see cref="Stream"/> to encode the image data to.</param>
-        public void Encode<TColor>(Image<TColor> image, Stream stream)
-            where TColor : struct, IPixel<TColor>
+        public void Encode<TPixel>(Image<TPixel> image, Stream stream)
+            where TPixel : struct, IPixel<TPixel>
         {
             Guard.NotNull(image, nameof(image));
             Guard.NotNull(stream, nameof(stream));
@@ -196,7 +198,7 @@ namespace ImageSharp.Formats
 
             this.WritePhysicalChunk(stream, image);
             this.WriteGammaChunk(stream);
-            using (PixelAccessor<TColor> pixels = image.Lock())
+            using (PixelAccessor<TPixel> pixels = image.Lock())
             {
                 this.WriteDataChunks(pixels, stream);
             }
@@ -248,27 +250,27 @@ namespace ImageSharp.Formats
         /// <summary>
         /// Collects the indexed pixel data.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="image">The image to encode.</param>
         /// <param name="stream">The <see cref="Stream"/> containing image data.</param>
         /// <param name="header">The <see cref="PngHeader"/>.</param>
-        private void CollectIndexedBytes<TColor>(ImageBase<TColor> image, Stream stream, PngHeader header)
-            where TColor : struct, IPixel<TColor>
+        private void CollectIndexedBytes<TPixel>(ImageBase<TPixel> image, Stream stream, PngHeader header)
+            where TPixel : struct, IPixel<TPixel>
         {
             // Quantize the image and get the pixels.
-            QuantizedImage<TColor> quantized = this.WritePaletteChunk(stream, header, image);
+            QuantizedImage<TPixel> quantized = this.WritePaletteChunk(stream, header, image);
             this.palettePixelData = quantized.Pixels;
         }
 
         /// <summary>
         /// Collects a row of grayscale pixels.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="pixels">The image pixels accessor.</param>
         /// <param name="row">The row index.</param>
         /// <param name="rawScanline">The raw scanline.</param>
-        private void CollectGrayscaleBytes<TColor>(PixelAccessor<TColor> pixels, int row, byte[] rawScanline)
-            where TColor : struct, IPixel<TColor>
+        private void CollectGrayscaleBytes<TPixel>(PixelAccessor<TPixel> pixels, int row, byte[] rawScanline)
+            where TPixel : struct, IPixel<TPixel>
         {
             // Copy the pixels across from the image.
             // Reuse the chunk type buffer.
@@ -297,15 +299,15 @@ namespace ImageSharp.Formats
         /// <summary>
         /// Collects a row of true color pixel data.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="pixels">The image pixel accessor.</param>
         /// <param name="row">The row index.</param>
         /// <param name="rawScanline">The raw scanline.</param>
-        private void CollectColorBytes<TColor>(PixelAccessor<TColor> pixels, int row, byte[] rawScanline)
-            where TColor : struct, IPixel<TColor>
+        private void CollecTPixelBytes<TPixel>(PixelAccessor<TPixel> pixels, int row, byte[] rawScanline)
+            where TPixel : struct, IPixel<TPixel>
         {
             // We can use the optimized PixelAccessor here and copy the bytes in unmanaged memory.
-            using (PixelArea<TColor> pixelRow = new PixelArea<TColor>(this.width, rawScanline, this.bytesPerPixel == 4 ? ComponentOrder.Xyzw : ComponentOrder.Xyz))
+            using (PixelArea<TPixel> pixelRow = new PixelArea<TPixel>(this.width, rawScanline, this.bytesPerPixel == 4 ? ComponentOrder.Xyzw : ComponentOrder.Xyz))
             {
                 pixels.CopyTo(pixelRow, row);
             }
@@ -315,15 +317,15 @@ namespace ImageSharp.Formats
         /// Encodes the pixel data line by line.
         /// Each scanline is encoded in the most optimal manner to improve compression.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="pixels">The image pixel accessor.</param>
         /// <param name="row">The row.</param>
         /// <param name="previousScanline">The previous scanline.</param>
         /// <param name="rawScanline">The raw scanline.</param>
         /// <param name="result">The filtered scanline result.</param>
         /// <returns>The <see cref="T:byte[]"/></returns>
-        private byte[] EncodePixelRow<TColor>(PixelAccessor<TColor> pixels, int row, byte[] previousScanline, byte[] rawScanline, byte[] result)
-            where TColor : struct, IPixel<TColor>
+        private byte[] EncodePixelRow<TPixel>(PixelAccessor<TPixel> pixels, int row, byte[] previousScanline, byte[] rawScanline, byte[] result)
+            where TPixel : struct, IPixel<TPixel>
         {
             switch (this.pngColorType)
             {
@@ -335,7 +337,7 @@ namespace ImageSharp.Formats
                     this.CollectGrayscaleBytes(pixels, row, rawScanline);
                     break;
                 default:
-                    this.CollectColorBytes(pixels, row, rawScanline);
+                    this.CollecTPixelBytes(pixels, row, rawScanline);
                     break;
             }
 
@@ -471,13 +473,13 @@ namespace ImageSharp.Formats
         /// <summary>
         /// Writes the palette chunk to the stream.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="stream">The <see cref="Stream"/> containing image data.</param>
         /// <param name="header">The <see cref="PngHeader"/>.</param>
         /// <param name="image">The image to encode.</param>
-        /// <returns>The <see cref="QuantizedImage{TColor}"/></returns>
-        private QuantizedImage<TColor> WritePaletteChunk<TColor>(Stream stream, PngHeader header, ImageBase<TColor> image)
-            where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="QuantizedImage{TPixel}"/></returns>
+        private QuantizedImage<TPixel> WritePaletteChunk<TPixel>(Stream stream, PngHeader header, ImageBase<TPixel> image)
+            where TPixel : struct, IPixel<TPixel>
         {
             if (this.quality > 256)
             {
@@ -486,14 +488,14 @@ namespace ImageSharp.Formats
 
             if (this.quantizer == null)
             {
-                this.quantizer = new WuQuantizer<TColor>();
+                this.quantizer = new WuQuantizer<TPixel>();
             }
 
             // Quantize the image returning a palette. This boxing is icky.
-            QuantizedImage<TColor> quantized = ((IQuantizer<TColor>)this.quantizer).Quantize(image, this.quality);
+            QuantizedImage<TPixel> quantized = ((IQuantizer<TPixel>)this.quantizer).Quantize(image, this.quality);
 
             // Grab the palette and write it to the stream.
-            TColor[] palette = quantized.Palette;
+            TPixel[] palette = quantized.Palette;
             byte pixelCount = palette.Length.ToByte();
 
             // Get max colors for bit depth.
@@ -548,11 +550,11 @@ namespace ImageSharp.Formats
         /// <summary>
         /// Writes the physical dimension information to the stream.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="stream">The <see cref="Stream"/> containing image data.</param>
         /// <param name="image">The image.</param>
-        private void WritePhysicalChunk<TColor>(Stream stream, Image<TColor> image)
-            where TColor : struct, IPixel<TColor>
+        private void WritePhysicalChunk<TPixel>(Stream stream, Image<TPixel> image)
+            where TPixel : struct, IPixel<TPixel>
         {
             if (image.MetaData.HorizontalResolution > 0 && image.MetaData.VerticalResolution > 0)
             {
@@ -593,11 +595,11 @@ namespace ImageSharp.Formats
         /// <summary>
         /// Writes the pixel information to the stream.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="pixels">The pixel accessor.</param>
         /// <param name="stream">The stream.</param>
-        private void WriteDataChunks<TColor>(PixelAccessor<TColor> pixels, Stream stream)
-            where TColor : struct, IPixel<TColor>
+        private void WriteDataChunks<TPixel>(PixelAccessor<TPixel> pixels, Stream stream)
+            where TPixel : struct, IPixel<TPixel>
         {
             int bytesPerScanline = this.width * this.bytesPerPixel;
             byte[] previousScanline = new byte[bytesPerScanline];
diff --git a/src/ImageSharp/Image.Create.cs b/src/ImageSharp/Image.Create.cs
index fcecefd7b7..3d92cd66bf 100644
--- a/src/ImageSharp/Image.Create.cs
+++ b/src/ImageSharp/Image.Create.cs
@@ -5,11 +5,7 @@
 
 namespace ImageSharp
 {
-    using System;
-    using System.Diagnostics;
-    using System.IO;
-
-    using Formats;
+    using ImageSharp.PixelFormats;
 
     /// <summary>
     /// Represents an image. Each pixel is a made up four 8-bit components red, green, blue, and alpha
@@ -18,10 +14,10 @@ namespace ImageSharp
     public sealed partial class Image
     {
         /// <summary>
-        /// Create a new instance of the <see cref="Image{TColor}"/> class
+        /// Create a new instance of the <see cref="Image{TPixel}"/> class
         /// with the height and the width of the image.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="width">The width of the image in pixels.</param>
         /// <param name="height">The height of the image in pixels.</param>
         /// <param name="metadata">The images matadata to preload.</param>
@@ -29,38 +25,38 @@ namespace ImageSharp
         /// The configuration providing initialization code which allows extending the library.
         /// </param>
         /// <returns>
-        /// A new <see cref="Image{TColor}"/> unless <typeparamref name="TColor"/> is <see cref="Color"/> in which case it returns <see cref="Image" />
+        /// A new <see cref="Image{TPixel}"/> unless <typeparamref name="TPixel"/> is <see cref="Rgba32"/> in which case it returns <see cref="Image" />
         /// </returns>
-        internal static Image<TColor> Create<TColor>(int width, int height, ImageMetaData metadata, Configuration configuration)
-            where TColor : struct, IPixel<TColor>
+        internal static Image<TPixel> Create<TPixel>(int width, int height, ImageMetaData metadata, Configuration configuration)
+            where TPixel : struct, IPixel<TPixel>
         {
-            if (typeof(TColor) == typeof(Color))
+            if (typeof(TPixel) == typeof(Rgba32))
             {
-                return new Image(width, height, metadata, configuration) as Image<TColor>;
+                return new Image(width, height, metadata, configuration) as Image<TPixel>;
             }
             else
             {
-                return new Image<TColor>(width, height, metadata, configuration);
+                return new Image<TPixel>(width, height, metadata, configuration);
             }
         }
 
         /// <summary>
-        /// Create a new instance of the <see cref="Image{TColor}"/> class
+        /// Create a new instance of the <see cref="Image{TPixel}"/> class
         /// with the height and the width of the image.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="width">The width of the image in pixels.</param>
         /// <param name="height">The height of the image in pixels.</param>
         /// <param name="configuration">
         /// The configuration providing initialization code which allows extending the library.
         /// </param>
         /// <returns>
-        /// A new <see cref="Image{TColor}"/> unless <typeparamref name="TColor"/> is <see cref="Color"/> in which case it returns <see cref="Image" />
+        /// A new <see cref="Image{TPixel}"/> unless <typeparamref name="TPixel"/> is <see cref="Rgba32"/> in which case it returns <see cref="Image" />
         /// </returns>
-        internal static Image<TColor> Create<TColor>(int width, int height, Configuration configuration)
-            where TColor : struct, IPixel<TColor>
+        internal static Image<TPixel> Create<TPixel>(int width, int height, Configuration configuration)
+            where TPixel : struct, IPixel<TPixel>
         {
-            return Image.Create<TColor>(width, height, null, configuration);
+            return Image.Create<TPixel>(width, height, null, configuration);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/ImageSharp/Image.Decode.cs b/src/ImageSharp/Image.Decode.cs
index c1c1371220..b0e4762805 100644
--- a/src/ImageSharp/Image.Decode.cs
+++ b/src/ImageSharp/Image.Decode.cs
@@ -10,6 +10,8 @@ namespace ImageSharp
     using System.Linq;
     using Formats;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// Represents an image. Each pixel is a made up four 8-bit components red, green, blue, and alpha
     /// packed into a single unsigned integer value.
@@ -51,15 +53,15 @@ namespace ImageSharp
         /// <summary>
         /// Decodes the image stream to the current image.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="stream">The stream.</param>
         /// <param name="options">The options for the decoder.</param>
         /// <param name="config">the configuration.</param>
         /// <returns>
         ///  The decoded image
         /// </returns>
-        private static Image<TColor> Decode<TColor>(Stream stream, IDecoderOptions options, Configuration config)
-        where TColor : struct, IPixel<TColor>
+        private static Image<TPixel> Decode<TPixel>(Stream stream, IDecoderOptions options, Configuration config)
+        where TPixel : struct, IPixel<TPixel>
         {
             IImageFormat format = DiscoverFormat(stream, config);
             if (format == null)
@@ -67,7 +69,7 @@ namespace ImageSharp
                 return null;
             }
 
-            Image<TColor> img = format.Decoder.Decode<TColor>(config, stream, options);
+            Image<TPixel> img = format.Decoder.Decode<TPixel>(config, stream, options);
             img.CurrentImageFormat = format;
             return img;
         }
diff --git a/src/ImageSharp/Image.FromBytes.cs b/src/ImageSharp/Image.FromBytes.cs
index b2f9854f22..540eb60168 100644
--- a/src/ImageSharp/Image.FromBytes.cs
+++ b/src/ImageSharp/Image.FromBytes.cs
@@ -9,6 +9,8 @@ namespace ImageSharp
     using System.IO;
     using Formats;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// Represents an image. Each pixel is a made up four 8-bit components red, green, blue, and alpha
     /// packed into a single unsigned integer value.
@@ -109,70 +111,70 @@ namespace ImageSharp
         /// <summary>
         /// Loads the image from the given byte array.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="data">The byte array containing image data.</param>
         /// <exception cref="NotSupportedException">
         /// Thrown if the stream is not readable nor seekable.
         /// </exception>
         /// <returns>The image</returns>
-        public static Image<TColor> Load<TColor>(byte[] data)
-            where TColor : struct, IPixel<TColor>
+        public static Image<TPixel> Load<TPixel>(byte[] data)
+            where TPixel : struct, IPixel<TPixel>
         {
-            return Load<TColor>(null, data, null);
+            return Load<TPixel>(null, data, null);
         }
 
         /// <summary>
         /// Loads the image from the given byte array.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="data">The byte array containing image data.</param>
         /// <param name="options">The options for the decoder.</param>
         /// <exception cref="NotSupportedException">
         /// Thrown if the stream is not readable nor seekable.
         /// </exception>
         /// <returns>The image</returns>
-        public static Image<TColor> Load<TColor>(byte[] data, IDecoderOptions options)
-            where TColor : struct, IPixel<TColor>
+        public static Image<TPixel> Load<TPixel>(byte[] data, IDecoderOptions options)
+            where TPixel : struct, IPixel<TPixel>
         {
-            return Load<TColor>(null, data, options);
+            return Load<TPixel>(null, data, options);
         }
 
         /// <summary>
         /// Loads the image from the given byte array.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="config">The config for the decoder.</param>
         /// <param name="data">The byte array containing image data.</param>
         /// <exception cref="NotSupportedException">
         /// Thrown if the stream is not readable nor seekable.
         /// </exception>
         /// <returns>The image</returns>
-        public static Image<TColor> Load<TColor>(Configuration config, byte[] data)
-            where TColor : struct, IPixel<TColor>
+        public static Image<TPixel> Load<TPixel>(Configuration config, byte[] data)
+            where TPixel : struct, IPixel<TPixel>
         {
-            return Load<TColor>(config, data, null);
+            return Load<TPixel>(config, data, null);
         }
 
         /// <summary>
         /// Loads the image from the given byte array.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="data">The byte array containing image data.</param>
         /// <param name="decoder">The decoder.</param>
         /// <exception cref="NotSupportedException">
         /// Thrown if the stream is not readable nor seekable.
         /// </exception>
         /// <returns>The image</returns>
-        public static Image<TColor> Load<TColor>(byte[] data, IImageDecoder decoder)
-            where TColor : struct, IPixel<TColor>
+        public static Image<TPixel> Load<TPixel>(byte[] data, IImageDecoder decoder)
+            where TPixel : struct, IPixel<TPixel>
         {
-            return Load<TColor>(data, decoder, null);
+            return Load<TPixel>(data, decoder, null);
         }
 
         /// <summary>
         /// Loads the image from the given byte array.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="config">The configuration options.</param>
         /// <param name="data">The byte array containing image data.</param>
         /// <param name="options">The options for the decoder.</param>
@@ -180,19 +182,19 @@ namespace ImageSharp
         /// Thrown if the stream is not readable nor seekable.
         /// </exception>
         /// <returns>The image</returns>
-        public static Image<TColor> Load<TColor>(Configuration config, byte[] data, IDecoderOptions options)
-            where TColor : struct, IPixel<TColor>
+        public static Image<TPixel> Load<TPixel>(Configuration config, byte[] data, IDecoderOptions options)
+            where TPixel : struct, IPixel<TPixel>
         {
             using (MemoryStream ms = new MemoryStream(data))
             {
-                return Load<TColor>(config, ms, options);
+                return Load<TPixel>(config, ms, options);
             }
         }
 
         /// <summary>
         /// Loads the image from the given byte array.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="data">The byte array containing image data.</param>
         /// <param name="decoder">The decoder.</param>
         /// <param name="options">The options for the decoder.</param>
@@ -200,12 +202,12 @@ namespace ImageSharp
         /// Thrown if the stream is not readable nor seekable.
         /// </exception>
         /// <returns>The image</returns>
-        public static Image<TColor> Load<TColor>(byte[] data, IImageDecoder decoder, IDecoderOptions options)
-            where TColor : struct, IPixel<TColor>
+        public static Image<TPixel> Load<TPixel>(byte[] data, IImageDecoder decoder, IDecoderOptions options)
+            where TPixel : struct, IPixel<TPixel>
         {
             using (MemoryStream ms = new MemoryStream(data))
             {
-                return Load<TColor>(ms, decoder, options);
+                return Load<TPixel>(ms, decoder, options);
             }
         }
     }
diff --git a/src/ImageSharp/Image.FromFile.cs b/src/ImageSharp/Image.FromFile.cs
index 40cdfe3eff..8f4c9138b6 100644
--- a/src/ImageSharp/Image.FromFile.cs
+++ b/src/ImageSharp/Image.FromFile.cs
@@ -9,6 +9,7 @@ namespace ImageSharp
     using System;
     using System.IO;
     using Formats;
+    using ImageSharp.PixelFormats;
 
     /// <summary>
     /// Represents an image. Each pixel is a made up four 8-bit components red, green, blue, and alpha
@@ -83,7 +84,7 @@ namespace ImageSharp
         /// <returns>The image</returns>
         public static Image Load(string path, IImageDecoder decoder, IDecoderOptions options)
         {
-            return new Image(Load<Color>(path, decoder, options));
+            return new Image(Load<Rgba32>(path, decoder, options));
         }
 
         /// <summary>
@@ -108,70 +109,70 @@ namespace ImageSharp
         /// <summary>
         /// Loads the image from the given file.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="path">The file path to the image.</param>
         /// <exception cref="NotSupportedException">
         /// Thrown if the stream is not readable nor seekable.
         /// </exception>
         /// <returns>The image</returns>
-        public static Image<TColor> Load<TColor>(string path)
-            where TColor : struct, IPixel<TColor>
+        public static Image<TPixel> Load<TPixel>(string path)
+            where TPixel : struct, IPixel<TPixel>
         {
-            return Load<TColor>(null, path, null);
+            return Load<TPixel>(null, path, null);
         }
 
         /// <summary>
         /// Loads the image from the given file.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="path">The file path to the image.</param>
         /// <param name="options">The options for the decoder.</param>
         /// <exception cref="NotSupportedException">
         /// Thrown if the stream is not readable nor seekable.
         /// </exception>
         /// <returns>The image</returns>
-        public static Image<TColor> Load<TColor>(string path, IDecoderOptions options)
-            where TColor : struct, IPixel<TColor>
+        public static Image<TPixel> Load<TPixel>(string path, IDecoderOptions options)
+            where TPixel : struct, IPixel<TPixel>
         {
-            return Load<TColor>(null, path, options);
+            return Load<TPixel>(null, path, options);
         }
 
         /// <summary>
         /// Loads the image from the given file.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="config">The config for the decoder.</param>
         /// <param name="path">The file path to the image.</param>
         /// <exception cref="NotSupportedException">
         /// Thrown if the stream is not readable nor seekable.
         /// </exception>
         /// <returns>The image</returns>
-        public static Image<TColor> Load<TColor>(Configuration config, string path)
-            where TColor : struct, IPixel<TColor>
+        public static Image<TPixel> Load<TPixel>(Configuration config, string path)
+            where TPixel : struct, IPixel<TPixel>
         {
-            return Load<TColor>(config, path, null);
+            return Load<TPixel>(config, path, null);
         }
 
         /// <summary>
         /// Loads the image from the given file.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="path">The file path to the image.</param>
         /// <param name="decoder">The decoder.</param>
         /// <exception cref="NotSupportedException">
         /// Thrown if the stream is not readable nor seekable.
         /// </exception>
         /// <returns>The image</returns>
-        public static Image<TColor> Load<TColor>(string path, IImageDecoder decoder)
-            where TColor : struct, IPixel<TColor>
+        public static Image<TPixel> Load<TPixel>(string path, IImageDecoder decoder)
+            where TPixel : struct, IPixel<TPixel>
         {
-            return Load<TColor>(path, decoder, null);
+            return Load<TPixel>(path, decoder, null);
         }
 
         /// <summary>
         /// Loads the image from the given file.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="config">The configuration options.</param>
         /// <param name="path">The file path to the image.</param>
         /// <param name="options">The options for the decoder.</param>
@@ -179,20 +180,20 @@ namespace ImageSharp
         /// Thrown if the stream is not readable nor seekable.
         /// </exception>
         /// <returns>The image</returns>
-        public static Image<TColor> Load<TColor>(Configuration config, string path, IDecoderOptions options)
-            where TColor : struct, IPixel<TColor>
+        public static Image<TPixel> Load<TPixel>(Configuration config, string path, IDecoderOptions options)
+            where TPixel : struct, IPixel<TPixel>
         {
             config = config ?? Configuration.Default;
             using (Stream s = config.FileSystem.OpenRead(path))
             {
-                return Load<TColor>(config, s, options);
+                return Load<TPixel>(config, s, options);
             }
         }
 
         /// <summary>
         /// Loads the image from the given file.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="path">The file path to the image.</param>
         /// <param name="decoder">The decoder.</param>
         /// <param name="options">The options for the decoder.</param>
@@ -200,13 +201,13 @@ namespace ImageSharp
         /// Thrown if the stream is not readable nor seekable.
         /// </exception>
         /// <returns>The image</returns>
-        public static Image<TColor> Load<TColor>(string path, IImageDecoder decoder, IDecoderOptions options)
-            where TColor : struct, IPixel<TColor>
+        public static Image<TPixel> Load<TPixel>(string path, IImageDecoder decoder, IDecoderOptions options)
+            where TPixel : struct, IPixel<TPixel>
         {
             Configuration config = Configuration.Default;
             using (Stream s = config.FileSystem.OpenRead(path))
             {
-                return Load<TColor>(s, decoder, options);
+                return Load<TPixel>(s, decoder, options);
             }
         }
     }
diff --git a/src/ImageSharp/Image.FromStream.cs b/src/ImageSharp/Image.FromStream.cs
index 112b8a1093..a34c6b7b3c 100644
--- a/src/ImageSharp/Image.FromStream.cs
+++ b/src/ImageSharp/Image.FromStream.cs
@@ -7,9 +7,12 @@ namespace ImageSharp
 {
     using System;
     using System.IO;
+    using System.Numerics;
     using System.Text;
     using Formats;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// Represents an image. Each pixel is a made up four 8-bit components red, green, blue, and alpha
     /// packed into a single unsigned integer value.
@@ -83,7 +86,7 @@ namespace ImageSharp
         /// <returns>The image</returns>
         public static Image Load(Configuration config, Stream stream, IDecoderOptions options)
         {
-            Image<Color> image = Load<Color>(config, stream, options);
+            Image<Rgba32> image = Load<Rgba32>(config, stream, options);
 
             return image as Image ?? new Image(image);
         }
@@ -100,7 +103,7 @@ namespace ImageSharp
         /// <returns>The image</returns>
         public static Image Load(Stream stream, IImageDecoder decoder, IDecoderOptions options)
         {
-            Image<Color> image = new Image(Load<Color>(stream, decoder, options));
+            Image<Rgba32> image = new Image(Load<Rgba32>(stream, decoder, options));
 
             return image as Image ?? new Image(image);
         }
@@ -108,70 +111,70 @@ namespace ImageSharp
         /// <summary>
         /// Loads the image from the given stream.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="stream">The stream containing image information.</param>
         /// <exception cref="NotSupportedException">
         /// Thrown if the stream is not readable nor seekable.
         /// </exception>
         /// <returns>The image</returns>
-        public static Image<TColor> Load<TColor>(Stream stream)
-            where TColor : struct, IPixel<TColor>
+        public static Image<TPixel> Load<TPixel>(Stream stream)
+            where TPixel : struct, IPixel<TPixel>
         {
-            return Load<TColor>(null, stream, null);
+            return Load<TPixel>(null, stream, null);
         }
 
         /// <summary>
         /// Loads the image from the given stream.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="stream">The stream containing image information.</param>
         /// <param name="options">The options for the decoder.</param>
         /// <exception cref="NotSupportedException">
         /// Thrown if the stream is not readable nor seekable.
         /// </exception>
         /// <returns>The image</returns>
-        public static Image<TColor> Load<TColor>(Stream stream, IDecoderOptions options)
-            where TColor : struct, IPixel<TColor>
+        public static Image<TPixel> Load<TPixel>(Stream stream, IDecoderOptions options)
+            where TPixel : struct, IPixel<TPixel>
         {
-            return Load<TColor>(null, stream, options);
+            return Load<TPixel>(null, stream, options);
         }
 
         /// <summary>
         /// Loads the image from the given stream.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="config">The config for the decoder.</param>
         /// <param name="stream">The stream containing image information.</param>
         /// <exception cref="NotSupportedException">
         /// Thrown if the stream is not readable nor seekable.
         /// </exception>
         /// <returns>The image</returns>
-        public static Image<TColor> Load<TColor>(Configuration config, Stream stream)
-            where TColor : struct, IPixel<TColor>
+        public static Image<TPixel> Load<TPixel>(Configuration config, Stream stream)
+            where TPixel : struct, IPixel<TPixel>
         {
-            return Load<TColor>(config, stream, null);
+            return Load<TPixel>(config, stream, null);
         }
 
         /// <summary>
         /// Loads the image from the given stream.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="stream">The stream containing image information.</param>
         /// <param name="decoder">The decoder.</param>
         /// <exception cref="NotSupportedException">
         /// Thrown if the stream is not readable nor seekable.
         /// </exception>
         /// <returns>The image</returns>
-        public static Image<TColor> Load<TColor>(Stream stream, IImageDecoder decoder)
-            where TColor : struct, IPixel<TColor>
+        public static Image<TPixel> Load<TPixel>(Stream stream, IImageDecoder decoder)
+            where TPixel : struct, IPixel<TPixel>
         {
-            return Load<TColor>(stream, decoder, null);
+            return Load<TPixel>(stream, decoder, null);
         }
 
         /// <summary>
         /// Loads the image from the given stream.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="stream">The stream containing image information.</param>
         /// <param name="decoder">The decoder.</param>
         /// <param name="options">The options for the decoder.</param>
@@ -179,16 +182,16 @@ namespace ImageSharp
         /// Thrown if the stream is not readable nor seekable.
         /// </exception>
         /// <returns>The image</returns>
-        public static Image<TColor> Load<TColor>(Stream stream, IImageDecoder decoder, IDecoderOptions options)
-            where TColor : struct, IPixel<TColor>
+        public static Image<TPixel> Load<TPixel>(Stream stream, IImageDecoder decoder, IDecoderOptions options)
+            where TPixel : struct, IPixel<TPixel>
         {
-            return WithSeekableStream(stream, s => decoder.Decode<TColor>(Configuration.Default, s, options));
+            return WithSeekableStream(stream, s => decoder.Decode<TPixel>(Configuration.Default, s, options));
         }
 
         /// <summary>
         /// Loads the image from the given stream.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="config">The configuration options.</param>
         /// <param name="stream">The stream containing image information.</param>
         /// <param name="options">The options for the decoder.</param>
@@ -196,12 +199,12 @@ namespace ImageSharp
         /// Thrown if the stream is not readable nor seekable.
         /// </exception>
         /// <returns>The image</returns>
-        public static Image<TColor> Load<TColor>(Configuration config, Stream stream, IDecoderOptions options)
-            where TColor : struct, IPixel<TColor>
+        public static Image<TPixel> Load<TPixel>(Configuration config, Stream stream, IDecoderOptions options)
+            where TPixel : struct, IPixel<TPixel>
         {
             config = config ?? Configuration.Default;
 
-            Image<TColor> img = WithSeekableStream(stream, s => Decode<TColor>(s, options, config));
+            Image<TPixel> img = WithSeekableStream(stream, s => Decode<TPixel>(s, options, config));
 
             if (img != null)
             {
diff --git a/src/ImageSharp/Image.cs b/src/ImageSharp/Image.cs
index 00688afc96..3d33e62630 100644
--- a/src/ImageSharp/Image.cs
+++ b/src/ImageSharp/Image.cs
@@ -5,18 +5,15 @@
 
 namespace ImageSharp
 {
-    using System;
     using System.Diagnostics;
-    using System.IO;
-
-    using Formats;
+    using ImageSharp.PixelFormats;
 
     /// <summary>
     /// Represents an image. Each pixel is a made up four 8-bit components red, green, blue, and alpha
     /// packed into a single unsigned integer value.
     /// </summary>
     [DebuggerDisplay("Image: {Width}x{Height}")]
-    public sealed partial class Image : Image<Color>
+    public sealed partial class Image : Image<Rgba32>
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="Image"/> class
@@ -49,7 +46,7 @@ namespace ImageSharp
         /// </summary>
         /// <param name="other">The other image, where the clone should be made from.</param>
         /// <exception cref="System.ArgumentNullException"><paramref name="other"/> is null.</exception>
-        public Image(Image<Color> other)
+        public Image(Image<Rgba32> other)
             : base(other)
         {
         }
@@ -69,4 +66,4 @@ namespace ImageSharp
         {
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/ImageSharp/Image/IImageBase{TColor}.cs b/src/ImageSharp/Image/IImageBase{TPixel}.cs
similarity index 67%
rename from src/ImageSharp/Image/IImageBase{TColor}.cs
rename to src/ImageSharp/Image/IImageBase{TPixel}.cs
index 14bdffc672..08d25709b3 100644
--- a/src/ImageSharp/Image/IImageBase{TColor}.cs
+++ b/src/ImageSharp/Image/IImageBase{TPixel}.cs
@@ -1,4 +1,4 @@
-// <copyright file="IImageBase{TColor}.cs" company="James Jackson-South">
+// <copyright file="IImageBase{TPixel}.cs" company="James Jackson-South">
 // Copyright (c) James Jackson-South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
@@ -6,20 +6,21 @@
 namespace ImageSharp
 {
     using System;
+    using ImageSharp.PixelFormats;
 
     /// <summary>
     /// Encapsulates the basic properties and methods required to manipulate images in varying formats.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    public interface IImageBase<TColor> : IImageBase, IDisposable
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    public interface IImageBase<TPixel> : IImageBase, IDisposable
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
         /// Gets the pixels as an array of the given packed pixel format.
         /// Important. Due to the nature in the way this is constructed do not rely on the length
         /// of the array for calculations. Use Width * Height.
         /// </summary>
-        TColor[] Pixels { get; }
+        TPixel[] Pixels { get; }
 
         /// <summary>
         /// Locks the image providing access to the pixels.
@@ -27,7 +28,7 @@ namespace ImageSharp
         /// It is imperative that the accessor is correctly disposed off after use.
         /// </remarks>
         /// </summary>
-        /// <returns>The <see cref="PixelAccessor{TColor}"/></returns>
-        PixelAccessor<TColor> Lock();
+        /// <returns>The <see cref="PixelAccessor{TPixel}"/></returns>
+        PixelAccessor<TPixel> Lock();
     }
 }
\ No newline at end of file
diff --git a/src/ImageSharp/Image/IImageProcessor.cs b/src/ImageSharp/Image/IImageProcessor.cs
index 0440cdd766..c4fa9afa29 100644
--- a/src/ImageSharp/Image/IImageProcessor.cs
+++ b/src/ImageSharp/Image/IImageProcessor.cs
@@ -8,12 +8,14 @@ namespace ImageSharp.Processing
     using System;
     using System.Threading.Tasks;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// Encapsulates methods to alter the pixels of an image.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    public interface IImageProcessor<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    public interface IImageProcessor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
         /// Gets or sets the parallel options for processing tasks in parallel.
@@ -27,7 +29,7 @@ namespace ImageSharp.Processing
         bool Compand { get; set; }
 
         /// <summary>
-        /// Applies the process to the specified portion of the specified <see cref="ImageBase{TColor}"/>.
+        /// Applies the process to the specified portion of the specified <see cref="ImageBase{TPixel}"/>.
         /// </summary>
         /// <param name="source">The source image. Cannot be null.</param>
         /// <param name="sourceRectangle">
@@ -39,6 +41,6 @@ namespace ImageSharp.Processing
         /// <exception cref="System.ArgumentException">
         /// <paramref name="sourceRectangle"/> doesnt fit the dimension of the image.
         /// </exception>
-        void Apply(ImageBase<TColor> source, Rectangle sourceRectangle);
+        void Apply(ImageBase<TPixel> source, Rectangle sourceRectangle);
     }
 }
diff --git a/src/ImageSharp/Image/ImageBase{TColor}.cs b/src/ImageSharp/Image/ImageBase{TPixel}.cs
similarity index 86%
rename from src/ImageSharp/Image/ImageBase{TColor}.cs
rename to src/ImageSharp/Image/ImageBase{TPixel}.cs
index cfce7184b6..7bad03cc80 100644
--- a/src/ImageSharp/Image/ImageBase{TColor}.cs
+++ b/src/ImageSharp/Image/ImageBase{TPixel}.cs
@@ -1,4 +1,4 @@
-// <copyright file="ImageBase{TColor}.cs" company="James Jackson-South">
+// <copyright file="ImageBase{TPixel}.cs" company="James Jackson-South">
 // Copyright (c) James Jackson-South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
@@ -7,16 +7,17 @@ namespace ImageSharp
 {
     using System;
     using System.Diagnostics;
+    using ImageSharp.PixelFormats;
     using Processing;
 
     /// <summary>
     /// The base class of all images. Encapsulates the basic properties and methods required to manipulate
     /// images in different pixel formats.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
     [DebuggerDisplay("Image: {Width}x{Height}")]
-    public abstract class ImageBase<TColor> : IImageBase<TColor>
-        where TColor : struct, IPixel<TColor>
+    public abstract class ImageBase<TPixel> : IImageBase<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
         /// Gets or sets the maximum allowable width in pixels.
@@ -31,7 +32,7 @@ namespace ImageSharp
         /// <summary>
         /// The image pixels
         /// </summary>
-        private TColor[] pixelBuffer;
+        private TPixel[] pixelBuffer;
 
         /// <summary>
         /// A value indicating whether this instance of the given entity has been disposed.
@@ -45,7 +46,7 @@ namespace ImageSharp
         private bool isDisposed;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="ImageBase{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="ImageBase{TPixel}"/> class.
         /// </summary>
         /// <param name="configuration">
         /// The configuration providing initialization code which allows extending the library.
@@ -56,7 +57,7 @@ namespace ImageSharp
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="ImageBase{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="ImageBase{TPixel}"/> class.
         /// </summary>
         /// <param name="width">The width of the image in pixels.</param>
         /// <param name="height">The height of the image in pixels.</param>
@@ -79,15 +80,15 @@ namespace ImageSharp
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="ImageBase{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="ImageBase{TPixel}"/> class.
         /// </summary>
         /// <param name="other">
-        /// The other <see cref="ImageBase{TColor}"/> to create this instance from.
+        /// The other <see cref="ImageBase{TPixel}"/> to create this instance from.
         /// </param>
         /// <exception cref="System.ArgumentNullException">
-        /// Thrown if the given <see cref="ImageBase{TColor}"/> is null.
+        /// Thrown if the given <see cref="ImageBase{TPixel}"/> is null.
         /// </exception>
-        protected ImageBase(ImageBase<TColor> other)
+        protected ImageBase(ImageBase<TPixel> other)
             : this(other.Configuration)
         {
             Guard.NotNull(other, nameof(other), "Other image cannot be null.");
@@ -98,8 +99,8 @@ namespace ImageSharp
 
             // Rent then copy the pixels. Unsafe.CopyBlock gives us a nice speed boost here.
             this.RentPixels();
-            using (PixelAccessor<TColor> sourcePixels = other.Lock())
-            using (PixelAccessor<TColor> target = this.Lock())
+            using (PixelAccessor<TPixel> sourcePixels = other.Lock())
+            using (PixelAccessor<TPixel> target = this.Lock())
             {
                 // Check we can do this without crashing
                 sourcePixels.CopyTo(target);
@@ -107,7 +108,7 @@ namespace ImageSharp
         }
 
         /// <inheritdoc/>
-        public TColor[] Pixels => this.pixelBuffer;
+        public TPixel[] Pixels => this.pixelBuffer;
 
         /// <inheritdoc/>
         public int Width { get; private set; }
@@ -131,7 +132,7 @@ namespace ImageSharp
         /// </summary>
         /// <param name="processor">The processor.</param>
         /// <param name="rectangle">The rectangle.</param>
-        public virtual void ApplyProcessor(IImageProcessor<TColor> processor, Rectangle rectangle)
+        public virtual void ApplyProcessor(IImageProcessor<TPixel> processor, Rectangle rectangle)
         {
             processor.Apply(this, rectangle);
         }
@@ -150,16 +151,16 @@ namespace ImageSharp
         }
 
         /// <inheritdoc/>
-        public PixelAccessor<TColor> Lock()
+        public PixelAccessor<TPixel> Lock()
         {
-            return new PixelAccessor<TColor>(this);
+            return new PixelAccessor<TPixel>(this);
         }
 
         /// <summary>
         /// Switches the buffers used by the image and the PixelAccessor meaning that the Image will "own" the buffer from the PixelAccessor and the PixelAccessor will now own the Images buffer.
         /// </summary>
         /// <param name="pixelSource">The pixel source.</param>
-        internal void SwapPixelsBuffers(PixelAccessor<TColor> pixelSource)
+        internal void SwapPixelsBuffers(PixelAccessor<TPixel> pixelSource)
         {
             Guard.NotNull(pixelSource, nameof(pixelSource));
 
@@ -167,7 +168,7 @@ namespace ImageSharp
             int newHeight = pixelSource.Height;
 
             // Push my memory into the accessor (which in turn unpins the old puffer ready for the images use)
-            TColor[] newPixels = pixelSource.ReturnCurrentPixelsAndReplaceThemInternally(this.Width, this.Height, this.pixelBuffer);
+            TPixel[] newPixels = pixelSource.ReturnCurrentColorsAndReplaceThemInternally(this.Width, this.Height, this.pixelBuffer);
             this.Width = newWidth;
             this.Height = newHeight;
             this.pixelBuffer = newPixels;
@@ -221,7 +222,7 @@ namespace ImageSharp
         /// </summary>
         private void RentPixels()
         {
-            this.pixelBuffer = PixelDataPool<TColor>.Rent(this.Width * this.Height);
+            this.pixelBuffer = PixelDataPool<TPixel>.Rent(this.Width * this.Height);
         }
 
         /// <summary>
@@ -229,7 +230,7 @@ namespace ImageSharp
         /// </summary>
         private void ReturnPixels()
         {
-            PixelDataPool<TColor>.Return(this.pixelBuffer);
+            PixelDataPool<TPixel>.Return(this.pixelBuffer);
             this.pixelBuffer = null;
         }
 
diff --git a/src/ImageSharp/Image/ImageFrame{TColor}.cs b/src/ImageSharp/Image/ImageFrame{TPixel}.cs
similarity index 73%
rename from src/ImageSharp/Image/ImageFrame{TColor}.cs
rename to src/ImageSharp/Image/ImageFrame{TPixel}.cs
index 2712dc6878..e502950d06 100644
--- a/src/ImageSharp/Image/ImageFrame{TColor}.cs
+++ b/src/ImageSharp/Image/ImageFrame{TPixel}.cs
@@ -1,4 +1,4 @@
-// <copyright file="ImageFrame{TColor}.cs" company="James Jackson-South">
+// <copyright file="ImageFrame{TPixel}.cs" company="James Jackson-South">
 // Copyright (c) James Jackson-South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
@@ -8,16 +8,17 @@ namespace ImageSharp
     using System;
     using System.Numerics;
     using System.Threading.Tasks;
+    using ImageSharp.PixelFormats;
 
     /// <summary>
     /// Represents a single frame in a animation.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    public class ImageFrame<TColor> : ImageBase<TColor>, IImageFrame
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    public class ImageFrame<TPixel> : ImageBase<TPixel>, IImageFrame
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
-        /// Initializes a new instance of the <see cref="ImageFrame{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="ImageFrame{TPixel}"/> class.
         /// </summary>
         /// <param name="width">The width of the image in pixels.</param>
         /// <param name="height">The height of the image in pixels.</param>
@@ -30,10 +31,10 @@ namespace ImageSharp
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="ImageFrame{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="ImageFrame{TPixel}"/> class.
         /// </summary>
         /// <param name="image">The image to create the frame from.</param>
-        public ImageFrame(ImageBase<TColor> image)
+        public ImageFrame(ImageBase<TPixel> image)
             : base(image)
         {
         }
@@ -53,18 +54,18 @@ namespace ImageSharp
         /// Returns a copy of the image frame in the given pixel format.
         /// </summary>
         /// <param name="scaleFunc">A function that allows for the correction of vector scaling between unknown color formats.</param>
-        /// <typeparam name="TColor2">The pixel format.</typeparam>
-        /// <returns>The <see cref="ImageFrame{TColor2}"/></returns>
-        public ImageFrame<TColor2> To<TColor2>(Func<Vector4, Vector4> scaleFunc = null)
-            where TColor2 : struct, IPixel<TColor2>
+        /// <typeparam name="TPixel2">The pixel format.</typeparam>
+        /// <returns>The <see cref="ImageFrame{TPixel2}"/></returns>
+        public ImageFrame<TPixel2> To<TPixel2>(Func<Vector4, Vector4> scaleFunc = null)
+            where TPixel2 : struct, IPixel<TPixel2>
         {
-            scaleFunc = PackedPixelConverterHelper.ComputeScaleFunction<TColor, TColor2>(scaleFunc);
+            scaleFunc = PackedPixelConverterHelper.ComputeScaleFunction<TPixel, TPixel2>(scaleFunc);
 
-            ImageFrame<TColor2> target = new ImageFrame<TColor2>(this.Width, this.Height, this.Configuration);
+            ImageFrame<TPixel2> target = new ImageFrame<TPixel2>(this.Width, this.Height, this.Configuration);
             target.CopyProperties(this);
 
-            using (PixelAccessor<TColor> pixels = this.Lock())
-            using (PixelAccessor<TColor2> targetPixels = target.Lock())
+            using (PixelAccessor<TPixel> pixels = this.Lock())
+            using (PixelAccessor<TPixel2> targetPixels = target.Lock())
             {
                 Parallel.For(
                     0,
@@ -74,7 +75,7 @@ namespace ImageSharp
                     {
                         for (int x = 0; x < target.Width; x++)
                         {
-                            TColor2 color = default(TColor2);
+                            TPixel2 color = default(TPixel2);
                             color.PackFromVector4(scaleFunc(pixels[x, y].ToVector4()));
                             targetPixels[x, y] = color;
                         }
@@ -87,10 +88,10 @@ namespace ImageSharp
         /// <summary>
         /// Clones the current instance.
         /// </summary>
-        /// <returns>The <see cref="ImageFrame{TColor}"/></returns>
-        internal virtual ImageFrame<TColor> Clone()
+        /// <returns>The <see cref="ImageFrame{TPixel}"/></returns>
+        internal virtual ImageFrame<TPixel> Clone()
         {
-            return new ImageFrame<TColor>(this);
+            return new ImageFrame<TPixel>(this);
         }
 
         /// <summary>
diff --git a/src/ImageSharp/Image/ImageProcessingExtensions.cs b/src/ImageSharp/Image/ImageProcessingExtensions.cs
index ff3ecd5eef..c9577ac15f 100644
--- a/src/ImageSharp/Image/ImageProcessingExtensions.cs
+++ b/src/ImageSharp/Image/ImageProcessingExtensions.cs
@@ -5,11 +5,12 @@
 
 namespace ImageSharp
 {
-    using System;
+    using ImageSharp.PixelFormats;
+
     using Processing;
 
     /// <summary>
-    /// Extension methods for the <see cref="Image{TColor}"/> type.
+    /// Extension methods for the <see cref="Image{TPixel}"/> type.
     /// </summary>
     public static partial class ImageExtensions
     {
@@ -17,12 +18,12 @@ namespace ImageSharp
         /// Applies the processor to the image.
         /// <remarks>This method does not resize the target image.</remarks>
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="processor">The processor to apply to the image.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Apply<TColor>(this Image<TColor> source, IImageProcessor<TColor> processor)
-            where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Apply<TPixel>(this Image<TPixel> source, IImageProcessor<TPixel> processor)
+            where TPixel : struct, IPixel<TPixel>
         {
             source.ApplyProcessor(processor, source.Bounds);
             return source;
diff --git a/src/ImageSharp/Image/Image{TColor}.cs b/src/ImageSharp/Image/Image{TPixel}.cs
similarity index 82%
rename from src/ImageSharp/Image/Image{TColor}.cs
rename to src/ImageSharp/Image/Image{TPixel}.cs
index d063c3ff16..f49943b539 100644
--- a/src/ImageSharp/Image/Image{TColor}.cs
+++ b/src/ImageSharp/Image/Image{TPixel}.cs
@@ -1,4 +1,4 @@
-// <copyright file="Image{TColor}.cs" company="James Jackson-South">
+// <copyright file="Image{TPixel}.cs" company="James Jackson-South">
 // Copyright (c) James Jackson-South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
@@ -6,28 +6,27 @@
 namespace ImageSharp
 {
     using System;
-    using System.Buffers;
     using System.Collections.Generic;
     using System.Diagnostics;
     using System.IO;
     using System.Linq;
     using System.Numerics;
-    using System.Text;
     using System.Threading.Tasks;
 
     using Formats;
+    using ImageSharp.PixelFormats;
     using Processing;
 
     /// <summary>
     /// Encapsulates an image, which consists of the pixel data for a graphics image and its attributes.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
     [DebuggerDisplay("Image: {Width}x{Height}")]
-    public class Image<TColor> : ImageBase<TColor>, IImage
-        where TColor : struct, IPixel<TColor>
+    public class Image<TPixel> : ImageBase<TPixel>, IImage
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
-        /// Initializes a new instance of the <see cref="Image{TColor}"/> class
+        /// Initializes a new instance of the <see cref="Image{TPixel}"/> class
         /// with the height and the width of the image.
         /// </summary>
         /// <param name="width">The width of the image in pixels.</param>
@@ -41,7 +40,7 @@ namespace ImageSharp
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="Image{TColor}"/> class
+        /// Initializes a new instance of the <see cref="Image{TPixel}"/> class
         /// with the height and the width of the image.
         /// </summary>
         /// <param name="width">The width of the image in pixels.</param>
@@ -52,19 +51,19 @@ namespace ImageSharp
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="Image{TColor}"/> class
+        /// Initializes a new instance of the <see cref="Image{TPixel}"/> class
         /// by making a copy from another image.
         /// </summary>
         /// <param name="other">The other image, where the clone should be made from.</param>
         /// <exception cref="System.ArgumentNullException"><paramref name="other"/> is null.</exception>
-        public Image(Image<TColor> other)
+        public Image(Image<TPixel> other)
             : base(other)
         {
-            foreach (ImageFrame<TColor> frame in other.Frames)
+            foreach (ImageFrame<TPixel> frame in other.Frames)
             {
                 if (frame != null)
                 {
-                    this.Frames.Add(new ImageFrame<TColor>(frame));
+                    this.Frames.Add(new ImageFrame<TPixel>(frame));
                 }
             }
 
@@ -72,19 +71,19 @@ namespace ImageSharp
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="Image{TColor}"/> class
+        /// Initializes a new instance of the <see cref="Image{TPixel}"/> class
         /// by making a copy from another image.
         /// </summary>
         /// <param name="other">The other image, where the clone should be made from.</param>
         /// <exception cref="System.ArgumentNullException"><paramref name="other"/> is null.</exception>
-        public Image(ImageBase<TColor> other)
+        public Image(ImageBase<TPixel> other)
             : base(other)
         {
             this.MetaData = new ImageMetaData();
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="Image{TColor}"/> class
+        /// Initializes a new instance of the <see cref="Image{TPixel}"/> class
         /// with the height and the width of the image.
         /// </summary>
         /// <param name="width">The width of the image in pixels.</param>
@@ -138,7 +137,7 @@ namespace ImageSharp
         /// Gets the other frames for the animation.
         /// </summary>
         /// <value>The list of frame images.</value>
-        public IList<ImageFrame<TColor>> Frames { get; } = new List<ImageFrame<TColor>>();
+        public IList<ImageFrame<TPixel>> Frames { get; } = new List<ImageFrame<TPixel>>();
 
         /// <summary>
         /// Gets the currently loaded image format.
@@ -150,11 +149,11 @@ namespace ImageSharp
         /// </summary>
         /// <param name="processor">The processor to apply to the image.</param>
         /// <param name="rectangle">The <see cref="Rectangle" /> structure that specifies the portion of the image object to draw.</param>
-        public override void ApplyProcessor(IImageProcessor<TColor> processor, Rectangle rectangle)
+        public override void ApplyProcessor(IImageProcessor<TPixel> processor, Rectangle rectangle)
         {
             // we want to put this on on here as it gives us a really go place to test/verify processor settings
             base.ApplyProcessor(processor, rectangle);
-            foreach (ImageFrame<TColor> sourceFrame in this.Frames)
+            foreach (ImageFrame<TPixel> sourceFrame in this.Frames)
             {
                 sourceFrame.ApplyProcessor(processor, rectangle);
             }
@@ -165,8 +164,8 @@ namespace ImageSharp
         /// </summary>
         /// <param name="stream">The stream to save the image to.</param>
         /// <exception cref="System.ArgumentNullException">Thrown if the stream is null.</exception>
-        /// <returns>The <see cref="Image{TColor}"/></returns>
-        public Image<TColor> Save(Stream stream)
+        /// <returns>The <see cref="Image{TPixel}"/></returns>
+        public Image<TPixel> Save(Stream stream)
         {
             return this.Save(stream, (IEncoderOptions)null);
         }
@@ -177,8 +176,8 @@ namespace ImageSharp
         /// <param name="stream">The stream to save the image to.</param>
         /// <param name="options">The options for the encoder.</param>
         /// <exception cref="System.ArgumentNullException">Thrown if the stream is null.</exception>
-        /// <returns>The <see cref="Image{TColor}"/></returns>
-        public Image<TColor> Save(Stream stream, IEncoderOptions options)
+        /// <returns>The <see cref="Image{TPixel}"/></returns>
+        public Image<TPixel> Save(Stream stream, IEncoderOptions options)
         {
             return this.Save(stream, this.CurrentImageFormat?.Encoder, options);
         }
@@ -188,8 +187,8 @@ namespace ImageSharp
         /// </summary>
         /// <param name="stream">The stream to save the image to.</param>
         /// <param name="format">The format to save the image as.</param>
-        /// <returns>The <see cref="Image{TColor}"/></returns>
-        public Image<TColor> Save(Stream stream, IImageFormat format)
+        /// <returns>The <see cref="Image{TPixel}"/></returns>
+        public Image<TPixel> Save(Stream stream, IImageFormat format)
         {
             return this.Save(stream, format, null);
         }
@@ -200,8 +199,8 @@ namespace ImageSharp
         /// <param name="stream">The stream to save the image to.</param>
         /// <param name="format">The format to save the image as.</param>
         /// <param name="options">The options for the encoder.</param>
-        /// <returns>The <see cref="Image{TColor}"/></returns>
-        public Image<TColor> Save(Stream stream, IImageFormat format, IEncoderOptions options)
+        /// <returns>The <see cref="Image{TPixel}"/></returns>
+        public Image<TPixel> Save(Stream stream, IImageFormat format, IEncoderOptions options)
         {
             Guard.NotNull(format, nameof(format));
 
@@ -215,9 +214,9 @@ namespace ImageSharp
         /// <param name="encoder">The encoder to save the image with.</param>
         /// <exception cref="System.ArgumentNullException">Thrown if the stream or encoder is null.</exception>
         /// <returns>
-        /// The <see cref="Image{TColor}"/>.
+        /// The <see cref="Image{TPixel}"/>.
         /// </returns>
-        public Image<TColor> Save(Stream stream, IImageEncoder encoder)
+        public Image<TPixel> Save(Stream stream, IImageEncoder encoder)
         {
             return this.Save(stream, encoder, null);
         }
@@ -230,9 +229,9 @@ namespace ImageSharp
         /// <param name="options">The options for the encoder.</param>
         /// <exception cref="System.ArgumentNullException">Thrown if the stream or encoder is null.</exception>
         /// <returns>
-        /// The <see cref="Image{TColor}"/>.
+        /// The <see cref="Image{TPixel}"/>.
         /// </returns>
-        public Image<TColor> Save(Stream stream, IImageEncoder encoder, IEncoderOptions options)
+        public Image<TPixel> Save(Stream stream, IImageEncoder encoder, IEncoderOptions options)
         {
             Guard.NotNull(stream, nameof(stream));
             Guard.NotNull(encoder, nameof(encoder));
@@ -248,8 +247,8 @@ namespace ImageSharp
         /// </summary>
         /// <param name="filePath">The file path to save the image to.</param>
         /// <exception cref="System.ArgumentNullException">Thrown if the stream is null.</exception>
-        /// <returns>The <see cref="Image{TColor}"/></returns>
-        public Image<TColor> Save(string filePath)
+        /// <returns>The <see cref="Image{TPixel}"/></returns>
+        public Image<TPixel> Save(string filePath)
         {
             return this.Save(filePath, (IEncoderOptions)null);
         }
@@ -260,8 +259,8 @@ namespace ImageSharp
         /// <param name="filePath">The file path to save the image to.</param>
         /// <param name="options">The options for the encoder.</param>
         /// <exception cref="System.ArgumentNullException">Thrown if the stream is null.</exception>
-        /// <returns>The <see cref="Image{TColor}"/></returns>
-        public Image<TColor> Save(string filePath, IEncoderOptions options)
+        /// <returns>The <see cref="Image{TPixel}"/></returns>
+        public Image<TPixel> Save(string filePath, IEncoderOptions options)
         {
             string ext = Path.GetExtension(filePath).Trim('.');
             IImageFormat format = this.Configuration.ImageFormats.SingleOrDefault(f => f.SupportedExtensions.Contains(ext, StringComparer.OrdinalIgnoreCase));
@@ -279,8 +278,8 @@ namespace ImageSharp
         /// <param name="filePath">The file path to save the image to.</param>
         /// <param name="format">The format to save the image as.</param>
         /// <exception cref="System.ArgumentNullException">Thrown if the format is null.</exception>
-        /// <returns>The <see cref="Image{TColor}"/></returns>
-        public Image<TColor> Save(string filePath, IImageFormat format)
+        /// <returns>The <see cref="Image{TPixel}"/></returns>
+        public Image<TPixel> Save(string filePath, IImageFormat format)
         {
             return this.Save(filePath, format, null);
         }
@@ -292,8 +291,8 @@ namespace ImageSharp
         /// <param name="format">The format to save the image as.</param>
         /// <param name="options">The options for the encoder.</param>
         /// <exception cref="System.ArgumentNullException">Thrown if the format is null.</exception>
-        /// <returns>The <see cref="Image{TColor}"/></returns>
-        public Image<TColor> Save(string filePath, IImageFormat format, IEncoderOptions options)
+        /// <returns>The <see cref="Image{TPixel}"/></returns>
+        public Image<TPixel> Save(string filePath, IImageFormat format, IEncoderOptions options)
         {
             Guard.NotNull(format, nameof(format));
             return this.Save(filePath, format.Encoder, options);
@@ -305,8 +304,8 @@ namespace ImageSharp
         /// <param name="filePath">The file path to save the image to.</param>
         /// <param name="encoder">The encoder to save the image with.</param>
         /// <exception cref="System.ArgumentNullException">Thrown if the encoder is null.</exception>
-        /// <returns>The <see cref="Image{TColor}"/></returns>
-        public Image<TColor> Save(string filePath, IImageEncoder encoder)
+        /// <returns>The <see cref="Image{TPixel}"/></returns>
+        public Image<TPixel> Save(string filePath, IImageEncoder encoder)
         {
             return this.Save(filePath, encoder, null);
         }
@@ -318,8 +317,8 @@ namespace ImageSharp
         /// <param name="encoder">The encoder to save the image with.</param>
         /// <param name="options">The options for the encoder.</param>
         /// <exception cref="System.ArgumentNullException">Thrown if the encoder is null.</exception>
-        /// <returns>The <see cref="Image{TColor}"/></returns>
-        public Image<TColor> Save(string filePath, IImageEncoder encoder, IEncoderOptions options)
+        /// <returns>The <see cref="Image{TPixel}"/></returns>
+        public Image<TPixel> Save(string filePath, IImageEncoder encoder, IEncoderOptions options)
         {
             Guard.NotNull(encoder, nameof(encoder));
             using (Stream fs = this.Configuration.FileSystem.Create(filePath))
@@ -354,18 +353,18 @@ namespace ImageSharp
         /// Returns a copy of the image in the given pixel format.
         /// </summary>
         /// <param name="scaleFunc">A function that allows for the correction of vector scaling between unknown color formats.</param>
-        /// <typeparam name="TColor2">The pixel format.</typeparam>
-        /// <returns>The <see cref="Image{TColor2}"/></returns>
-        public Image<TColor2> To<TColor2>(Func<Vector4, Vector4> scaleFunc = null)
-            where TColor2 : struct, IPixel<TColor2>
+        /// <typeparam name="TPixel2">The pixel format.</typeparam>
+        /// <returns>The <see cref="Image{TPixel2}"/></returns>
+        public Image<TPixel2> To<TPixel2>(Func<Vector4, Vector4> scaleFunc = null)
+            where TPixel2 : struct, IPixel<TPixel2>
         {
-            scaleFunc = PackedPixelConverterHelper.ComputeScaleFunction<TColor, TColor2>(scaleFunc);
+            scaleFunc = PackedPixelConverterHelper.ComputeScaleFunction<TPixel, TPixel2>(scaleFunc);
 
-            Image<TColor2> target = new Image<TColor2>(this.Width, this.Height, this.Configuration);
+            Image<TPixel2> target = new Image<TPixel2>(this.Width, this.Height, this.Configuration);
             target.CopyProperties(this);
 
-            using (PixelAccessor<TColor> pixels = this.Lock())
-            using (PixelAccessor<TColor2> targetPixels = target.Lock())
+            using (PixelAccessor<TPixel> pixels = this.Lock())
+            using (PixelAccessor<TPixel2> targetPixels = target.Lock())
             {
                 Parallel.For(
                     0,
@@ -375,7 +374,7 @@ namespace ImageSharp
                         {
                             for (int x = 0; x < target.Width; x++)
                             {
-                                TColor2 color = default(TColor2);
+                                TPixel2 color = default(TPixel2);
                                 color.PackFromVector4(scaleFunc(pixels[x, y].ToVector4()));
                                 targetPixels[x, y] = color;
                             }
@@ -384,19 +383,19 @@ namespace ImageSharp
 
             for (int i = 0; i < this.Frames.Count; i++)
             {
-                target.Frames.Add(this.Frames[i].To<TColor2>());
+                target.Frames.Add(this.Frames[i].To<TPixel2>());
             }
 
             return target;
         }
 
         /// <summary>
-        /// Creates a new <see cref="ImageFrame{TColor}"/> from this instance
+        /// Creates a new <see cref="ImageFrame{TPixel}"/> from this instance
         /// </summary>
-        /// <returns>The <see cref="ImageFrame{TColor}"/></returns>
-        internal virtual ImageFrame<TColor> ToFrame()
+        /// <returns>The <see cref="ImageFrame{TPixel}"/></returns>
+        internal virtual ImageFrame<TPixel> ToFrame()
         {
-            return new ImageFrame<TColor>(this);
+            return new ImageFrame<TPixel>(this);
         }
 
         /// <inheritdoc />
diff --git a/src/ImageSharp/Image/PixelAccessor{TColor}.cs b/src/ImageSharp/Image/PixelAccessor{TPixel}.cs
similarity index 87%
rename from src/ImageSharp/Image/PixelAccessor{TColor}.cs
rename to src/ImageSharp/Image/PixelAccessor{TPixel}.cs
index fb3613adf4..3c67638869 100644
--- a/src/ImageSharp/Image/PixelAccessor{TColor}.cs
+++ b/src/ImageSharp/Image/PixelAccessor{TPixel}.cs
@@ -1,4 +1,4 @@
-// <copyright file="PixelAccessor{TColor}.cs" company="James Jackson-South">
+// <copyright file="PixelAccessor{TPixel}.cs" company="James Jackson-South">
 // Copyright (c) James Jackson-South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
@@ -8,15 +8,15 @@ namespace ImageSharp
     using System;
     using System.Diagnostics;
     using System.Runtime.CompilerServices;
-    using System.Runtime.InteropServices;
     using System.Threading.Tasks;
+    using ImageSharp.PixelFormats;
 
     /// <summary>
-    /// Provides per-pixel access to generic <see cref="Image{TColor}"/> pixels.
+    /// Provides per-pixel access to generic <see cref="Image{TPixel}"/> pixels.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    public sealed class PixelAccessor<TColor> : IDisposable, IBuffer2D<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    public sealed class PixelAccessor<TPixel> : IDisposable, IBuffer2D<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
         /// A value indicating whether this instance of the given entity has been disposed.
@@ -32,13 +32,13 @@ namespace ImageSharp
         /// <summary>
         /// The <see cref="Buffer{T}"/> containing the pixel data.
         /// </summary>
-        private Buffer2D<TColor> pixelBuffer;
+        private Buffer2D<TPixel> pixelBuffer;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="PixelAccessor{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="PixelAccessor{TPixel}"/> class.
         /// </summary>
         /// <param name="image">The image to provide pixel access for.</param>
-        public PixelAccessor(ImageBase<TColor> image)
+        public PixelAccessor(ImageBase<TPixel> image)
         {
             Guard.NotNull(image, nameof(image));
             Guard.MustBeGreaterThan(image.Width, 0, "image width");
@@ -49,22 +49,22 @@ namespace ImageSharp
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="PixelAccessor{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="PixelAccessor{TPixel}"/> class.
         /// </summary>
         /// <param name="width">The width of the image represented by the pixel buffer.</param>
         /// <param name="height">The height of the image represented by the pixel buffer.</param>
         public PixelAccessor(int width, int height)
-            : this(width, height, Buffer2D<TColor>.CreateClean(width, height))
+            : this(width, height, Buffer2D<TPixel>.CreateClean(width, height))
         {
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="PixelAccessor{TColor}" /> class.
+        /// Initializes a new instance of the <see cref="PixelAccessor{TPixel}" /> class.
         /// </summary>
         /// <param name="width">The width of the image represented by the pixel buffer.</param>
         /// <param name="height">The height of the image represented by the pixel buffer.</param>
         /// <param name="pixels">The pixel buffer.</param>
-        private PixelAccessor(int width, int height, Buffer2D<TColor> pixels)
+        private PixelAccessor(int width, int height, Buffer2D<TPixel> pixels)
         {
             Guard.NotNull(pixels, nameof(pixels));
             Guard.MustBeGreaterThan(width, 0, nameof(width));
@@ -76,7 +76,7 @@ namespace ImageSharp
         }
 
         /// <summary>
-        /// Finalizes an instance of the <see cref="PixelAccessor{TColor}"/> class.
+        /// Finalizes an instance of the <see cref="PixelAccessor{TPixel}"/> class.
         /// </summary>
         ~PixelAccessor()
         {
@@ -86,7 +86,7 @@ namespace ImageSharp
         /// <summary>
         /// Gets the pixel buffer array.
         /// </summary>
-        public TColor[] PixelArray => this.pixelBuffer.Array;
+        public TPixel[] PixelArray => this.pixelBuffer.Array;
 
         /// <summary>
         /// Gets the size of a single pixel in the number of bytes.
@@ -114,17 +114,17 @@ namespace ImageSharp
         public ParallelOptions ParallelOptions { get; }
 
         /// <inheritdoc />
-        BufferSpan<TColor> IBuffer2D<TColor>.Span => this.pixelBuffer;
+        BufferSpan<TPixel> IBuffer2D<TPixel>.Span => this.pixelBuffer;
 
-        private static BulkPixelOperations<TColor> Operations => BulkPixelOperations<TColor>.Instance;
+        private static BulkPixelOperations<TPixel> Operations => BulkPixelOperations<TPixel>.Instance;
 
         /// <summary>
         /// Gets or sets the pixel at the specified position.
         /// </summary>
         /// <param name="x">The x-coordinate of the pixel. Must be greater than or equal to zero and less than the width of the image.</param>
         /// <param name="y">The y-coordinate of the pixel. Must be greater than or equal to zero and less than the height of the image.</param>
-        /// <returns>The <see typeparam="TColor"/> at the specified position.</returns>
-        public TColor this[int x, int y]
+        /// <returns>The <see typeparam="TPixel"/> at the specified position.</returns>
+        public TPixel this[int x, int y]
         {
             get
             {
@@ -179,7 +179,7 @@ namespace ImageSharp
         /// <exception cref="NotSupportedException">
         /// Thrown when an unsupported component order value is passed.
         /// </exception>
-        internal void CopyFrom(PixelArea<TColor> area, int targetY, int targetX = 0)
+        internal void CopyFrom(PixelArea<TPixel> area, int targetY, int targetX = 0)
         {
             this.CheckCoordinates(area, targetX, targetY);
 
@@ -195,7 +195,7 @@ namespace ImageSharp
         /// <exception cref="NotSupportedException">
         /// Thrown when an unsupported component order value is passed.
         /// </exception>
-        internal void CopyTo(PixelArea<TColor> area, int sourceY, int sourceX = 0)
+        internal void CopyTo(PixelArea<TPixel> area, int sourceY, int sourceX = 0)
         {
             this.CheckCoordinates(area, sourceX, sourceY);
 
@@ -212,7 +212,7 @@ namespace ImageSharp
         /// <exception cref="NotSupportedException">
         /// Thrown when an unsupported component order value is passed.
         /// </exception>
-        internal void SafeCopyTo(PixelArea<TColor> area, int sourceY, int sourceX = 0)
+        internal void SafeCopyTo(PixelArea<TPixel> area, int sourceY, int sourceX = 0)
         {
             int width = Math.Min(area.Width, this.Width - sourceX);
             if (width < 1)
@@ -237,18 +237,18 @@ namespace ImageSharp
         /// <param name="pixels">The pixels.</param>
         /// <returns>Returns the old pixel data thats has gust been replaced.</returns>
         /// <remarks>If <see cref="M:PixelAccessor.PooledMemory"/> is true then caller is responsible for ensuring <see cref="M:PixelDataPool.Return()"/> is called.</remarks>
-        internal TColor[] ReturnCurrentPixelsAndReplaceThemInternally(int width, int height, TColor[] pixels)
+        internal TPixel[] ReturnCurrentColorsAndReplaceThemInternally(int width, int height, TPixel[] pixels)
         {
-            TColor[] oldPixels = this.pixelBuffer.TakeArrayOwnership();
+            TPixel[] oldPixels = this.pixelBuffer.TakeArrayOwnership();
             this.SetPixelBufferUnsafe(width, height, pixels);
             return oldPixels;
         }
 
         /// <summary>
-        /// Copies the pixels to another <see cref="PixelAccessor{TColor}"/> of the same size.
+        /// Copies the pixels to another <see cref="PixelAccessor{TPixel}"/> of the same size.
         /// </summary>
         /// <param name="target">The target pixel buffer accessor.</param>
-        internal void CopyTo(PixelAccessor<TColor> target)
+        internal void CopyTo(PixelAccessor<TPixel> target)
         {
             BufferSpan.Copy(this.pixelBuffer.Span, target.pixelBuffer.Span);
         }
@@ -262,12 +262,12 @@ namespace ImageSharp
         /// <param name="width">The width.</param>
         /// <param name="height">The height.</param>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private void CopyFromZyx(PixelArea<TColor> area, int targetX, int targetY, int width, int height)
+        private void CopyFromZyx(PixelArea<TPixel> area, int targetX, int targetY, int width, int height)
         {
             for (int y = 0; y < height; y++)
             {
                 BufferSpan<byte> source = area.GetRowSpan(y);
-                BufferSpan<TColor> destination = this.GetRowSpan(targetX, targetY + y);
+                BufferSpan<TPixel> destination = this.GetRowSpan(targetX, targetY + y);
 
                 Operations.PackFromZyxBytes(source, destination, width);
             }
@@ -282,12 +282,12 @@ namespace ImageSharp
         /// <param name="width">The width.</param>
         /// <param name="height">The height.</param>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private void CopyFromZyxw(PixelArea<TColor> area, int targetX, int targetY, int width, int height)
+        private void CopyFromZyxw(PixelArea<TPixel> area, int targetX, int targetY, int width, int height)
         {
             for (int y = 0; y < height; y++)
             {
                 BufferSpan<byte> source = area.GetRowSpan(y);
-                BufferSpan<TColor> destination = this.GetRowSpan(targetX, targetY + y);
+                BufferSpan<TPixel> destination = this.GetRowSpan(targetX, targetY + y);
 
                 Operations.PackFromZyxwBytes(source, destination, width);
             }
@@ -302,12 +302,12 @@ namespace ImageSharp
         /// <param name="width">The width.</param>
         /// <param name="height">The height.</param>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private void CopyFromXyz(PixelArea<TColor> area, int targetX, int targetY, int width, int height)
+        private void CopyFromXyz(PixelArea<TPixel> area, int targetX, int targetY, int width, int height)
         {
             for (int y = 0; y < height; y++)
             {
                 BufferSpan<byte> source = area.GetRowSpan(y);
-                BufferSpan<TColor> destination = this.GetRowSpan(targetX, targetY + y);
+                BufferSpan<TPixel> destination = this.GetRowSpan(targetX, targetY + y);
 
                 Operations.PackFromXyzBytes(source, destination, width);
             }
@@ -322,12 +322,12 @@ namespace ImageSharp
         /// <param name="width">The width.</param>
         /// <param name="height">The height.</param>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private void CopyFromXyzw(PixelArea<TColor> area, int targetX, int targetY, int width, int height)
+        private void CopyFromXyzw(PixelArea<TPixel> area, int targetX, int targetY, int width, int height)
         {
             for (int y = 0; y < height; y++)
             {
                 BufferSpan<byte> source = area.GetRowSpan(y);
-                BufferSpan<TColor> destination = this.GetRowSpan(targetX, targetY + y);
+                BufferSpan<TPixel> destination = this.GetRowSpan(targetX, targetY + y);
                 Operations.PackFromXyzwBytes(source, destination, width);
             }
         }
@@ -341,11 +341,11 @@ namespace ImageSharp
         /// <param name="width">The width.</param>
         /// <param name="height">The height.</param>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private void CopyToZyx(PixelArea<TColor> area, int sourceX, int sourceY, int width, int height)
+        private void CopyToZyx(PixelArea<TPixel> area, int sourceX, int sourceY, int width, int height)
         {
             for (int y = 0; y < height; y++)
             {
-                BufferSpan<TColor> source = this.GetRowSpan(sourceX, sourceY + y);
+                BufferSpan<TPixel> source = this.GetRowSpan(sourceX, sourceY + y);
                 BufferSpan<byte> destination = area.GetRowSpan(y);
                 Operations.ToZyxBytes(source, destination, width);
             }
@@ -360,11 +360,11 @@ namespace ImageSharp
         /// <param name="width">The width.</param>
         /// <param name="height">The height.</param>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private void CopyToZyxw(PixelArea<TColor> area, int sourceX, int sourceY, int width, int height)
+        private void CopyToZyxw(PixelArea<TPixel> area, int sourceX, int sourceY, int width, int height)
         {
             for (int y = 0; y < height; y++)
             {
-                BufferSpan<TColor> source = this.GetRowSpan(sourceX, sourceY + y);
+                BufferSpan<TPixel> source = this.GetRowSpan(sourceX, sourceY + y);
                 BufferSpan<byte> destination = area.GetRowSpan(y);
                 Operations.ToZyxwBytes(source, destination, width);
             }
@@ -379,11 +379,11 @@ namespace ImageSharp
         /// <param name="width">The width.</param>
         /// <param name="height">The height.</param>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private void CopyToXyz(PixelArea<TColor> area, int sourceX, int sourceY, int width, int height)
+        private void CopyToXyz(PixelArea<TPixel> area, int sourceX, int sourceY, int width, int height)
         {
             for (int y = 0; y < height; y++)
             {
-                BufferSpan<TColor> source = this.GetRowSpan(sourceX, sourceY + y);
+                BufferSpan<TPixel> source = this.GetRowSpan(sourceX, sourceY + y);
                 BufferSpan<byte> destination = area.GetRowSpan(y);
                 Operations.ToXyzBytes(source, destination, width);
             }
@@ -398,19 +398,19 @@ namespace ImageSharp
         /// <param name="width">The width.</param>
         /// <param name="height">The height.</param>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private void CopyToXyzw(PixelArea<TColor> area, int sourceX, int sourceY, int width, int height)
+        private void CopyToXyzw(PixelArea<TPixel> area, int sourceX, int sourceY, int width, int height)
         {
             for (int y = 0; y < height; y++)
             {
-                BufferSpan<TColor> source = this.GetRowSpan(sourceX, sourceY + y);
+                BufferSpan<TPixel> source = this.GetRowSpan(sourceX, sourceY + y);
                 BufferSpan<byte> destination = area.GetRowSpan(y);
                 Operations.ToXyzwBytes(source, destination, width);
             }
         }
 
-        private void SetPixelBufferUnsafe(int width, int height, TColor[] pixels)
+        private void SetPixelBufferUnsafe(int width, int height, TPixel[] pixels)
         {
-            this.SetPixelBufferUnsafe(width, height, new Buffer2D<TColor>(pixels, width, height));
+            this.SetPixelBufferUnsafe(width, height, new Buffer2D<TPixel>(pixels, width, height));
         }
 
         /// <summary>
@@ -419,13 +419,13 @@ namespace ImageSharp
         /// <param name="width">The width.</param>
         /// <param name="height">The height.</param>
         /// <param name="pixels">The pixel buffer</param>
-        private void SetPixelBufferUnsafe(int width, int height, Buffer2D<TColor> pixels)
+        private void SetPixelBufferUnsafe(int width, int height, Buffer2D<TPixel> pixels)
         {
             this.pixelBuffer = pixels;
 
             this.Width = width;
             this.Height = height;
-            this.PixelSize = Unsafe.SizeOf<TColor>();
+            this.PixelSize = Unsafe.SizeOf<TPixel>();
             this.RowStride = this.Width * this.PixelSize;
         }
 
@@ -440,7 +440,7 @@ namespace ImageSharp
         /// <exception cref="NotSupportedException">
         /// Thrown when an unsupported component order value is passed.
         /// </exception>
-        private void CopyFrom(PixelArea<TColor> area, int targetX, int targetY, int width, int height)
+        private void CopyFrom(PixelArea<TPixel> area, int targetX, int targetY, int width, int height)
         {
             switch (area.ComponentOrder)
             {
@@ -472,7 +472,7 @@ namespace ImageSharp
         /// <exception cref="NotSupportedException">
         /// Thrown when an unsupported component order value is passed.
         /// </exception>
-        private void CopyTo(PixelArea<TColor> area, int sourceX, int sourceY, int width, int height)
+        private void CopyTo(PixelArea<TPixel> area, int sourceX, int sourceY, int width, int height)
         {
             switch (area.ComponentOrder)
             {
@@ -503,7 +503,7 @@ namespace ImageSharp
         /// Thrown if the dimensions are not within the bounds of the image.
         /// </exception>
         [Conditional("DEBUG")]
-        private void CheckCoordinates(PixelArea<TColor> area, int x, int y)
+        private void CheckCoordinates(PixelArea<TPixel> area, int x, int y)
         {
             int width = Math.Min(area.Width, this.Width - x);
             if (width < 1)
diff --git a/src/ImageSharp/Image/PixelArea{TColor}.cs b/src/ImageSharp/Image/PixelArea{TPixel}.cs
similarity index 94%
rename from src/ImageSharp/Image/PixelArea{TColor}.cs
rename to src/ImageSharp/Image/PixelArea{TPixel}.cs
index 176eb0a160..3dd187768e 100644
--- a/src/ImageSharp/Image/PixelArea{TColor}.cs
+++ b/src/ImageSharp/Image/PixelArea{TPixel}.cs
@@ -1,20 +1,21 @@
-// <copyright file="PixelArea{TColor}.cs" company="James Jackson-South">
+// <copyright file="PixelArea{TPixel}.cs" company="James Jackson-South">
 // Copyright (c) James Jackson-South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
+
 namespace ImageSharp
 {
     using System;
     using System.Diagnostics;
     using System.IO;
-    using System.Runtime.CompilerServices;
+    using ImageSharp.PixelFormats;
 
     /// <summary>
-    /// Represents an area of generic <see cref="Image{TColor}"/> pixels.
+    /// Represents an area of generic <see cref="Image{TPixel}"/> pixels.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    internal sealed class PixelArea<TColor> : IDisposable
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    internal sealed class PixelArea<TPixel> : IDisposable
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
         /// A value indicating whether this instance of the given entity has been disposed.
@@ -33,7 +34,7 @@ namespace ImageSharp
         private Buffer<byte> byteBuffer;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="PixelArea{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="PixelArea{TPixel}"/> class.
         /// </summary>
         /// <param name="width">The width.</param>
         /// <param name="bytes">The bytes.</param>
@@ -47,7 +48,7 @@ namespace ImageSharp
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="PixelArea{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="PixelArea{TPixel}"/> class.
         /// </summary>
         /// <param name="width">The width.</param>
         /// <param name="height">The height.</param>
@@ -70,7 +71,7 @@ namespace ImageSharp
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="PixelArea{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="PixelArea{TPixel}"/> class.
         /// </summary>
         /// <param name="width">The width.</param>
         /// <param name="componentOrder">The component order.</param>
@@ -80,7 +81,7 @@ namespace ImageSharp
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="PixelArea{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="PixelArea{TPixel}"/> class.
         /// </summary>
         /// <param name="width">The width. </param>
         /// <param name="componentOrder">The component order.</param>
@@ -91,7 +92,7 @@ namespace ImageSharp
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="PixelArea{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="PixelArea{TPixel}"/> class.
         /// </summary>
         /// <param name="width">The width.</param>
         /// <param name="height">The height.</param>
@@ -102,7 +103,7 @@ namespace ImageSharp
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="PixelArea{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="PixelArea{TPixel}"/> class.
         /// </summary>
         /// <param name="width">The width.</param>
         /// <param name="height">The height.</param>
diff --git a/src/ImageSharp/ImageProcessor.cs b/src/ImageSharp/ImageProcessor.cs
index 79525a8e83..7b9f745471 100644
--- a/src/ImageSharp/ImageProcessor.cs
+++ b/src/ImageSharp/ImageProcessor.cs
@@ -8,12 +8,14 @@ namespace ImageSharp.Processing
     using System;
     using System.Threading.Tasks;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// Allows the application of processors to images.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    internal abstract class ImageProcessor<TColor> : IImageProcessor<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    internal abstract class ImageProcessor<TPixel> : IImageProcessor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <inheritdoc/>
         public virtual ParallelOptions ParallelOptions { get; set; }
@@ -22,7 +24,7 @@ namespace ImageSharp.Processing
         public virtual bool Compand { get; set; } = false;
 
         /// <inheritdoc/>
-        public void Apply(ImageBase<TColor> source, Rectangle sourceRectangle)
+        public void Apply(ImageBase<TPixel> source, Rectangle sourceRectangle)
         {
             if (this.ParallelOptions == null)
             {
@@ -50,19 +52,19 @@ namespace ImageSharp.Processing
         /// <param name="sourceRectangle">
         /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to draw.
         /// </param>
-        protected virtual void BeforeApply(ImageBase<TColor> source, Rectangle sourceRectangle)
+        protected virtual void BeforeApply(ImageBase<TPixel> source, Rectangle sourceRectangle)
         {
         }
 
         /// <summary>
-        /// Applies the process to the specified portion of the specified <see cref="ImageBase{TColor}"/> at the specified location
+        /// Applies the process to the specified portion of the specified <see cref="ImageBase{TPixel}"/> at the specified location
         /// and with the specified size.
         /// </summary>
         /// <param name="source">The source image. Cannot be null.</param>
         /// <param name="sourceRectangle">
         /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to draw.
         /// </param>
-        protected abstract void OnApply(ImageBase<TColor> source, Rectangle sourceRectangle);
+        protected abstract void OnApply(ImageBase<TPixel> source, Rectangle sourceRectangle);
 
         /// <summary>
         /// This method is called after the process is applied to prepare the processor.
@@ -71,7 +73,7 @@ namespace ImageSharp.Processing
         /// <param name="sourceRectangle">
         /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to draw.
         /// </param>
-        protected virtual void AfterApply(ImageBase<TColor> source, Rectangle sourceRectangle)
+        protected virtual void AfterApply(ImageBase<TPixel> source, Rectangle sourceRectangle)
         {
         }
     }
diff --git a/src/ImageSharp/ImageSharp.csproj b/src/ImageSharp/ImageSharp.csproj
index 303e511d7e..64183d05cc 100644
--- a/src/ImageSharp/ImageSharp.csproj
+++ b/src/ImageSharp/ImageSharp.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Description>A cross-platform library for the processing of image files; written in C#</Description>
     <AssemblyTitle>ImageSharp</AssemblyTitle>
-    <VersionPrefix>1.0.0-alpha6</VersionPrefix>
+    <VersionPrefix>1.0.0-alpha7</VersionPrefix>
     <Authors>James Jackson-South and contributors</Authors>
     <TargetFrameworks>netstandard1.3;netstandard1.1</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
diff --git a/src/ImageSharp/MetaData/Profiles/Exif/ExifProfile.cs b/src/ImageSharp/MetaData/Profiles/Exif/ExifProfile.cs
index c4a94c5ff1..f65c020431 100644
--- a/src/ImageSharp/MetaData/Profiles/Exif/ExifProfile.cs
+++ b/src/ImageSharp/MetaData/Profiles/Exif/ExifProfile.cs
@@ -10,6 +10,8 @@ namespace ImageSharp
     using System.Collections.ObjectModel;
     using System.IO;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// Represents an EXIF profile providing access to the collection of values.
     /// </summary>
@@ -116,12 +118,12 @@ namespace ImageSharp
         /// <summary>
         /// Returns the thumbnail in the EXIF profile when available.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <returns>
-        /// The <see cref="Image{TColor}"/>.
+        /// The <see cref="Image{TPixel}"/>.
         /// </returns>
-        public Image<TColor> CreateThumbnail<TColor>()
-            where TColor : struct, IPixel<TColor>
+        public Image<TPixel> CreateThumbnail<TPixel>()
+            where TPixel : struct, IPixel<TPixel>
         {
             this.InitializeValues();
 
@@ -137,7 +139,7 @@ namespace ImageSharp
 
             using (MemoryStream memStream = new MemoryStream(this.data, this.thumbnailOffset, this.thumbnailLength))
             {
-                return Image.Load<TColor>(memStream);
+                return Image.Load<TPixel>(memStream);
             }
         }
 
diff --git a/src/ImageSharp/Colors/PackedPixel/Alpha8.cs b/src/ImageSharp/PixelFormats/Alpha8.cs
similarity index 98%
rename from src/ImageSharp/Colors/PackedPixel/Alpha8.cs
rename to src/ImageSharp/PixelFormats/Alpha8.cs
index 9a340544cf..5e2fff5d02 100644
--- a/src/ImageSharp/Colors/PackedPixel/Alpha8.cs
+++ b/src/ImageSharp/PixelFormats/Alpha8.cs
@@ -3,14 +3,15 @@
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
-namespace ImageSharp
+namespace ImageSharp.PixelFormats
 {
     using System;
     using System.Numerics;
     using System.Runtime.CompilerServices;
 
     /// <summary>
-    /// Packed pixel type containing a single 8 bit normalized W values ranging from 0 to 1.
+    /// Packed pixel type containing a single 8 bit normalized W values.
+    /// Ranges from &lt;0, 0, 0, 0&gt; to &lt;0, 0, 0, 1&gt; in vector form.
     /// </summary>
     public struct Alpha8 : IPixel<Alpha8>, IPackedVector<byte>
     {
diff --git a/src/ImageSharp/Colors/PackedPixel/Argb32.cs b/src/ImageSharp/PixelFormats/Argb32.cs
similarity index 99%
rename from src/ImageSharp/Colors/PackedPixel/Argb32.cs
rename to src/ImageSharp/PixelFormats/Argb32.cs
index 64255a53b5..a6db505bbc 100644
--- a/src/ImageSharp/Colors/PackedPixel/Argb32.cs
+++ b/src/ImageSharp/PixelFormats/Argb32.cs
@@ -3,15 +3,15 @@
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
-namespace ImageSharp
+namespace ImageSharp.PixelFormats
 {
-    using System;
     using System.Numerics;
     using System.Runtime.CompilerServices;
 
     /// <summary>
     /// Packed pixel type containing four 8-bit unsigned normalized values ranging from 0 to 255.
     /// The color components are stored in alpha, red, green, and blue order.
+    /// Ranges from &lt;0, 0, 0, 0&gt; to &lt;1, 1, 1, 1&gt; in vector form.
     /// </summary>
     /// <remarks>
     /// This struct is fully mutable. This is done (against the guidelines) for the sake of performance,
diff --git a/src/ImageSharp/Colors/PackedPixel/Bgr565.cs b/src/ImageSharp/PixelFormats/Bgr565.cs
similarity index 98%
rename from src/ImageSharp/Colors/PackedPixel/Bgr565.cs
rename to src/ImageSharp/PixelFormats/Bgr565.cs
index 2975d4ad90..a3d8cbcf28 100644
--- a/src/ImageSharp/Colors/PackedPixel/Bgr565.cs
+++ b/src/ImageSharp/PixelFormats/Bgr565.cs
@@ -3,7 +3,7 @@
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
-namespace ImageSharp
+namespace ImageSharp.PixelFormats
 {
     using System;
     using System.Numerics;
@@ -11,6 +11,7 @@ namespace ImageSharp
 
     /// <summary>
     /// Packed pixel type containing unsigned normalized values ranging from 0 to 1. The x and z components use 5 bits, and the y component uses 6 bits.
+    /// Ranges from &lt;0, 0, 0, 1&gt; to &lt;1, 1, 1, 1&gt; in vector form.
     /// </summary>
     public struct Bgr565 : IPixel<Bgr565>, IPackedVector<ushort>
     {
diff --git a/src/ImageSharp/Colors/PackedPixel/Bgra4444.cs b/src/ImageSharp/PixelFormats/Bgra4444.cs
similarity index 98%
rename from src/ImageSharp/Colors/PackedPixel/Bgra4444.cs
rename to src/ImageSharp/PixelFormats/Bgra4444.cs
index 1346a54efc..8d4e9b4f47 100644
--- a/src/ImageSharp/Colors/PackedPixel/Bgra4444.cs
+++ b/src/ImageSharp/PixelFormats/Bgra4444.cs
@@ -3,7 +3,7 @@
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
-namespace ImageSharp
+namespace ImageSharp.PixelFormats
 {
     using System;
     using System.Numerics;
@@ -11,6 +11,7 @@ namespace ImageSharp
 
     /// <summary>
     /// Packed pixel type containing unsigned normalized values, ranging from 0 to 1, using 4 bits each for x, y, z, and w.
+    /// Ranges from &lt;0, 0, 0, 0&gt; to &lt;1, 1, 1, 1&gt; in vector form.
     /// </summary>
     public struct Bgra4444 : IPixel<Bgra4444>, IPackedVector<ushort>
     {
diff --git a/src/ImageSharp/Colors/PackedPixel/Bgra5551.cs b/src/ImageSharp/PixelFormats/Bgra5551.cs
similarity index 99%
rename from src/ImageSharp/Colors/PackedPixel/Bgra5551.cs
rename to src/ImageSharp/PixelFormats/Bgra5551.cs
index 7989804cfb..8ae1cd4304 100644
--- a/src/ImageSharp/Colors/PackedPixel/Bgra5551.cs
+++ b/src/ImageSharp/PixelFormats/Bgra5551.cs
@@ -3,7 +3,7 @@
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
-namespace ImageSharp
+namespace ImageSharp.PixelFormats
 {
     using System;
     using System.Numerics;
diff --git a/src/ImageSharp/Colors/PackedPixel/BulkPixelOperations{TColor}.cs b/src/ImageSharp/PixelFormats/BulkPixelOperations{TPixel}.cs
similarity index 77%
rename from src/ImageSharp/Colors/PackedPixel/BulkPixelOperations{TColor}.cs
rename to src/ImageSharp/PixelFormats/BulkPixelOperations{TPixel}.cs
index db0251703f..9a3d266c13 100644
--- a/src/ImageSharp/Colors/PackedPixel/BulkPixelOperations{TColor}.cs
+++ b/src/ImageSharp/PixelFormats/BulkPixelOperations{TPixel}.cs
@@ -1,25 +1,25 @@
-// <copyright file="BulkPixelOperations{TColor}.cs" company="James Jackson-South">
+// <copyright file="BulkPixelOperations{TPixel}.cs" company="James Jackson-South">
 // Copyright (c) James Jackson-South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
-namespace ImageSharp
+namespace ImageSharp.PixelFormats
 {
     using System.Numerics;
     using System.Runtime.CompilerServices;
 
     /// <summary>
     /// A stateless class implementing Strategy Pattern for batched pixel-data conversion operations
-    /// for pixel buffers of type <typeparamref name="TColor"/>.
+    /// for pixel buffers of type <typeparamref name="TPixel"/>.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    public class BulkPixelOperations<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    public class BulkPixelOperations<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
-        /// Gets the global <see cref="BulkPixelOperations{TColor}"/> instance for the pixel type <typeparamref name="TColor"/>
+        /// Gets the global <see cref="BulkPixelOperations{TPixel}"/> instance for the pixel type <typeparamref name="TPixel"/>
         /// </summary>
-        public static BulkPixelOperations<TColor> Instance { get; } = default(TColor).CreateBulkOperations();
+        public static BulkPixelOperations<TPixel> Instance { get; } = default(TPixel).CreateBulkOperations();
 
         /// <summary>
         /// Bulk version of <see cref="IPixel.PackFromVector4(Vector4)"/>
@@ -27,15 +27,15 @@ namespace ImageSharp
         /// <param name="sourceVectors">The <see cref="BufferSpan{T}"/> to the source vectors.</param>
         /// <param name="destColors">The <see cref="BufferSpan{T}"/> to the destination colors.</param>
         /// <param name="count">The number of pixels to convert.</param>
-        internal virtual void PackFromVector4(BufferSpan<Vector4> sourceVectors, BufferSpan<TColor> destColors, int count)
+        internal virtual void PackFromVector4(BufferSpan<Vector4> sourceVectors, BufferSpan<TPixel> destColors, int count)
         {
             ref Vector4 sourceRef = ref sourceVectors.DangerousGetPinnableReference();
-            ref TColor destRef = ref destColors.DangerousGetPinnableReference();
+            ref TPixel destRef = ref destColors.DangerousGetPinnableReference();
 
             for (int i = 0; i < count; i++)
             {
                 ref Vector4 sp = ref Unsafe.Add(ref sourceRef, i);
-                ref TColor dp = ref Unsafe.Add(ref destRef, i);
+                ref TPixel dp = ref Unsafe.Add(ref destRef, i);
                 dp.PackFromVector4(sp);
             }
         }
@@ -46,14 +46,14 @@ namespace ImageSharp
         /// <param name="sourceColors">The <see cref="BufferSpan{T}"/> to the source colors.</param>
         /// <param name="destVectors">The <see cref="BufferSpan{T}"/> to the destination vectors.</param>
         /// <param name="count">The number of pixels to convert.</param>
-        internal virtual void ToVector4(BufferSpan<TColor> sourceColors, BufferSpan<Vector4> destVectors, int count)
+        internal virtual void ToVector4(BufferSpan<TPixel> sourceColors, BufferSpan<Vector4> destVectors, int count)
         {
-            ref TColor sourceRef = ref sourceColors.DangerousGetPinnableReference();
+            ref TPixel sourceRef = ref sourceColors.DangerousGetPinnableReference();
             ref Vector4 destRef = ref destVectors.DangerousGetPinnableReference();
 
             for (int i = 0; i < count; i++)
             {
-                ref TColor sp = ref Unsafe.Add(ref sourceRef, i);
+                ref TPixel sp = ref Unsafe.Add(ref sourceRef, i);
                 ref Vector4 dp = ref Unsafe.Add(ref destRef, i);
                 dp = sp.ToVector4();
             }
@@ -65,15 +65,15 @@ namespace ImageSharp
         /// <param name="sourceBytes">The <see cref="BufferSpan{T}"/> to the source bytes.</param>
         /// <param name="destColors">The <see cref="BufferSpan{T}"/> to the destination colors.</param>
         /// <param name="count">The number of pixels to convert.</param>
-        internal virtual void PackFromXyzBytes(BufferSpan<byte> sourceBytes, BufferSpan<TColor> destColors, int count)
+        internal virtual void PackFromXyzBytes(BufferSpan<byte> sourceBytes, BufferSpan<TPixel> destColors, int count)
         {
             ref byte sourceRef = ref sourceBytes.DangerousGetPinnableReference();
-            ref TColor destRef = ref destColors.DangerousGetPinnableReference();
+            ref TPixel destRef = ref destColors.DangerousGetPinnableReference();
 
             for (int i = 0; i < count; i++)
             {
                 int i3 = i * 3;
-                ref TColor dp = ref Unsafe.Add(ref destRef, i);
+                ref TPixel dp = ref Unsafe.Add(ref destRef, i);
                 dp.PackFromBytes(
                     Unsafe.Add(ref sourceRef, i3),
                     Unsafe.Add(ref sourceRef, i3 + 1),
@@ -88,14 +88,14 @@ namespace ImageSharp
         /// <param name="sourceColors">The <see cref="BufferSpan{T}"/> to the source colors.</param>
         /// <param name="destBytes">The <see cref="BufferSpan{T}"/> to the destination bytes.</param>
         /// <param name="count">The number of pixels to convert.</param>
-        internal virtual void ToXyzBytes(BufferSpan<TColor> sourceColors, BufferSpan<byte> destBytes, int count)
+        internal virtual void ToXyzBytes(BufferSpan<TPixel> sourceColors, BufferSpan<byte> destBytes, int count)
         {
-            ref TColor sourceRef = ref sourceColors.DangerousGetPinnableReference();
+            ref TPixel sourceRef = ref sourceColors.DangerousGetPinnableReference();
             byte[] dest = destBytes.Array;
 
             for (int i = 0; i < count; i++)
             {
-                ref TColor sp = ref Unsafe.Add(ref sourceRef, i);
+                ref TPixel sp = ref Unsafe.Add(ref sourceRef, i);
                 sp.ToXyzBytes(dest, destBytes.Start + (i * 3));
             }
         }
@@ -106,15 +106,15 @@ namespace ImageSharp
         /// <param name="sourceBytes">The <see cref="BufferSpan{T}"/> to the source bytes.</param>
         /// <param name="destColors">The <see cref="BufferSpan{T}"/> to the destination colors.</param>
         /// <param name="count">The number of pixels to convert.</param>
-        internal virtual void PackFromXyzwBytes(BufferSpan<byte> sourceBytes, BufferSpan<TColor> destColors, int count)
+        internal virtual void PackFromXyzwBytes(BufferSpan<byte> sourceBytes, BufferSpan<TPixel> destColors, int count)
         {
             ref byte sourceRef = ref sourceBytes.DangerousGetPinnableReference();
-            ref TColor destRef = ref destColors.DangerousGetPinnableReference();
+            ref TPixel destRef = ref destColors.DangerousGetPinnableReference();
 
             for (int i = 0; i < count; i++)
             {
                 int i4 = i * 4;
-                ref TColor dp = ref Unsafe.Add(ref destRef, i);
+                ref TPixel dp = ref Unsafe.Add(ref destRef, i);
                 dp.PackFromBytes(
                     Unsafe.Add(ref sourceRef, i4),
                     Unsafe.Add(ref sourceRef, i4 + 1),
@@ -129,14 +129,14 @@ namespace ImageSharp
         /// <param name="sourceColors">The <see cref="BufferSpan{T}"/> to the source colors.</param>
         /// <param name="destBytes">The <see cref="BufferSpan{T}"/> to the destination bytes.</param>
         /// <param name="count">The number of pixels to convert.</param>
-        internal virtual void ToXyzwBytes(BufferSpan<TColor> sourceColors, BufferSpan<byte> destBytes, int count)
+        internal virtual void ToXyzwBytes(BufferSpan<TPixel> sourceColors, BufferSpan<byte> destBytes, int count)
         {
-            ref TColor sourceRef = ref sourceColors.DangerousGetPinnableReference();
+            ref TPixel sourceRef = ref sourceColors.DangerousGetPinnableReference();
             byte[] dest = destBytes.Array;
 
             for (int i = 0; i < count; i++)
             {
-                ref TColor sp = ref Unsafe.Add(ref sourceRef, i);
+                ref TPixel sp = ref Unsafe.Add(ref sourceRef, i);
                 sp.ToXyzwBytes(dest, destBytes.Start + (i * 4));
             }
         }
@@ -147,15 +147,15 @@ namespace ImageSharp
         /// <param name="sourceBytes">The <see cref="BufferSpan{T}"/> to the source bytes.</param>
         /// <param name="destColors">The <see cref="BufferSpan{T}"/> to the destination colors.</param>
         /// <param name="count">The number of pixels to convert.</param>
-        internal virtual void PackFromZyxBytes(BufferSpan<byte> sourceBytes, BufferSpan<TColor> destColors, int count)
+        internal virtual void PackFromZyxBytes(BufferSpan<byte> sourceBytes, BufferSpan<TPixel> destColors, int count)
         {
             ref byte sourceRef = ref sourceBytes.DangerousGetPinnableReference();
-            ref TColor destRef = ref destColors.DangerousGetPinnableReference();
+            ref TPixel destRef = ref destColors.DangerousGetPinnableReference();
 
             for (int i = 0; i < count; i++)
             {
                 int i3 = i * 3;
-                ref TColor dp = ref Unsafe.Add(ref destRef, i);
+                ref TPixel dp = ref Unsafe.Add(ref destRef, i);
                 dp.PackFromBytes(
                     Unsafe.Add(ref sourceRef, i3 + 2),
                     Unsafe.Add(ref sourceRef, i3 + 1),
@@ -170,14 +170,14 @@ namespace ImageSharp
         /// <param name="sourceColors">The <see cref="BufferSpan{T}"/> to the source colors.</param>
         /// <param name="destBytes">The <see cref="BufferSpan{T}"/> to the destination bytes.</param>
         /// <param name="count">The number of pixels to convert.</param>
-        internal virtual void ToZyxBytes(BufferSpan<TColor> sourceColors, BufferSpan<byte> destBytes, int count)
+        internal virtual void ToZyxBytes(BufferSpan<TPixel> sourceColors, BufferSpan<byte> destBytes, int count)
         {
-            ref TColor sourceRef = ref sourceColors.DangerousGetPinnableReference();
+            ref TPixel sourceRef = ref sourceColors.DangerousGetPinnableReference();
             byte[] dest = destBytes.Array;
 
             for (int i = 0; i < count; i++)
             {
-                ref TColor sp = ref Unsafe.Add(ref sourceRef, i);
+                ref TPixel sp = ref Unsafe.Add(ref sourceRef, i);
                 sp.ToZyxBytes(dest, destBytes.Start + (i * 3));
             }
         }
@@ -188,15 +188,15 @@ namespace ImageSharp
         /// <param name="sourceBytes">The <see cref="BufferSpan{T}"/> to the source bytes.</param>
         /// <param name="destColors">The <see cref="BufferSpan{T}"/> to the destination colors.</param>
         /// <param name="count">The number of pixels to convert.</param>
-        internal virtual void PackFromZyxwBytes(BufferSpan<byte> sourceBytes, BufferSpan<TColor> destColors, int count)
+        internal virtual void PackFromZyxwBytes(BufferSpan<byte> sourceBytes, BufferSpan<TPixel> destColors, int count)
         {
             ref byte sourceRef = ref sourceBytes.DangerousGetPinnableReference();
-            ref TColor destRef = ref destColors.DangerousGetPinnableReference();
+            ref TPixel destRef = ref destColors.DangerousGetPinnableReference();
 
             for (int i = 0; i < count; i++)
             {
                 int i4 = i * 4;
-                ref TColor dp = ref Unsafe.Add(ref destRef, i);
+                ref TPixel dp = ref Unsafe.Add(ref destRef, i);
                 dp.PackFromBytes(
                     Unsafe.Add(ref sourceRef, i4 + 2),
                     Unsafe.Add(ref sourceRef, i4 + 1),
@@ -211,14 +211,14 @@ namespace ImageSharp
         /// <param name="sourceColors">The <see cref="BufferSpan{T}"/> to the source colors.</param>
         /// <param name="destBytes">The <see cref="BufferSpan{T}"/> to the destination bytes.</param>
         /// <param name="count">The number of pixels to convert.</param>
-        internal virtual void ToZyxwBytes(BufferSpan<TColor> sourceColors, BufferSpan<byte> destBytes, int count)
+        internal virtual void ToZyxwBytes(BufferSpan<TPixel> sourceColors, BufferSpan<byte> destBytes, int count)
         {
-            ref TColor sourceRef = ref sourceColors.DangerousGetPinnableReference();
+            ref TPixel sourceRef = ref sourceColors.DangerousGetPinnableReference();
             byte[] dest = destBytes.Array;
 
             for (int i = 0; i < count; i++)
             {
-                ref TColor sp = ref Unsafe.Add(ref sourceRef, i);
+                ref TPixel sp = ref Unsafe.Add(ref sourceRef, i);
                 sp.ToZyxwBytes(dest, destBytes.Start + (i * 4));
             }
         }
diff --git a/src/ImageSharp/Colors/PackedPixel/Byte4.cs b/src/ImageSharp/PixelFormats/Byte4.cs
similarity index 98%
rename from src/ImageSharp/Colors/PackedPixel/Byte4.cs
rename to src/ImageSharp/PixelFormats/Byte4.cs
index 11ec5eaf4b..acb73dd1c0 100644
--- a/src/ImageSharp/Colors/PackedPixel/Byte4.cs
+++ b/src/ImageSharp/PixelFormats/Byte4.cs
@@ -3,7 +3,7 @@
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
-namespace ImageSharp
+namespace ImageSharp.PixelFormats
 {
     using System;
     using System.Numerics;
@@ -11,6 +11,7 @@ namespace ImageSharp
 
     /// <summary>
     /// Packed pixel type containing four 8-bit unsigned integer values, ranging from 0 to 255.
+    /// Ranges from &lt;0, 0, 0, 0&gt; to &lt;1, 1, 1, 1&gt; in vector form.
     /// </summary>
     public struct Byte4 : IPixel<Byte4>, IPackedVector<uint>
     {
diff --git a/src/ImageSharp/Colors/ColorBuilder{TColor}.cs b/src/ImageSharp/PixelFormats/ColorBuilder{TPixel}.cs
similarity index 77%
rename from src/ImageSharp/Colors/ColorBuilder{TColor}.cs
rename to src/ImageSharp/PixelFormats/ColorBuilder{TPixel}.cs
index f60b5c8c09..4b21130c0d 100644
--- a/src/ImageSharp/Colors/ColorBuilder{TColor}.cs
+++ b/src/ImageSharp/PixelFormats/ColorBuilder{TPixel}.cs
@@ -1,9 +1,9 @@
-// <copyright file="ColorBuilder{TColor}.cs" company="James Jackson-South">
+// <copyright file="ColorBuilder{TPixel}.cs" company="James Jackson-South">
 // Copyright (c) James Jackson-South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
-namespace ImageSharp
+namespace ImageSharp.PixelFormats
 {
     using System;
     using System.Globalization;
@@ -11,19 +11,19 @@ namespace ImageSharp
     /// <summary>
     /// A set of named colors mapped to the provided Color space.
     /// </summary>
-    /// <typeparam name="TColor">The type of the color.</typeparam>
-    public static class ColorBuilder<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The type of the color.</typeparam>
+    public static class ColorBuilder<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
-        /// Creates a new <typeparamref name="TColor"/> representation from the string representing a color.
+        /// Creates a new <typeparamref name="TPixel"/> representation from the string representing a color.
         /// </summary>
         /// <param name="hex">
         /// The hexadecimal representation of the combined color components arranged
         /// in rgb, rgba, rrggbb, or rrggbbaa format to match web syntax.
         /// </param>
-        /// <returns>Returns a <typeparamref name="TColor"/> that represents the color defined by the provided RGBA heax string.</returns>
-        public static TColor FromHex(string hex)
+        /// <returns>Returns a <typeparamref name="TPixel"/> that represents the color defined by the provided RGBA heax string.</returns>
+        public static TPixel FromHex(string hex)
         {
             Guard.NotNullOrEmpty(hex, nameof(hex));
 
@@ -34,7 +34,7 @@ namespace ImageSharp
                 throw new ArgumentException("Hexadecimal string is not in the correct format.", nameof(hex));
             }
 
-            TColor result = default(TColor);
+            TPixel result = default(TPixel);
 
             result.PackFromBytes(
                 (byte)(packedValue >> 24),
@@ -45,30 +45,30 @@ namespace ImageSharp
         }
 
         /// <summary>
-        /// Creates a new <typeparamref name="TColor"/> representation from standard RGB bytes with 100% opacity.
+        /// Creates a new <typeparamref name="TPixel"/> representation from standard RGB bytes with 100% opacity.
         /// </summary>
         /// <param name="red">The red intensity.</param>
         /// <param name="green">The green intensity.</param>
         /// <param name="blue">The blue intensity.</param>
-        /// <returns>Returns a <typeparamref name="TColor"/> that represents the color defined by the provided RGB values with 100% opacity.</returns>
-        public static TColor FromRGB(byte red, byte green, byte blue)
+        /// <returns>Returns a <typeparamref name="TPixel"/> that represents the color defined by the provided RGB values with 100% opacity.</returns>
+        public static TPixel FromRGB(byte red, byte green, byte blue)
         {
-            TColor color = default(TColor);
+            TPixel color = default(TPixel);
             color.PackFromBytes(red, green, blue, 255);
             return color;
         }
 
         /// <summary>
-        /// Creates a new <typeparamref name="TColor"/> representation from standard RGBA bytes.
+        /// Creates a new <typeparamref name="TPixel"/> representation from standard RGBA bytes.
         /// </summary>
         /// <param name="red">The red intensity.</param>
         /// <param name="green">The green intensity.</param>
         /// <param name="blue">The blue intensity.</param>
         /// <param name="alpha">The alpha intensity.</param>
-        /// <returns>Returns a <typeparamref name="TColor"/> that represents the color defined by the provided RGBA values.</returns>
-        public static TColor FromRGBA(byte red, byte green, byte blue, byte alpha)
+        /// <returns>Returns a <typeparamref name="TPixel"/> that represents the color defined by the provided RGBA values.</returns>
+        public static TPixel FromRGBA(byte red, byte green, byte blue, byte alpha)
         {
-            TColor color = default(TColor);
+            TPixel color = default(TPixel);
             color.PackFromBytes(red, green, blue, alpha);
             return color;
         }
diff --git a/src/ImageSharp/PixelFormats/ColorConstants.cs b/src/ImageSharp/PixelFormats/ColorConstants.cs
new file mode 100644
index 0000000000..236d3a889e
--- /dev/null
+++ b/src/ImageSharp/PixelFormats/ColorConstants.cs
@@ -0,0 +1,179 @@
+// <copyright file="ColorConstants.cs" company="James Jackson-South">
+// Copyright (c) James Jackson-South and contributors.
+// Licensed under the Apache License, Version 2.0.
+// </copyright>
+
+namespace ImageSharp.PixelFormats
+{
+    using System;
+    using System.Collections.Generic;
+
+    /// <summary>
+    /// Provides useful color definitions.
+    /// </summary>
+    public static class ColorConstants
+    {
+        /// <summary>
+        /// Provides a lazy, one time method of returning the colors.
+        /// </summary>
+        private static readonly Lazy<Rgba32[]> SafeColors = new Lazy<Rgba32[]>(GetWebSafeColors);
+
+        /// <summary>
+        /// Gets a collection of named, web safe, colors as defined in the CSS Color Module Level 4.
+        /// </summary>
+        public static Rgba32[] WebSafeColors => SafeColors.Value;
+
+        /// <summary>
+        /// Returns an array of web safe colors.
+        /// </summary>
+        /// <returns>The <see cref="T:Color[]"/></returns>
+        private static Rgba32[] GetWebSafeColors()
+        {
+            return new List<Rgba32>
+            {
+                Rgba32.AliceBlue,
+                Rgba32.AntiqueWhite,
+                Rgba32.Aqua,
+                Rgba32.Aquamarine,
+                Rgba32.Azure,
+                Rgba32.Beige,
+                Rgba32.Bisque,
+                Rgba32.Black,
+                Rgba32.BlanchedAlmond,
+                Rgba32.Blue,
+                Rgba32.BlueViolet,
+                Rgba32.Brown,
+                Rgba32.BurlyWood,
+                Rgba32.CadetBlue,
+                Rgba32.Chartreuse,
+                Rgba32.Chocolate,
+                Rgba32.Coral,
+                Rgba32.CornflowerBlue,
+                Rgba32.Cornsilk,
+                Rgba32.Crimson,
+                Rgba32.Cyan,
+                Rgba32.DarkBlue,
+                Rgba32.DarkCyan,
+                Rgba32.DarkGoldenrod,
+                Rgba32.DarkGray,
+                Rgba32.DarkGreen,
+                Rgba32.DarkKhaki,
+                Rgba32.DarkMagenta,
+                Rgba32.DarkOliveGreen,
+                Rgba32.DarkOrange,
+                Rgba32.DarkOrchid,
+                Rgba32.DarkRed,
+                Rgba32.DarkSalmon,
+                Rgba32.DarkSeaGreen,
+                Rgba32.DarkSlateBlue,
+                Rgba32.DarkSlateGray,
+                Rgba32.DarkTurquoise,
+                Rgba32.DarkViolet,
+                Rgba32.DeepPink,
+                Rgba32.DeepSkyBlue,
+                Rgba32.DimGray,
+                Rgba32.DodgerBlue,
+                Rgba32.Firebrick,
+                Rgba32.FloralWhite,
+                Rgba32.ForestGreen,
+                Rgba32.Fuchsia,
+                Rgba32.Gainsboro,
+                Rgba32.GhostWhite,
+                Rgba32.Gold,
+                Rgba32.Goldenrod,
+                Rgba32.Gray,
+                Rgba32.Green,
+                Rgba32.GreenYellow,
+                Rgba32.Honeydew,
+                Rgba32.HotPink,
+                Rgba32.IndianRed,
+                Rgba32.Indigo,
+                Rgba32.Ivory,
+                Rgba32.Khaki,
+                Rgba32.Lavender,
+                Rgba32.LavenderBlush,
+                Rgba32.LawnGreen,
+                Rgba32.LemonChiffon,
+                Rgba32.LightBlue,
+                Rgba32.LightCoral,
+                Rgba32.LightCyan,
+                Rgba32.LightGoldenrodYellow,
+                Rgba32.LightGray,
+                Rgba32.LightGreen,
+                Rgba32.LightPink,
+                Rgba32.LightSalmon,
+                Rgba32.LightSeaGreen,
+                Rgba32.LightSkyBlue,
+                Rgba32.LightSlateGray,
+                Rgba32.LightSteelBlue,
+                Rgba32.LightYellow,
+                Rgba32.Lime,
+                Rgba32.LimeGreen,
+                Rgba32.Linen,
+                Rgba32.Magenta,
+                Rgba32.Maroon,
+                Rgba32.MediumAquamarine,
+                Rgba32.MediumBlue,
+                Rgba32.MediumOrchid,
+                Rgba32.MediumPurple,
+                Rgba32.MediumSeaGreen,
+                Rgba32.MediumSlateBlue,
+                Rgba32.MediumSpringGreen,
+                Rgba32.MediumTurquoise,
+                Rgba32.MediumVioletRed,
+                Rgba32.MidnightBlue,
+                Rgba32.MintCream,
+                Rgba32.MistyRose,
+                Rgba32.Moccasin,
+                Rgba32.NavajoWhite,
+                Rgba32.Navy,
+                Rgba32.OldLace,
+                Rgba32.Olive,
+                Rgba32.OliveDrab,
+                Rgba32.Orange,
+                Rgba32.OrangeRed,
+                Rgba32.Orchid,
+                Rgba32.PaleGoldenrod,
+                Rgba32.PaleGreen,
+                Rgba32.PaleTurquoise,
+                Rgba32.PaleVioletRed,
+                Rgba32.PapayaWhip,
+                Rgba32.PeachPuff,
+                Rgba32.Peru,
+                Rgba32.Pink,
+                Rgba32.Plum,
+                Rgba32.PowderBlue,
+                Rgba32.Purple,
+                Rgba32.RebeccaPurple,
+                Rgba32.Red,
+                Rgba32.RosyBrown,
+                Rgba32.RoyalBlue,
+                Rgba32.SaddleBrown,
+                Rgba32.Salmon,
+                Rgba32.SandyBrown,
+                Rgba32.SeaGreen,
+                Rgba32.SeaShell,
+                Rgba32.Sienna,
+                Rgba32.Silver,
+                Rgba32.SkyBlue,
+                Rgba32.SlateBlue,
+                Rgba32.SlateGray,
+                Rgba32.Snow,
+                Rgba32.SpringGreen,
+                Rgba32.SteelBlue,
+                Rgba32.Tan,
+                Rgba32.Teal,
+                Rgba32.Thistle,
+                Rgba32.Tomato,
+                Rgba32.Transparent,
+                Rgba32.Turquoise,
+                Rgba32.Violet,
+                Rgba32.Wheat,
+                Rgba32.White,
+                Rgba32.WhiteSmoke,
+                Rgba32.Yellow,
+                Rgba32.YellowGreen
+            }.ToArray();
+        }
+    }
+}
diff --git a/src/ImageSharp/Colors/ComponentOrder.cs b/src/ImageSharp/PixelFormats/ComponentOrder.cs
similarity index 88%
rename from src/ImageSharp/Colors/ComponentOrder.cs
rename to src/ImageSharp/PixelFormats/ComponentOrder.cs
index 03fa3bbf81..8f151b41d6 100644
--- a/src/ImageSharp/Colors/ComponentOrder.cs
+++ b/src/ImageSharp/PixelFormats/ComponentOrder.cs
@@ -3,7 +3,7 @@
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
-namespace ImageSharp
+namespace ImageSharp.PixelFormats
 {
     /// <summary>
     /// Enumerates the various component orders.
@@ -11,22 +11,22 @@ namespace ImageSharp
     public enum ComponentOrder
     {
         /// <summary>
-        /// Z-> Y-> X order. Equivalent to B-> G-> R in <see cref="Color"/>
+        /// Z-> Y-> X order. Equivalent to B-> G-> R in <see cref="Rgba32"/>
         /// </summary>
         Zyx,
 
         /// <summary>
-        /// Z-> Y-> X-> W order. Equivalent to B-> G-> R-> A in <see cref="Color"/>
+        /// Z-> Y-> X-> W order. Equivalent to B-> G-> R-> A in <see cref="Rgba32"/>
         /// </summary>
         Zyxw,
 
         /// <summary>
-        /// X-> Y-> Z order. Equivalent to R-> G-> B in <see cref="Color"/>
+        /// X-> Y-> Z order. Equivalent to R-> G-> B in <see cref="Rgba32"/>
         /// </summary>
         Xyz,
 
         /// <summary>
-        /// X-> Y-> Z-> W order. Equivalent to R-> G-> B-> A in <see cref="Color"/>
+        /// X-> Y-> Z-> W order. Equivalent to R-> G-> B-> A in <see cref="Rgba32"/>
         /// </summary>
         Xyzw,
     }
diff --git a/src/ImageSharp/Colors/PackedPixel/HalfSingle.cs b/src/ImageSharp/PixelFormats/HalfSingle.cs
similarity index 98%
rename from src/ImageSharp/Colors/PackedPixel/HalfSingle.cs
rename to src/ImageSharp/PixelFormats/HalfSingle.cs
index 4c785a8636..893667fc78 100644
--- a/src/ImageSharp/Colors/PackedPixel/HalfSingle.cs
+++ b/src/ImageSharp/PixelFormats/HalfSingle.cs
@@ -3,14 +3,14 @@
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
-namespace ImageSharp
+namespace ImageSharp.PixelFormats
 {
-    using System;
     using System.Numerics;
     using System.Runtime.CompilerServices;
 
     /// <summary>
     /// Packed pixel type containing a single 16 bit floating point value.
+    /// Ranges from &lt;0, 0, 0, 1&gt; to &lt;1, 0, 0, 1&gt; in vector form.
     /// </summary>
     public struct HalfSingle : IPixel<HalfSingle>, IPackedVector<ushort>
     {
diff --git a/src/ImageSharp/Colors/PackedPixel/HalfTypeHelper.cs b/src/ImageSharp/PixelFormats/HalfTypeHelper.cs
similarity index 99%
rename from src/ImageSharp/Colors/PackedPixel/HalfTypeHelper.cs
rename to src/ImageSharp/PixelFormats/HalfTypeHelper.cs
index a19b513230..740795adc6 100644
--- a/src/ImageSharp/Colors/PackedPixel/HalfTypeHelper.cs
+++ b/src/ImageSharp/PixelFormats/HalfTypeHelper.cs
@@ -3,7 +3,7 @@
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
-namespace ImageSharp
+namespace ImageSharp.PixelFormats
 {
     using System.Runtime.CompilerServices;
     using System.Runtime.InteropServices;
diff --git a/src/ImageSharp/Colors/PackedPixel/HalfVector2.cs b/src/ImageSharp/PixelFormats/HalfVector2.cs
similarity index 98%
rename from src/ImageSharp/Colors/PackedPixel/HalfVector2.cs
rename to src/ImageSharp/PixelFormats/HalfVector2.cs
index d06ab6ba07..bd3cda55d0 100644
--- a/src/ImageSharp/Colors/PackedPixel/HalfVector2.cs
+++ b/src/ImageSharp/PixelFormats/HalfVector2.cs
@@ -3,14 +3,14 @@
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
-namespace ImageSharp
+namespace ImageSharp.PixelFormats
 {
-    using System;
     using System.Numerics;
     using System.Runtime.CompilerServices;
 
     /// <summary>
     /// Packed pixel type containing two 16-bit floating-point values.
+    /// Ranges from &lt;0, 0, 0, 1&gt; to &lt;1, 0, 0, 1&gt; in vector form.
     /// </summary>
     public struct HalfVector2 : IPixel<HalfVector2>, IPackedVector<uint>
     {
diff --git a/src/ImageSharp/Colors/PackedPixel/HalfVector4.cs b/src/ImageSharp/PixelFormats/HalfVector4.cs
similarity index 98%
rename from src/ImageSharp/Colors/PackedPixel/HalfVector4.cs
rename to src/ImageSharp/PixelFormats/HalfVector4.cs
index a5fa796e1d..03e4326b70 100644
--- a/src/ImageSharp/Colors/PackedPixel/HalfVector4.cs
+++ b/src/ImageSharp/PixelFormats/HalfVector4.cs
@@ -3,14 +3,14 @@
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
-namespace ImageSharp
+namespace ImageSharp.PixelFormats
 {
-    using System;
     using System.Numerics;
     using System.Runtime.CompilerServices;
 
     /// <summary>
     /// Packed pixel type containing four 16-bit floating-point values.
+    /// Ranges from &lt;0, 0, 0, 0&gt; to &lt;1, 1, 1, 1&gt; in vector form.
     /// </summary>
     public struct HalfVector4 : IPixel<HalfVector4>, IPackedVector<ulong>
     {
diff --git a/src/ImageSharp/Colors/PackedPixel/IPackedVector{TPacked}.cs b/src/ImageSharp/PixelFormats/IPackedVector{TPacked}.cs
similarity index 94%
rename from src/ImageSharp/Colors/PackedPixel/IPackedVector{TPacked}.cs
rename to src/ImageSharp/PixelFormats/IPackedVector{TPacked}.cs
index 0450fb8fba..ec283e6f2a 100644
--- a/src/ImageSharp/Colors/PackedPixel/IPackedVector{TPacked}.cs
+++ b/src/ImageSharp/PixelFormats/IPackedVector{TPacked}.cs
@@ -3,10 +3,9 @@
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
-namespace ImageSharp
+namespace ImageSharp.PixelFormats
 {
     using System;
-    using System.Numerics;
 
     /// <summary>
     /// This interface exists for ensuring signature compatibility to MonoGame and XNA packed color types.
diff --git a/src/ImageSharp/Colors/PackedPixel/IPixel.cs b/src/ImageSharp/PixelFormats/IPixel.cs
similarity index 90%
rename from src/ImageSharp/Colors/PackedPixel/IPixel.cs
rename to src/ImageSharp/PixelFormats/IPixel.cs
index 67e013a422..43fe81e953 100644
--- a/src/ImageSharp/Colors/PackedPixel/IPixel.cs
+++ b/src/ImageSharp/PixelFormats/IPixel.cs
@@ -3,7 +3,7 @@
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
-namespace ImageSharp
+namespace ImageSharp.PixelFormats
 {
     using System;
     using System.Numerics;
@@ -16,10 +16,10 @@ namespace ImageSharp
         where TSelf : struct, IPixel<TSelf>
     {
         /// <summary>
-        /// Creates a <see cref="BulkPixelOperations{TColor}"/> instance for this pixel type.
-        /// This method is not intended to be consumed directly. Use <see cref="BulkPixelOperations{TColor}.Instance"/> instead.
+        /// Creates a <see cref="BulkPixelOperations{TPixel}"/> instance for this pixel type.
+        /// This method is not intended to be consumed directly. Use <see cref="BulkPixelOperations{TPixel}.Instance"/> instead.
         /// </summary>
-        /// <returns>The <see cref="BulkPixelOperations{TColor}"/> instance.</returns>
+        /// <returns>The <see cref="BulkPixelOperations{TPixel}"/> instance.</returns>
         BulkPixelOperations<TSelf> CreateBulkOperations();
     }
 
@@ -52,7 +52,7 @@ namespace ImageSharp
 
         /// <summary>
         /// Expands the packed representation into a given byte array.
-        /// Output is expanded to X-> Y-> Z order. Equivalent to R-> G-> B in <see cref="Color"/>
+        /// Output is expanded to X-> Y-> Z order. Equivalent to R-> G-> B in <see cref="Rgba32"/>
         /// </summary>
         /// <param name="bytes">The bytes to set the color in.</param>
         /// <param name="startIndex">The starting index of the <paramref name="bytes"/>.</param>
@@ -60,7 +60,7 @@ namespace ImageSharp
 
         /// <summary>
         /// Expands the packed representation into a given byte array.
-        /// Output is expanded to X-> Y-> Z-> W order. Equivalent to R-> G-> B-> A in <see cref="Color"/>
+        /// Output is expanded to X-> Y-> Z-> W order. Equivalent to R-> G-> B-> A in <see cref="Rgba32"/>
         /// </summary>
         /// <param name="bytes">The bytes to set the color in.</param>
         /// <param name="startIndex">The starting index of the <paramref name="bytes"/>.</param>
@@ -68,7 +68,7 @@ namespace ImageSharp
 
         /// <summary>
         /// Expands the packed representation into a given byte array.
-        /// Output is expanded to Z-> Y-> X order. Equivalent to B-> G-> R in <see cref="Color"/>
+        /// Output is expanded to Z-> Y-> X order. Equivalent to B-> G-> R in <see cref="Rgba32"/>
         /// </summary>
         /// <param name="bytes">The bytes to set the color in.</param>
         /// <param name="startIndex">The starting index of the <paramref name="bytes"/>.</param>
@@ -76,7 +76,7 @@ namespace ImageSharp
 
         /// <summary>
         /// Expands the packed representation into a given byte array.
-        /// Output is expanded to Z-> Y-> X-> W order. Equivalent to B-> G-> R-> A in <see cref="Color"/>
+        /// Output is expanded to Z-> Y-> X-> W order. Equivalent to B-> G-> R-> A in <see cref="Rgba32"/>
         /// </summary>
         /// <param name="bytes">The bytes to set the color in.</param>
         /// <param name="startIndex">The starting index of the <paramref name="bytes"/>.</param>
diff --git a/src/ImageSharp/PixelFormats/NamedColors{TPixel}.cs b/src/ImageSharp/PixelFormats/NamedColors{TPixel}.cs
new file mode 100644
index 0000000000..0b55dcbf91
--- /dev/null
+++ b/src/ImageSharp/PixelFormats/NamedColors{TPixel}.cs
@@ -0,0 +1,725 @@
+// <copyright file="NamedColors{TPixel}.cs" company="James Jackson-South">
+// Copyright (c) James Jackson-South and contributors.
+// Licensed under the Apache License, Version 2.0.
+// </copyright>
+
+namespace ImageSharp.PixelFormats
+{
+    /// <summary>
+    /// A set of named colors mapped to the provided color space.
+    /// </summary>
+    /// <typeparam name="TPixel">The type of the color.</typeparam>
+    public static class NamedColors<TPixel>
+        where TPixel : struct, IPixel<TPixel>
+    {
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #F0F8FF.
+        /// </summary>
+        public static readonly TPixel AliceBlue = ColorBuilder<TPixel>.FromRGBA(240, 248, 255, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #FAEBD7.
+        /// </summary>
+        public static readonly TPixel AntiqueWhite = ColorBuilder<TPixel>.FromRGBA(250, 235, 215, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #00FFFF.
+        /// </summary>
+        public static readonly TPixel Aqua = ColorBuilder<TPixel>.FromRGBA(0, 255, 255, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #7FFFD4.
+        /// </summary>
+        public static readonly TPixel Aquamarine = ColorBuilder<TPixel>.FromRGBA(127, 255, 212, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #F0FFFF.
+        /// </summary>
+        public static readonly TPixel Azure = ColorBuilder<TPixel>.FromRGBA(240, 255, 255, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #F5F5DC.
+        /// </summary>
+        public static readonly TPixel Beige = ColorBuilder<TPixel>.FromRGBA(245, 245, 220, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #FFE4C4.
+        /// </summary>
+        public static readonly TPixel Bisque = ColorBuilder<TPixel>.FromRGBA(255, 228, 196, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #000000.
+        /// </summary>
+        public static readonly TPixel Black = ColorBuilder<TPixel>.FromRGBA(0, 0, 0, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #FFEBCD.
+        /// </summary>
+        public static readonly TPixel BlanchedAlmond = ColorBuilder<TPixel>.FromRGBA(255, 235, 205, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #0000FF.
+        /// </summary>
+        public static readonly TPixel Blue = ColorBuilder<TPixel>.FromRGBA(0, 0, 255, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #8A2BE2.
+        /// </summary>
+        public static readonly TPixel BlueViolet = ColorBuilder<TPixel>.FromRGBA(138, 43, 226, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #A52A2A.
+        /// </summary>
+        public static readonly TPixel Brown = ColorBuilder<TPixel>.FromRGBA(165, 42, 42, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #DEB887.
+        /// </summary>
+        public static readonly TPixel BurlyWood = ColorBuilder<TPixel>.FromRGBA(222, 184, 135, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #5F9EA0.
+        /// </summary>
+        public static readonly TPixel CadetBlue = ColorBuilder<TPixel>.FromRGBA(95, 158, 160, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #7FFF00.
+        /// </summary>
+        public static readonly TPixel Chartreuse = ColorBuilder<TPixel>.FromRGBA(127, 255, 0, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #D2691E.
+        /// </summary>
+        public static readonly TPixel Chocolate = ColorBuilder<TPixel>.FromRGBA(210, 105, 30, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #FF7F50.
+        /// </summary>
+        public static readonly TPixel Coral = ColorBuilder<TPixel>.FromRGBA(255, 127, 80, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #6495ED.
+        /// </summary>
+        public static readonly TPixel CornflowerBlue = ColorBuilder<TPixel>.FromRGBA(100, 149, 237, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #FFF8DC.
+        /// </summary>
+        public static readonly TPixel Cornsilk = ColorBuilder<TPixel>.FromRGBA(255, 248, 220, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #DC143C.
+        /// </summary>
+        public static readonly TPixel Crimson = ColorBuilder<TPixel>.FromRGBA(220, 20, 60, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #00FFFF.
+        /// </summary>
+        public static readonly TPixel Cyan = ColorBuilder<TPixel>.FromRGBA(0, 255, 255, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #00008B.
+        /// </summary>
+        public static readonly TPixel DarkBlue = ColorBuilder<TPixel>.FromRGBA(0, 0, 139, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #008B8B.
+        /// </summary>
+        public static readonly TPixel DarkCyan = ColorBuilder<TPixel>.FromRGBA(0, 139, 139, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #B8860B.
+        /// </summary>
+        public static readonly TPixel DarkGoldenrod = ColorBuilder<TPixel>.FromRGBA(184, 134, 11, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #A9A9A9.
+        /// </summary>
+        public static readonly TPixel DarkGray = ColorBuilder<TPixel>.FromRGBA(169, 169, 169, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #006400.
+        /// </summary>
+        public static readonly TPixel DarkGreen = ColorBuilder<TPixel>.FromRGBA(0, 100, 0, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #BDB76B.
+        /// </summary>
+        public static readonly TPixel DarkKhaki = ColorBuilder<TPixel>.FromRGBA(189, 183, 107, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #8B008B.
+        /// </summary>
+        public static readonly TPixel DarkMagenta = ColorBuilder<TPixel>.FromRGBA(139, 0, 139, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #556B2F.
+        /// </summary>
+        public static readonly TPixel DarkOliveGreen = ColorBuilder<TPixel>.FromRGBA(85, 107, 47, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #FF8C00.
+        /// </summary>
+        public static readonly TPixel DarkOrange = ColorBuilder<TPixel>.FromRGBA(255, 140, 0, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #9932CC.
+        /// </summary>
+        public static readonly TPixel DarkOrchid = ColorBuilder<TPixel>.FromRGBA(153, 50, 204, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #8B0000.
+        /// </summary>
+        public static readonly TPixel DarkRed = ColorBuilder<TPixel>.FromRGBA(139, 0, 0, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #E9967A.
+        /// </summary>
+        public static readonly TPixel DarkSalmon = ColorBuilder<TPixel>.FromRGBA(233, 150, 122, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #8FBC8B.
+        /// </summary>
+        public static readonly TPixel DarkSeaGreen = ColorBuilder<TPixel>.FromRGBA(143, 188, 139, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #483D8B.
+        /// </summary>
+        public static readonly TPixel DarkSlateBlue = ColorBuilder<TPixel>.FromRGBA(72, 61, 139, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #2F4F4F.
+        /// </summary>
+        public static readonly TPixel DarkSlateGray = ColorBuilder<TPixel>.FromRGBA(47, 79, 79, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #00CED1.
+        /// </summary>
+        public static readonly TPixel DarkTurquoise = ColorBuilder<TPixel>.FromRGBA(0, 206, 209, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #9400D3.
+        /// </summary>
+        public static readonly TPixel DarkViolet = ColorBuilder<TPixel>.FromRGBA(148, 0, 211, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #FF1493.
+        /// </summary>
+        public static readonly TPixel DeepPink = ColorBuilder<TPixel>.FromRGBA(255, 20, 147, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #00BFFF.
+        /// </summary>
+        public static readonly TPixel DeepSkyBlue = ColorBuilder<TPixel>.FromRGBA(0, 191, 255, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #696969.
+        /// </summary>
+        public static readonly TPixel DimGray = ColorBuilder<TPixel>.FromRGBA(105, 105, 105, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #1E90FF.
+        /// </summary>
+        public static readonly TPixel DodgerBlue = ColorBuilder<TPixel>.FromRGBA(30, 144, 255, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #B22222.
+        /// </summary>
+        public static readonly TPixel Firebrick = ColorBuilder<TPixel>.FromRGBA(178, 34, 34, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #FFFAF0.
+        /// </summary>
+        public static readonly TPixel FloralWhite = ColorBuilder<TPixel>.FromRGBA(255, 250, 240, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #228B22.
+        /// </summary>
+        public static readonly TPixel ForestGreen = ColorBuilder<TPixel>.FromRGBA(34, 139, 34, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #FF00FF.
+        /// </summary>
+        public static readonly TPixel Fuchsia = ColorBuilder<TPixel>.FromRGBA(255, 0, 255, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #DCDCDC.
+        /// </summary>
+        public static readonly TPixel Gainsboro = ColorBuilder<TPixel>.FromRGBA(220, 220, 220, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #F8F8FF.
+        /// </summary>
+        public static readonly TPixel GhostWhite = ColorBuilder<TPixel>.FromRGBA(248, 248, 255, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #FFD700.
+        /// </summary>
+        public static readonly TPixel Gold = ColorBuilder<TPixel>.FromRGBA(255, 215, 0, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #DAA520.
+        /// </summary>
+        public static readonly TPixel Goldenrod = ColorBuilder<TPixel>.FromRGBA(218, 165, 32, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #808080.
+        /// </summary>
+        public static readonly TPixel Gray = ColorBuilder<TPixel>.FromRGBA(128, 128, 128, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #008000.
+        /// </summary>
+        public static readonly TPixel Green = ColorBuilder<TPixel>.FromRGBA(0, 128, 0, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #ADFF2F.
+        /// </summary>
+        public static readonly TPixel GreenYellow = ColorBuilder<TPixel>.FromRGBA(173, 255, 47, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #F0FFF0.
+        /// </summary>
+        public static readonly TPixel Honeydew = ColorBuilder<TPixel>.FromRGBA(240, 255, 240, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #FF69B4.
+        /// </summary>
+        public static readonly TPixel HotPink = ColorBuilder<TPixel>.FromRGBA(255, 105, 180, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #CD5C5C.
+        /// </summary>
+        public static readonly TPixel IndianRed = ColorBuilder<TPixel>.FromRGBA(205, 92, 92, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #4B0082.
+        /// </summary>
+        public static readonly TPixel Indigo = ColorBuilder<TPixel>.FromRGBA(75, 0, 130, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #FFFFF0.
+        /// </summary>
+        public static readonly TPixel Ivory = ColorBuilder<TPixel>.FromRGBA(255, 255, 240, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #F0E68C.
+        /// </summary>
+        public static readonly TPixel Khaki = ColorBuilder<TPixel>.FromRGBA(240, 230, 140, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #E6E6FA.
+        /// </summary>
+        public static readonly TPixel Lavender = ColorBuilder<TPixel>.FromRGBA(230, 230, 250, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #FFF0F5.
+        /// </summary>
+        public static readonly TPixel LavenderBlush = ColorBuilder<TPixel>.FromRGBA(255, 240, 245, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #7CFC00.
+        /// </summary>
+        public static readonly TPixel LawnGreen = ColorBuilder<TPixel>.FromRGBA(124, 252, 0, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #FFFACD.
+        /// </summary>
+        public static readonly TPixel LemonChiffon = ColorBuilder<TPixel>.FromRGBA(255, 250, 205, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #ADD8E6.
+        /// </summary>
+        public static readonly TPixel LightBlue = ColorBuilder<TPixel>.FromRGBA(173, 216, 230, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #F08080.
+        /// </summary>
+        public static readonly TPixel LightCoral = ColorBuilder<TPixel>.FromRGBA(240, 128, 128, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #E0FFFF.
+        /// </summary>
+        public static readonly TPixel LightCyan = ColorBuilder<TPixel>.FromRGBA(224, 255, 255, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #FAFAD2.
+        /// </summary>
+        public static readonly TPixel LightGoldenrodYellow = ColorBuilder<TPixel>.FromRGBA(250, 250, 210, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #D3D3D3.
+        /// </summary>
+        public static readonly TPixel LightGray = ColorBuilder<TPixel>.FromRGBA(211, 211, 211, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #90EE90.
+        /// </summary>
+        public static readonly TPixel LightGreen = ColorBuilder<TPixel>.FromRGBA(144, 238, 144, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #FFB6C1.
+        /// </summary>
+        public static readonly TPixel LightPink = ColorBuilder<TPixel>.FromRGBA(255, 182, 193, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #FFA07A.
+        /// </summary>
+        public static readonly TPixel LightSalmon = ColorBuilder<TPixel>.FromRGBA(255, 160, 122, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #20B2AA.
+        /// </summary>
+        public static readonly TPixel LightSeaGreen = ColorBuilder<TPixel>.FromRGBA(32, 178, 170, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #87CEFA.
+        /// </summary>
+        public static readonly TPixel LightSkyBlue = ColorBuilder<TPixel>.FromRGBA(135, 206, 250, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #778899.
+        /// </summary>
+        public static readonly TPixel LightSlateGray = ColorBuilder<TPixel>.FromRGBA(119, 136, 153, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #B0C4DE.
+        /// </summary>
+        public static readonly TPixel LightSteelBlue = ColorBuilder<TPixel>.FromRGBA(176, 196, 222, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #FFFFE0.
+        /// </summary>
+        public static readonly TPixel LightYellow = ColorBuilder<TPixel>.FromRGBA(255, 255, 224, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #00FF00.
+        /// </summary>
+        public static readonly TPixel Lime = ColorBuilder<TPixel>.FromRGBA(0, 255, 0, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #32CD32.
+        /// </summary>
+        public static readonly TPixel LimeGreen = ColorBuilder<TPixel>.FromRGBA(50, 205, 50, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #FAF0E6.
+        /// </summary>
+        public static readonly TPixel Linen = ColorBuilder<TPixel>.FromRGBA(250, 240, 230, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #FF00FF.
+        /// </summary>
+        public static readonly TPixel Magenta = ColorBuilder<TPixel>.FromRGBA(255, 0, 255, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #800000.
+        /// </summary>
+        public static readonly TPixel Maroon = ColorBuilder<TPixel>.FromRGBA(128, 0, 0, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #66CDAA.
+        /// </summary>
+        public static readonly TPixel MediumAquamarine = ColorBuilder<TPixel>.FromRGBA(102, 205, 170, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #0000CD.
+        /// </summary>
+        public static readonly TPixel MediumBlue = ColorBuilder<TPixel>.FromRGBA(0, 0, 205, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #BA55D3.
+        /// </summary>
+        public static readonly TPixel MediumOrchid = ColorBuilder<TPixel>.FromRGBA(186, 85, 211, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #9370DB.
+        /// </summary>
+        public static readonly TPixel MediumPurple = ColorBuilder<TPixel>.FromRGBA(147, 112, 219, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #3CB371.
+        /// </summary>
+        public static readonly TPixel MediumSeaGreen = ColorBuilder<TPixel>.FromRGBA(60, 179, 113, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #7B68EE.
+        /// </summary>
+        public static readonly TPixel MediumSlateBlue = ColorBuilder<TPixel>.FromRGBA(123, 104, 238, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #00FA9A.
+        /// </summary>
+        public static readonly TPixel MediumSpringGreen = ColorBuilder<TPixel>.FromRGBA(0, 250, 154, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #48D1CC.
+        /// </summary>
+        public static readonly TPixel MediumTurquoise = ColorBuilder<TPixel>.FromRGBA(72, 209, 204, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #C71585.
+        /// </summary>
+        public static readonly TPixel MediumVioletRed = ColorBuilder<TPixel>.FromRGBA(199, 21, 133, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #191970.
+        /// </summary>
+        public static readonly TPixel MidnightBlue = ColorBuilder<TPixel>.FromRGBA(25, 25, 112, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #F5FFFA.
+        /// </summary>
+        public static readonly TPixel MintCream = ColorBuilder<TPixel>.FromRGBA(245, 255, 250, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #FFE4E1.
+        /// </summary>
+        public static readonly TPixel MistyRose = ColorBuilder<TPixel>.FromRGBA(255, 228, 225, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #FFE4B5.
+        /// </summary>
+        public static readonly TPixel Moccasin = ColorBuilder<TPixel>.FromRGBA(255, 228, 181, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #FFDEAD.
+        /// </summary>
+        public static readonly TPixel NavajoWhite = ColorBuilder<TPixel>.FromRGBA(255, 222, 173, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #000080.
+        /// </summary>
+        public static readonly TPixel Navy = ColorBuilder<TPixel>.FromRGBA(0, 0, 128, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #FDF5E6.
+        /// </summary>
+        public static readonly TPixel OldLace = ColorBuilder<TPixel>.FromRGBA(253, 245, 230, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #808000.
+        /// </summary>
+        public static readonly TPixel Olive = ColorBuilder<TPixel>.FromRGBA(128, 128, 0, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #6B8E23.
+        /// </summary>
+        public static readonly TPixel OliveDrab = ColorBuilder<TPixel>.FromRGBA(107, 142, 35, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #FFA500.
+        /// </summary>
+        public static readonly TPixel Orange = ColorBuilder<TPixel>.FromRGBA(255, 165, 0, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #FF4500.
+        /// </summary>
+        public static readonly TPixel OrangeRed = ColorBuilder<TPixel>.FromRGBA(255, 69, 0, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #DA70D6.
+        /// </summary>
+        public static readonly TPixel Orchid = ColorBuilder<TPixel>.FromRGBA(218, 112, 214, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #EEE8AA.
+        /// </summary>
+        public static readonly TPixel PaleGoldenrod = ColorBuilder<TPixel>.FromRGBA(238, 232, 170, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #98FB98.
+        /// </summary>
+        public static readonly TPixel PaleGreen = ColorBuilder<TPixel>.FromRGBA(152, 251, 152, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #AFEEEE.
+        /// </summary>
+        public static readonly TPixel PaleTurquoise = ColorBuilder<TPixel>.FromRGBA(175, 238, 238, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #DB7093.
+        /// </summary>
+        public static readonly TPixel PaleVioletRed = ColorBuilder<TPixel>.FromRGBA(219, 112, 147, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #FFEFD5.
+        /// </summary>
+        public static readonly TPixel PapayaWhip = ColorBuilder<TPixel>.FromRGBA(255, 239, 213, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #FFDAB9.
+        /// </summary>
+        public static readonly TPixel PeachPuff = ColorBuilder<TPixel>.FromRGBA(255, 218, 185, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #CD853F.
+        /// </summary>
+        public static readonly TPixel Peru = ColorBuilder<TPixel>.FromRGBA(205, 133, 63, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #FFC0CB.
+        /// </summary>
+        public static readonly TPixel Pink = ColorBuilder<TPixel>.FromRGBA(255, 192, 203, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #DDA0DD.
+        /// </summary>
+        public static readonly TPixel Plum = ColorBuilder<TPixel>.FromRGBA(221, 160, 221, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #B0E0E6.
+        /// </summary>
+        public static readonly TPixel PowderBlue = ColorBuilder<TPixel>.FromRGBA(176, 224, 230, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #800080.
+        /// </summary>
+        public static readonly TPixel Purple = ColorBuilder<TPixel>.FromRGBA(128, 0, 128, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #663399.
+        /// </summary>
+        public static readonly TPixel RebeccaPurple = ColorBuilder<TPixel>.FromRGBA(102, 51, 153, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #FF0000.
+        /// </summary>
+        public static readonly TPixel Red = ColorBuilder<TPixel>.FromRGBA(255, 0, 0, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #BC8F8F.
+        /// </summary>
+        public static readonly TPixel RosyBrown = ColorBuilder<TPixel>.FromRGBA(188, 143, 143, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #4169E1.
+        /// </summary>
+        public static readonly TPixel RoyalBlue = ColorBuilder<TPixel>.FromRGBA(65, 105, 225, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #8B4513.
+        /// </summary>
+        public static readonly TPixel SaddleBrown = ColorBuilder<TPixel>.FromRGBA(139, 69, 19, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #FA8072.
+        /// </summary>
+        public static readonly TPixel Salmon = ColorBuilder<TPixel>.FromRGBA(250, 128, 114, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #F4A460.
+        /// </summary>
+        public static readonly TPixel SandyBrown = ColorBuilder<TPixel>.FromRGBA(244, 164, 96, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #2E8B57.
+        /// </summary>
+        public static readonly TPixel SeaGreen = ColorBuilder<TPixel>.FromRGBA(46, 139, 87, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #FFF5EE.
+        /// </summary>
+        public static readonly TPixel SeaShell = ColorBuilder<TPixel>.FromRGBA(255, 245, 238, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #A0522D.
+        /// </summary>
+        public static readonly TPixel Sienna = ColorBuilder<TPixel>.FromRGBA(160, 82, 45, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #C0C0C0.
+        /// </summary>
+        public static readonly TPixel Silver = ColorBuilder<TPixel>.FromRGBA(192, 192, 192, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #87CEEB.
+        /// </summary>
+        public static readonly TPixel SkyBlue = ColorBuilder<TPixel>.FromRGBA(135, 206, 235, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #6A5ACD.
+        /// </summary>
+        public static readonly TPixel SlateBlue = ColorBuilder<TPixel>.FromRGBA(106, 90, 205, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #708090.
+        /// </summary>
+        public static readonly TPixel SlateGray = ColorBuilder<TPixel>.FromRGBA(112, 128, 144, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #FFFAFA.
+        /// </summary>
+        public static readonly TPixel Snow = ColorBuilder<TPixel>.FromRGBA(255, 250, 250, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #00FF7F.
+        /// </summary>
+        public static readonly TPixel SpringGreen = ColorBuilder<TPixel>.FromRGBA(0, 255, 127, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #4682B4.
+        /// </summary>
+        public static readonly TPixel SteelBlue = ColorBuilder<TPixel>.FromRGBA(70, 130, 180, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #D2B48C.
+        /// </summary>
+        public static readonly TPixel Tan = ColorBuilder<TPixel>.FromRGBA(210, 180, 140, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #008080.
+        /// </summary>
+        public static readonly TPixel Teal = ColorBuilder<TPixel>.FromRGBA(0, 128, 128, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #D8BFD8.
+        /// </summary>
+        public static readonly TPixel Thistle = ColorBuilder<TPixel>.FromRGBA(216, 191, 216, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #FF6347.
+        /// </summary>
+        public static readonly TPixel Tomato = ColorBuilder<TPixel>.FromRGBA(255, 99, 71, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #FFFFFF.
+        /// </summary>
+        public static readonly TPixel Transparent = ColorBuilder<TPixel>.FromRGBA(255, 255, 255, 0);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #40E0D0.
+        /// </summary>
+        public static readonly TPixel Turquoise = ColorBuilder<TPixel>.FromRGBA(64, 224, 208, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #EE82EE.
+        /// </summary>
+        public static readonly TPixel Violet = ColorBuilder<TPixel>.FromRGBA(238, 130, 238, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #F5DEB3.
+        /// </summary>
+        public static readonly TPixel Wheat = ColorBuilder<TPixel>.FromRGBA(245, 222, 179, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #FFFFFF.
+        /// </summary>
+        public static readonly TPixel White = ColorBuilder<TPixel>.FromRGBA(255, 255, 255, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #F5F5F5.
+        /// </summary>
+        public static readonly TPixel WhiteSmoke = ColorBuilder<TPixel>.FromRGBA(245, 245, 245, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #FFFF00.
+        /// </summary>
+        public static readonly TPixel Yellow = ColorBuilder<TPixel>.FromRGBA(255, 255, 0, 255);
+
+        /// <summary>
+        /// Represents a <see paramref="TPixel"/> matching the W3C definition that has an hex value of #9ACD32.
+        /// </summary>
+        public static readonly TPixel YellowGreen = ColorBuilder<TPixel>.FromRGBA(154, 205, 50, 255);
+    }
+}
\ No newline at end of file
diff --git a/src/ImageSharp/Colors/PackedPixel/NormalizedByte2.cs b/src/ImageSharp/PixelFormats/NormalizedByte2.cs
similarity index 98%
rename from src/ImageSharp/Colors/PackedPixel/NormalizedByte2.cs
rename to src/ImageSharp/PixelFormats/NormalizedByte2.cs
index 56be64a86c..dab113ae78 100644
--- a/src/ImageSharp/Colors/PackedPixel/NormalizedByte2.cs
+++ b/src/ImageSharp/PixelFormats/NormalizedByte2.cs
@@ -3,7 +3,7 @@
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
-namespace ImageSharp
+namespace ImageSharp.PixelFormats
 {
     using System;
     using System.Numerics;
@@ -11,6 +11,7 @@ namespace ImageSharp
 
     /// <summary>
     /// Packed packed pixel type containing two 8-bit signed normalized values, ranging from −1 to 1.
+    /// Ranges from &lt;-1, -1, 0, 1&gt; to &lt;1, 1, 0, 1&gt; in vector form.
     /// </summary>
     public struct NormalizedByte2 : IPixel<NormalizedByte2>, IPackedVector<ushort>
     {
diff --git a/src/ImageSharp/Colors/PackedPixel/NormalizedByte4.cs b/src/ImageSharp/PixelFormats/NormalizedByte4.cs
similarity index 98%
rename from src/ImageSharp/Colors/PackedPixel/NormalizedByte4.cs
rename to src/ImageSharp/PixelFormats/NormalizedByte4.cs
index a1f9b8d847..0cb5c756b6 100644
--- a/src/ImageSharp/Colors/PackedPixel/NormalizedByte4.cs
+++ b/src/ImageSharp/PixelFormats/NormalizedByte4.cs
@@ -3,7 +3,7 @@
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
-namespace ImageSharp
+namespace ImageSharp.PixelFormats
 {
     using System;
     using System.Numerics;
@@ -11,6 +11,7 @@ namespace ImageSharp
 
     /// <summary>
     /// Packed pixel type containing four 8-bit signed normalized values, ranging from −1 to 1.
+    /// Ranges from &lt;-1, -1, -1, -1&gt; to &lt;1, 1, 1, 1&gt; in vector form.
     /// </summary>
     public struct NormalizedByte4 : IPixel<NormalizedByte4>, IPackedVector<uint>
     {
diff --git a/src/ImageSharp/Colors/PackedPixel/NormalizedShort2.cs b/src/ImageSharp/PixelFormats/NormalizedShort2.cs
similarity index 98%
rename from src/ImageSharp/Colors/PackedPixel/NormalizedShort2.cs
rename to src/ImageSharp/PixelFormats/NormalizedShort2.cs
index 46c24be6f9..86d80cbad5 100644
--- a/src/ImageSharp/Colors/PackedPixel/NormalizedShort2.cs
+++ b/src/ImageSharp/PixelFormats/NormalizedShort2.cs
@@ -3,14 +3,14 @@
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
-namespace ImageSharp
+namespace ImageSharp.PixelFormats
 {
-    using System;
     using System.Numerics;
     using System.Runtime.CompilerServices;
 
     /// <summary>
     /// Packed pixel type containing two 16-bit signed normalized values, ranging from −1 to 1.
+    /// Ranges from &lt;-1, -1, 0, 1&gt; to &lt;1, 1, 0, 1&gt; in vector form.
     /// </summary>
     public struct NormalizedShort2 : IPixel<NormalizedShort2>, IPackedVector<uint>
     {
diff --git a/src/ImageSharp/Colors/PackedPixel/NormalizedShort4.cs b/src/ImageSharp/PixelFormats/NormalizedShort4.cs
similarity index 98%
rename from src/ImageSharp/Colors/PackedPixel/NormalizedShort4.cs
rename to src/ImageSharp/PixelFormats/NormalizedShort4.cs
index 74229a914f..8512d41316 100644
--- a/src/ImageSharp/Colors/PackedPixel/NormalizedShort4.cs
+++ b/src/ImageSharp/PixelFormats/NormalizedShort4.cs
@@ -3,14 +3,14 @@
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
-namespace ImageSharp
+namespace ImageSharp.PixelFormats
 {
-    using System;
     using System.Numerics;
     using System.Runtime.CompilerServices;
 
     /// <summary>
     /// Packed pixel type containing four 16-bit signed normalized values, ranging from −1 to 1.
+    /// Ranges from &lt;-1, -1, -1, -1&gt; to &lt;1, 1, 1, 1&gt; in vector form.
     /// </summary>
     public struct NormalizedShort4 : IPixel<NormalizedShort4>, IPackedVector<ulong>
     {
diff --git a/src/ImageSharp/Colors/PackedPixel/PackedPixelConverterHelper.cs b/src/ImageSharp/PixelFormats/PackedPixelConverterHelper.cs
similarity index 97%
rename from src/ImageSharp/Colors/PackedPixel/PackedPixelConverterHelper.cs
rename to src/ImageSharp/PixelFormats/PackedPixelConverterHelper.cs
index 13727870cf..29ef5675e7 100644
--- a/src/ImageSharp/Colors/PackedPixel/PackedPixelConverterHelper.cs
+++ b/src/ImageSharp/PixelFormats/PackedPixelConverterHelper.cs
@@ -3,7 +3,7 @@
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
-namespace ImageSharp
+namespace ImageSharp.PixelFormats
 {
     using System;
     using System.Numerics;
@@ -22,10 +22,10 @@ namespace ImageSharp
         /// Returns the correct scaling function for the given types The compute scale function.
         /// </summary>
         /// <param name="scaleFunc">The scale function.</param>
-        /// <typeparam name="TColor">The source pixel format.</typeparam>
-        /// <typeparam name="TColor2">The target pixel format.</typeparam>
+        /// <typeparam name="TPixel">The source pixel format.</typeparam>
+        /// <typeparam name="TPixel2">The target pixel format.</typeparam>
         /// <returns>The <see cref="Func{Vector4,Vector4}"/></returns>
-        public static Func<Vector4, Vector4> ComputeScaleFunction<TColor, TColor2>(Func<Vector4, Vector4> scaleFunc)
+        public static Func<Vector4, Vector4> ComputeScaleFunction<TPixel, TPixel2>(Func<Vector4, Vector4> scaleFunc)
         {
             // Custom type with a custom function.
             if (scaleFunc != null)
@@ -33,8 +33,8 @@ namespace ImageSharp
                 return scaleFunc;
             }
 
-            Type source = typeof(TColor);
-            Type target = typeof(TColor2);
+            Type source = typeof(TPixel);
+            Type target = typeof(TPixel2);
 
             // Normalized standard
             if (IsStandardNormalizedType(source))
@@ -299,7 +299,7 @@ namespace ImageSharp
         /// <returns>The <see cref="bool"/></returns>
         private static bool IsStandardNormalizedType(Type type)
         {
-            return type == typeof(Color)
+            return type == typeof(Rgba32)
                 || type == typeof(Argb32)
                 || type == typeof(Alpha8)
                 || type == typeof(Bgr565)
diff --git a/src/ImageSharp/Colors/PackedPixel/README.md b/src/ImageSharp/PixelFormats/README.md
similarity index 100%
rename from src/ImageSharp/Colors/PackedPixel/README.md
rename to src/ImageSharp/PixelFormats/README.md
diff --git a/src/ImageSharp/Colors/PackedPixel/Rg32.cs b/src/ImageSharp/PixelFormats/Rg32.cs
similarity index 98%
rename from src/ImageSharp/Colors/PackedPixel/Rg32.cs
rename to src/ImageSharp/PixelFormats/Rg32.cs
index f8486f7f29..a4bfc5823e 100644
--- a/src/ImageSharp/Colors/PackedPixel/Rg32.cs
+++ b/src/ImageSharp/PixelFormats/Rg32.cs
@@ -3,7 +3,7 @@
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
-namespace ImageSharp
+namespace ImageSharp.PixelFormats
 {
     using System;
     using System.Numerics;
@@ -11,6 +11,7 @@ namespace ImageSharp
 
     /// <summary>
     /// Packed pixel type containing two 16-bit unsigned normalized values ranging from 0 to 1.
+    /// Ranges from &lt;0, 0, 0, 1&gt; to &lt;1, 1, 0, 1&gt; in vector form.
     /// </summary>
     public struct Rg32 : IPixel<Rg32>, IPackedVector<uint>
     {
diff --git a/src/ImageSharp/Colors/PackedPixel/Rgba1010102.cs b/src/ImageSharp/PixelFormats/Rgba1010102.cs
similarity index 98%
rename from src/ImageSharp/Colors/PackedPixel/Rgba1010102.cs
rename to src/ImageSharp/PixelFormats/Rgba1010102.cs
index 65a5e7a5f6..cfd60f410e 100644
--- a/src/ImageSharp/Colors/PackedPixel/Rgba1010102.cs
+++ b/src/ImageSharp/PixelFormats/Rgba1010102.cs
@@ -3,7 +3,7 @@
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
-namespace ImageSharp
+namespace ImageSharp.PixelFormats
 {
     using System;
     using System.Numerics;
@@ -12,6 +12,7 @@ namespace ImageSharp
     /// <summary>
     /// Packed vector type containing unsigned normalized values ranging from 0 to 1.
     /// The x, y and z components use 10 bits, and the w component uses 2 bits.
+    /// Ranges from &lt;0, 0, 0, 0&gt; to &lt;1, 1, 1, 1&gt; in vector form.
     /// </summary>
     public struct Rgba1010102 : IPixel<Rgba1010102>, IPackedVector<uint>
     {
diff --git a/src/ImageSharp/Colors/Color.BulkOperations.cs b/src/ImageSharp/PixelFormats/Rgba32.BulkOperations.cs
similarity index 73%
rename from src/ImageSharp/Colors/Color.BulkOperations.cs
rename to src/ImageSharp/PixelFormats/Rgba32.BulkOperations.cs
index 2de8222d68..df21cdc701 100644
--- a/src/ImageSharp/Colors/Color.BulkOperations.cs
+++ b/src/ImageSharp/PixelFormats/Rgba32.BulkOperations.cs
@@ -1,29 +1,24 @@
-// <copyright file="Color.BulkOperations.cs" company="James Jackson-South">
+// <copyright file="Rgba32.BulkOperations.cs" company="James Jackson-South">
 // Copyright (c) James Jackson-South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
-namespace ImageSharp
+namespace ImageSharp.PixelFormats
 {
     using System;
     using System.Numerics;
     using System.Runtime.CompilerServices;
     using System.Runtime.InteropServices;
 
-    /// <summary>
-    /// Unpacked pixel type containing four 8-bit unsigned normalized values ranging from 0 to 255.
-    /// The color components are stored in red, green, blue, and alpha order.
-    /// </summary>
-    /// <remarks>
-    /// This struct is fully mutable. This is done (against the guidelines) for the sake of performance,
-    /// as it avoids the need to create new values for modification operations.
-    /// </remarks>
-    public partial struct Color
+    /// <content>
+    /// Provides optimized overrides for bulk operations.
+    /// </content>
+    public partial struct Rgba32
     {
         /// <summary>
-        /// <see cref="BulkPixelOperations{TColor}"/> implementation optimized for <see cref="Color"/>.
+        /// <see cref="BulkPixelOperations{TPixel}"/> implementation optimized for <see cref="Rgba32"/>.
         /// </summary>
-        internal class BulkOperations : BulkPixelOperations<Color>
+        internal class BulkOperations : BulkPixelOperations<Rgba32>
         {
             /// <summary>
             /// SIMD optimized bulk implementation of <see cref="IPixel.PackFromVector4(Vector4)"/>
@@ -42,12 +37,12 @@ namespace ImageSharp
             ///     <cref>https://github.com/dotnet/corefx/issues/15957</cref>
             /// </see>
             /// </remarks>
-            internal static unsafe void ToVector4SimdAligned(BufferSpan<Color> sourceColors, BufferSpan<Vector4> destVectors, int count)
+            internal static unsafe void ToVector4SimdAligned(BufferSpan<Rgba32> sourceColors, BufferSpan<Vector4> destVectors, int count)
             {
                 if (!Vector.IsHardwareAccelerated)
                 {
                     throw new InvalidOperationException(
-                        "Color32.BulkOperations.ToVector4SimdAligned() should not be called when Vector.IsHardwareAccelerated == false!");
+                        "Rgba32.BulkOperations.ToVector4SimdAligned() should not be called when Vector.IsHardwareAccelerated == false!");
                 }
 
                 int vecSize = Vector<uint>.Count;
@@ -64,7 +59,7 @@ namespace ImageSharp
 
                 int unpackedRawCount = count * 4;
 
-                ref uint src = ref Unsafe.As<Color, uint>(ref sourceColors.DangerousGetPinnableReference());
+                ref uint src = ref Unsafe.As<Rgba32, uint>(ref sourceColors.DangerousGetPinnableReference());
 
                 using (Buffer<uint> tempBuf = new Buffer<uint>(
                     unpackedRawCount + Vector<uint>.Count))
@@ -100,7 +95,7 @@ namespace ImageSharp
             }
 
             /// <inheritdoc />
-            internal override void ToVector4(BufferSpan<Color> sourceColors, BufferSpan<Vector4> destVectors, int count)
+            internal override void ToVector4(BufferSpan<Rgba32> sourceColors, BufferSpan<Vector4> destVectors, int count)
             {
                 if (count < 256 || !Vector.IsHardwareAccelerated)
                 {
@@ -127,103 +122,103 @@ namespace ImageSharp
             }
 
             /// <inheritdoc />
-            internal override void PackFromXyzBytes(BufferSpan<byte> sourceBytes, BufferSpan<Color> destColors, int count)
+            internal override void PackFromXyzBytes(BufferSpan<byte> sourceBytes, BufferSpan<Rgba32> destColors, int count)
             {
                 ref RGB24 sourceRef = ref Unsafe.As<byte, RGB24>(ref sourceBytes.DangerousGetPinnableReference());
-                ref Color destRef = ref destColors.DangerousGetPinnableReference();
+                ref Rgba32 destRef = ref destColors.DangerousGetPinnableReference();
 
                 for (int i = 0; i < count; i++)
                 {
                     ref RGB24 sp = ref Unsafe.Add(ref sourceRef, i);
-                    ref Color dp = ref Unsafe.Add(ref destRef, i);
+                    ref Rgba32 dp = ref Unsafe.Add(ref destRef, i);
 
-                    Unsafe.As<Color, RGB24>(ref dp) = sp;
+                    Unsafe.As<Rgba32, RGB24>(ref dp) = sp;
                     dp.A = 255;
                 }
             }
 
             /// <inheritdoc />
-            internal override void ToXyzBytes(BufferSpan<Color> sourceColors, BufferSpan<byte> destBytes, int count)
+            internal override void ToXyzBytes(BufferSpan<Rgba32> sourceColors, BufferSpan<byte> destBytes, int count)
             {
-                ref Color sourceRef = ref sourceColors.DangerousGetPinnableReference();
+                ref Rgba32 sourceRef = ref sourceColors.DangerousGetPinnableReference();
                 ref RGB24 destRef = ref Unsafe.As<byte, RGB24>(ref destBytes.DangerousGetPinnableReference());
 
                 for (int i = 0; i < count; i++)
                 {
-                    ref Color sp = ref Unsafe.Add(ref sourceRef, i);
+                    ref Rgba32 sp = ref Unsafe.Add(ref sourceRef, i);
                     ref RGB24 dp = ref Unsafe.Add(ref destRef, i);
 
-                    dp = Unsafe.As<Color, RGB24>(ref sp);
+                    dp = Unsafe.As<Rgba32, RGB24>(ref sp);
                 }
             }
 
             /// <inheritdoc />
-            internal override unsafe void PackFromXyzwBytes(BufferSpan<byte> sourceBytes, BufferSpan<Color> destColors, int count)
+            internal override unsafe void PackFromXyzwBytes(BufferSpan<byte> sourceBytes, BufferSpan<Rgba32> destColors, int count)
             {
-                BufferSpan.Copy(sourceBytes, destColors.AsBytes(), count * sizeof(Color));
+                BufferSpan.Copy(sourceBytes, destColors.AsBytes(), count * sizeof(Rgba32));
             }
 
             /// <inheritdoc />
-            internal override unsafe void ToXyzwBytes(BufferSpan<Color> sourceColors, BufferSpan<byte> destBytes, int count)
+            internal override unsafe void ToXyzwBytes(BufferSpan<Rgba32> sourceColors, BufferSpan<byte> destBytes, int count)
             {
-                BufferSpan.Copy(sourceColors.AsBytes(), destBytes, count * sizeof(Color));
+                BufferSpan.Copy(sourceColors.AsBytes(), destBytes, count * sizeof(Rgba32));
             }
 
             /// <inheritdoc />
-            internal override void PackFromZyxBytes(BufferSpan<byte> sourceBytes, BufferSpan<Color> destColors, int count)
+            internal override void PackFromZyxBytes(BufferSpan<byte> sourceBytes, BufferSpan<Rgba32> destColors, int count)
             {
                 ref RGB24 sourceRef = ref Unsafe.As<byte, RGB24>(ref sourceBytes.DangerousGetPinnableReference());
-                ref Color destRef = ref destColors.DangerousGetPinnableReference();
+                ref Rgba32 destRef = ref destColors.DangerousGetPinnableReference();
 
                 for (int i = 0; i < count; i++)
                 {
                     ref RGB24 sp = ref Unsafe.Add(ref sourceRef, i);
-                    ref Color dp = ref Unsafe.Add(ref destRef, i);
+                    ref Rgba32 dp = ref Unsafe.Add(ref destRef, i);
 
-                    Unsafe.As<Color, RGB24>(ref dp) = sp.ToZyx();
+                    Unsafe.As<Rgba32, RGB24>(ref dp) = sp.ToZyx();
                     dp.A = 255;
                 }
             }
 
             /// <inheritdoc />
-            internal override void ToZyxBytes(BufferSpan<Color> sourceColors, BufferSpan<byte> destBytes, int count)
+            internal override void ToZyxBytes(BufferSpan<Rgba32> sourceColors, BufferSpan<byte> destBytes, int count)
             {
-                ref Color sourceRef = ref sourceColors.DangerousGetPinnableReference();
+                ref Rgba32 sourceRef = ref sourceColors.DangerousGetPinnableReference();
                 ref RGB24 destRef = ref Unsafe.As<byte, RGB24>(ref destBytes.DangerousGetPinnableReference());
 
                 for (int i = 0; i < count; i++)
                 {
-                    ref Color sp = ref Unsafe.Add(ref sourceRef, i);
+                    ref Rgba32 sp = ref Unsafe.Add(ref sourceRef, i);
                     ref RGB24 dp = ref Unsafe.Add(ref destRef, i);
 
-                    dp = Unsafe.As<Color, RGB24>(ref sp).ToZyx();
+                    dp = Unsafe.As<Rgba32, RGB24>(ref sp).ToZyx();
                 }
             }
 
             /// <inheritdoc />
-            internal override void PackFromZyxwBytes(BufferSpan<byte> sourceBytes, BufferSpan<Color> destColors, int count)
+            internal override void PackFromZyxwBytes(BufferSpan<byte> sourceBytes, BufferSpan<Rgba32> destColors, int count)
             {
                 ref RGBA32 sourceRef = ref Unsafe.As<byte, RGBA32>(ref sourceBytes.DangerousGetPinnableReference());
-                ref Color destRef = ref destColors.DangerousGetPinnableReference();
+                ref Rgba32 destRef = ref destColors.DangerousGetPinnableReference();
 
                 for (int i = 0; i < count; i++)
                 {
                     ref RGBA32 sp = ref Unsafe.Add(ref sourceRef, i);
-                    ref Color dp = ref Unsafe.Add(ref destRef, i);
+                    ref Rgba32 dp = ref Unsafe.Add(ref destRef, i);
                     RGBA32 zyxw = sp.ToZyxw();
-                    dp = Unsafe.As<RGBA32, Color>(ref zyxw);
+                    dp = Unsafe.As<RGBA32, Rgba32>(ref zyxw);
                 }
             }
 
             /// <inheritdoc />
-            internal override void ToZyxwBytes(BufferSpan<Color> sourceColors, BufferSpan<byte> destBytes, int count)
+            internal override void ToZyxwBytes(BufferSpan<Rgba32> sourceColors, BufferSpan<byte> destBytes, int count)
             {
-                ref Color sourceRef = ref sourceColors.DangerousGetPinnableReference();
+                ref Rgba32 sourceRef = ref sourceColors.DangerousGetPinnableReference();
                 ref RGBA32 destRef = ref Unsafe.As<byte, RGBA32>(ref destBytes.DangerousGetPinnableReference());
 
                 for (int i = 0; i < count; i++)
                 {
-                    ref RGBA32 sp = ref Unsafe.As<Color, RGBA32>(ref Unsafe.Add(ref sourceRef, i));
+                    ref RGBA32 sp = ref Unsafe.As<Rgba32, RGBA32>(ref Unsafe.Add(ref sourceRef, i));
                     ref RGBA32 dp = ref Unsafe.Add(ref destRef, i);
                     dp = sp.ToZyxw();
                 }
@@ -264,7 +259,7 @@ namespace ImageSharp
             }
 
             /// <summary>
-            /// Value type to store <see cref="Color"/>-s unpacked into multiple <see cref="uint"/>-s.
+            /// Value type to store <see cref="Rgba32"/>-s unpacked into multiple <see cref="uint"/>-s.
             /// </summary>
             [StructLayout(LayoutKind.Sequential)]
             private struct UnpackedRGBA
diff --git a/src/ImageSharp/Colors/ColorspaceTransforms.cs b/src/ImageSharp/PixelFormats/Rgba32.ColorspaceTransforms.cs
similarity index 79%
rename from src/ImageSharp/Colors/ColorspaceTransforms.cs
rename to src/ImageSharp/PixelFormats/Rgba32.ColorspaceTransforms.cs
index 480caab331..45d3489b72 100644
--- a/src/ImageSharp/Colors/ColorspaceTransforms.cs
+++ b/src/ImageSharp/PixelFormats/Rgba32.ColorspaceTransforms.cs
@@ -1,62 +1,57 @@
-// <copyright file="ColorspaceTransforms.cs" company="James Jackson-South">
+// <copyright file="Rgba32.ColorspaceTransforms.cs" company="James Jackson-South">
 // Copyright (c) James Jackson-South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
-namespace ImageSharp
+namespace ImageSharp.PixelFormats
 {
     using System;
     using System.Numerics;
     using Colors.Spaces;
 
-    /// <summary>
-    /// Packed pixel type containing four 8-bit unsigned normalized values ranging from 0 to 255.
-    /// The color components are stored in red, green, blue, and alpha order.
-    /// </summary>
-    /// <remarks>
-    /// This struct is fully mutable. This is done (against the guidelines) for the sake of performance,
-    /// as it avoids the need to create new values for modification operations.
-    /// </remarks>
-    public partial struct Color
+    /// <content>
+    /// Provides implicit colorspace transformation.
+    /// </content>
+    public partial struct Rgba32
     {
         /// <summary>
-        /// Allows the implicit conversion of an instance of <see cref="Color"/> to a
+        /// Allows the implicit conversion of an instance of <see cref="Rgba32"/> to a
         /// <see cref="Bgra32"/>.
         /// </summary>
-        /// <param name="color">The instance of <see cref="Color"/> to convert.</param>
+        /// <param name="color">The instance of <see cref="Rgba32"/> to convert.</param>
         /// <returns>
         /// An instance of <see cref="Bgra32"/>.
         /// </returns>
-        public static implicit operator Color(Bgra32 color)
+        public static implicit operator Rgba32(Bgra32 color)
         {
-            return new Color(color.R, color.G, color.B, color.A);
+            return new Rgba32(color.R, color.G, color.B, color.A);
         }
 
         /// <summary>
         /// Allows the implicit conversion of an instance of <see cref="Cmyk"/> to a
-        /// <see cref="Color"/>.
+        /// <see cref="Rgba32"/>.
         /// </summary>
         /// <param name="cmykColor">The instance of <see cref="Cmyk"/> to convert.</param>
         /// <returns>
-        /// An instance of <see cref="Color"/>.
+        /// An instance of <see cref="Rgba32"/>.
         /// </returns>
-        public static implicit operator Color(Cmyk cmykColor)
+        public static implicit operator Rgba32(Cmyk cmykColor)
         {
             float r = (1 - cmykColor.C) * (1 - cmykColor.K);
             float g = (1 - cmykColor.M) * (1 - cmykColor.K);
             float b = (1 - cmykColor.Y) * (1 - cmykColor.K);
-            return new Color(r, g, b, 1);
+            return new Rgba32(r, g, b, 1);
         }
 
         /// <summary>
         /// Allows the implicit conversion of an instance of <see cref="YCbCr"/> to a
-        /// <see cref="Color"/>.
+        /// <see cref="Rgba32"/>.
         /// </summary>
         /// <param name="color">The instance of <see cref="YCbCr"/> to convert.</param>
         /// <returns>
-        /// An instance of <see cref="Color"/>.
+        /// An instance of <see cref="Rgba32"/>.
         /// </returns>
-        public static implicit operator Color(YCbCr color)
+        public static implicit operator Rgba32(YCbCr color)
         {
             float y = color.Y;
             float cb = color.Cb - 128;
@@ -66,18 +61,18 @@ namespace ImageSharp
             byte g = (byte)(y - (0.34414F * cb) - (0.71414F * cr)).Clamp(0, 255);
             byte b = (byte)(y + (1.772F * cb)).Clamp(0, 255);
 
-            return new Color(r, g, b);
+            return new Rgba32(r, g, b);
         }
 
         /// <summary>
         /// Allows the implicit conversion of an instance of <see cref="CieXyz"/> to a
-        /// <see cref="Color"/>.
+        /// <see cref="Rgba32"/>.
         /// </summary>
         /// <param name="color">The instance of <see cref="CieXyz"/> to convert.</param>
         /// <returns>
-        /// An instance of <see cref="Color"/>.
+        /// An instance of <see cref="Rgba32"/>.
         /// </returns>
-        public static implicit operator Color(CieXyz color)
+        public static implicit operator Rgba32(CieXyz color)
         {
             float x = color.X / 100F;
             float y = color.Y / 100F;
@@ -89,25 +84,25 @@ namespace ImageSharp
             float b = (x * 0.0557F) + (y * -0.2040F) + (z * 1.0570F);
 
             Vector4 vector = new Vector4(r, g, b, 1).Compress();
-            return new Color(vector);
+            return new Rgba32(vector);
         }
 
         /// <summary>
         /// Allows the implicit conversion of an instance of <see cref="Hsv"/> to a
-        /// <see cref="Color"/>.
+        /// <see cref="Rgba32"/>.
         /// </summary>
         /// <param name="color">The instance of <see cref="Hsv"/> to convert.</param>
         /// <returns>
-        /// An instance of <see cref="Color"/>.
+        /// An instance of <see cref="Rgba32"/>.
         /// </returns>
-        public static implicit operator Color(Hsv color)
+        public static implicit operator Rgba32(Hsv color)
         {
             float s = color.S;
             float v = color.V;
 
             if (MathF.Abs(s) < Constants.Epsilon)
             {
-                return new Color(v, v, v, 1);
+                return new Rgba32(v, v, v, 1);
             }
 
             float h = (MathF.Abs(color.H - 360) < Constants.Epsilon) ? 0 : color.H / 60;
@@ -158,18 +153,18 @@ namespace ImageSharp
                     break;
             }
 
-            return new Color(r, g, b, 1);
+            return new Rgba32(r, g, b, 1);
         }
 
         /// <summary>
         /// Allows the implicit conversion of an instance of <see cref="Hsl"/> to a
-        /// <see cref="Color"/>.
+        /// <see cref="Rgba32"/>.
         /// </summary>
         /// <param name="color">The instance of <see cref="Hsl"/> to convert.</param>
         /// <returns>
-        /// An instance of <see cref="Color"/>.
+        /// An instance of <see cref="Rgba32"/>.
         /// </returns>
-        public static implicit operator Color(Hsl color)
+        public static implicit operator Rgba32(Hsl color)
         {
             float rangedH = color.H / 360F;
             float r = 0;
@@ -195,18 +190,18 @@ namespace ImageSharp
                 }
             }
 
-            return new Color(r, g, b, 1);
+            return new Rgba32(r, g, b, 1);
         }
 
         /// <summary>
         /// Allows the implicit conversion of an instance of <see cref="CieLab"/> to a
-        /// <see cref="Color"/>.
+        /// <see cref="Rgba32"/>.
         /// </summary>
         /// <param name="cieLabColor">The instance of <see cref="CieLab"/> to convert.</param>
         /// <returns>
-        /// An instance of <see cref="Color"/>.
+        /// An instance of <see cref="Rgba32"/>.
         /// </returns>
-        public static implicit operator Color(CieLab cieLabColor)
+        public static implicit operator Rgba32(CieLab cieLabColor)
         {
             // First convert back to XYZ...
             float y = (cieLabColor.L + 16F) / 116F;
@@ -229,7 +224,7 @@ namespace ImageSharp
             float g = (x * -0.9689F) + (y * 1.8758F) + (z * 0.0415F);
             float b = (x * 0.0557F) + (y * -0.2040F) + (z * 1.0570F);
 
-            return new Color(new Vector4(r, g, b, 1F).Compress());
+            return new Rgba32(new Vector4(r, g, b, 1F).Compress());
         }
 
         /// <summary>
diff --git a/src/ImageSharp/PixelFormats/Rgba32.Definitions.cs b/src/ImageSharp/PixelFormats/Rgba32.Definitions.cs
new file mode 100644
index 0000000000..be02d08751
--- /dev/null
+++ b/src/ImageSharp/PixelFormats/Rgba32.Definitions.cs
@@ -0,0 +1,723 @@
+// <copyright file="Rgba32.Definitions.cs" company="James Jackson-South">
+// Copyright (c) James Jackson-South and contributors.
+// Licensed under the Apache License, Version 2.0.
+// </copyright>
+
+namespace ImageSharp.PixelFormats
+{
+    /// <content>
+    /// Provides standardized deifinitions for named colors.
+    /// </content>
+    public partial struct Rgba32
+    {
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #F0F8FF.
+        /// </summary>
+        public static readonly Rgba32 AliceBlue = NamedColors<Rgba32>.AliceBlue;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #FAEBD7.
+        /// </summary>
+        public static readonly Rgba32 AntiqueWhite = NamedColors<Rgba32>.AntiqueWhite;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #00FFFF.
+        /// </summary>
+        public static readonly Rgba32 Aqua = NamedColors<Rgba32>.Aqua;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #7FFFD4.
+        /// </summary>
+        public static readonly Rgba32 Aquamarine = NamedColors<Rgba32>.Aquamarine;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #F0FFFF.
+        /// </summary>
+        public static readonly Rgba32 Azure = NamedColors<Rgba32>.Azure;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #F5F5DC.
+        /// </summary>
+        public static readonly Rgba32 Beige = NamedColors<Rgba32>.Beige;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #FFE4C4.
+        /// </summary>
+        public static readonly Rgba32 Bisque = NamedColors<Rgba32>.Bisque;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #000000.
+        /// </summary>
+        public static readonly Rgba32 Black = NamedColors<Rgba32>.Black;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #FFEBCD.
+        /// </summary>
+        public static readonly Rgba32 BlanchedAlmond = NamedColors<Rgba32>.BlanchedAlmond;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #0000FF.
+        /// </summary>
+        public static readonly Rgba32 Blue = NamedColors<Rgba32>.Blue;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #8A2BE2.
+        /// </summary>
+        public static readonly Rgba32 BlueViolet = NamedColors<Rgba32>.BlueViolet;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #A52A2A.
+        /// </summary>
+        public static readonly Rgba32 Brown = NamedColors<Rgba32>.Brown;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #DEB887.
+        /// </summary>
+        public static readonly Rgba32 BurlyWood = NamedColors<Rgba32>.BurlyWood;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #5F9EA0.
+        /// </summary>
+        public static readonly Rgba32 CadetBlue = NamedColors<Rgba32>.CadetBlue;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #7FFF00.
+        /// </summary>
+        public static readonly Rgba32 Chartreuse = NamedColors<Rgba32>.Chartreuse;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #D2691E.
+        /// </summary>
+        public static readonly Rgba32 Chocolate = NamedColors<Rgba32>.Chocolate;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #FF7F50.
+        /// </summary>
+        public static readonly Rgba32 Coral = NamedColors<Rgba32>.Coral;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #6495ED.
+        /// </summary>
+        public static readonly Rgba32 CornflowerBlue = NamedColors<Rgba32>.CornflowerBlue;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #FFF8DC.
+        /// </summary>
+        public static readonly Rgba32 Cornsilk = NamedColors<Rgba32>.Cornsilk;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #DC143C.
+        /// </summary>
+        public static readonly Rgba32 Crimson = NamedColors<Rgba32>.Crimson;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #00FFFF.
+        /// </summary>
+        public static readonly Rgba32 Cyan = NamedColors<Rgba32>.Cyan;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #00008B.
+        /// </summary>
+        public static readonly Rgba32 DarkBlue = NamedColors<Rgba32>.DarkBlue;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #008B8B.
+        /// </summary>
+        public static readonly Rgba32 DarkCyan = NamedColors<Rgba32>.DarkCyan;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #B8860B.
+        /// </summary>
+        public static readonly Rgba32 DarkGoldenrod = NamedColors<Rgba32>.DarkGoldenrod;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #A9A9A9.
+        /// </summary>
+        public static readonly Rgba32 DarkGray = NamedColors<Rgba32>.DarkGray;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #006400.
+        /// </summary>
+        public static readonly Rgba32 DarkGreen = NamedColors<Rgba32>.DarkGreen;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #BDB76B.
+        /// </summary>
+        public static readonly Rgba32 DarkKhaki = NamedColors<Rgba32>.DarkKhaki;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #8B008B.
+        /// </summary>
+        public static readonly Rgba32 DarkMagenta = NamedColors<Rgba32>.DarkMagenta;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #556B2F.
+        /// </summary>
+        public static readonly Rgba32 DarkOliveGreen = NamedColors<Rgba32>.DarkOliveGreen;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #FF8C00.
+        /// </summary>
+        public static readonly Rgba32 DarkOrange = NamedColors<Rgba32>.DarkOrange;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #9932CC.
+        /// </summary>
+        public static readonly Rgba32 DarkOrchid = NamedColors<Rgba32>.DarkOrchid;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #8B0000.
+        /// </summary>
+        public static readonly Rgba32 DarkRed = NamedColors<Rgba32>.DarkRed;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #E9967A.
+        /// </summary>
+        public static readonly Rgba32 DarkSalmon = NamedColors<Rgba32>.DarkSalmon;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #8FBC8B.
+        /// </summary>
+        public static readonly Rgba32 DarkSeaGreen = NamedColors<Rgba32>.DarkSeaGreen;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #483D8B.
+        /// </summary>
+        public static readonly Rgba32 DarkSlateBlue = NamedColors<Rgba32>.DarkSlateBlue;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #2F4F4F.
+        /// </summary>
+        public static readonly Rgba32 DarkSlateGray = NamedColors<Rgba32>.DarkSlateGray;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #00CED1.
+        /// </summary>
+        public static readonly Rgba32 DarkTurquoise = NamedColors<Rgba32>.DarkTurquoise;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #9400D3.
+        /// </summary>
+        public static readonly Rgba32 DarkViolet = NamedColors<Rgba32>.DarkViolet;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #FF1493.
+        /// </summary>
+        public static readonly Rgba32 DeepPink = NamedColors<Rgba32>.DeepPink;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #00BFFF.
+        /// </summary>
+        public static readonly Rgba32 DeepSkyBlue = NamedColors<Rgba32>.DeepSkyBlue;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #696969.
+        /// </summary>
+        public static readonly Rgba32 DimGray = NamedColors<Rgba32>.DimGray;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #1E90FF.
+        /// </summary>
+        public static readonly Rgba32 DodgerBlue = NamedColors<Rgba32>.DodgerBlue;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #B22222.
+        /// </summary>
+        public static readonly Rgba32 Firebrick = NamedColors<Rgba32>.Firebrick;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #FFFAF0.
+        /// </summary>
+        public static readonly Rgba32 FloralWhite = NamedColors<Rgba32>.FloralWhite;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #228B22.
+        /// </summary>
+        public static readonly Rgba32 ForestGreen = NamedColors<Rgba32>.ForestGreen;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #FF00FF.
+        /// </summary>
+        public static readonly Rgba32 Fuchsia = NamedColors<Rgba32>.Fuchsia;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #DCDCDC.
+        /// </summary>
+        public static readonly Rgba32 Gainsboro = NamedColors<Rgba32>.Gainsboro;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #F8F8FF.
+        /// </summary>
+        public static readonly Rgba32 GhostWhite = NamedColors<Rgba32>.GhostWhite;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #FFD700.
+        /// </summary>
+        public static readonly Rgba32 Gold = NamedColors<Rgba32>.Gold;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #DAA520.
+        /// </summary>
+        public static readonly Rgba32 Goldenrod = NamedColors<Rgba32>.Goldenrod;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #808080.
+        /// </summary>
+        public static readonly Rgba32 Gray = NamedColors<Rgba32>.Gray;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #008000.
+        /// </summary>
+        public static readonly Rgba32 Green = NamedColors<Rgba32>.Green;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #ADFF2F.
+        /// </summary>
+        public static readonly Rgba32 GreenYellow = NamedColors<Rgba32>.GreenYellow;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #F0FFF0.
+        /// </summary>
+        public static readonly Rgba32 Honeydew = NamedColors<Rgba32>.Honeydew;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #FF69B4.
+        /// </summary>
+        public static readonly Rgba32 HotPink = NamedColors<Rgba32>.HotPink;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #CD5C5C.
+        /// </summary>
+        public static readonly Rgba32 IndianRed = NamedColors<Rgba32>.IndianRed;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #4B0082.
+        /// </summary>
+        public static readonly Rgba32 Indigo = NamedColors<Rgba32>.Indigo;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #FFFFF0.
+        /// </summary>
+        public static readonly Rgba32 Ivory = NamedColors<Rgba32>.Ivory;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #F0E68C.
+        /// </summary>
+        public static readonly Rgba32 Khaki = NamedColors<Rgba32>.Khaki;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #E6E6FA.
+        /// </summary>
+        public static readonly Rgba32 Lavender = NamedColors<Rgba32>.Lavender;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #FFF0F5.
+        /// </summary>
+        public static readonly Rgba32 LavenderBlush = NamedColors<Rgba32>.LavenderBlush;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #7CFC00.
+        /// </summary>
+        public static readonly Rgba32 LawnGreen = NamedColors<Rgba32>.LawnGreen;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #FFFACD.
+        /// </summary>
+        public static readonly Rgba32 LemonChiffon = NamedColors<Rgba32>.LemonChiffon;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #ADD8E6.
+        /// </summary>
+        public static readonly Rgba32 LightBlue = NamedColors<Rgba32>.LightBlue;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #F08080.
+        /// </summary>
+        public static readonly Rgba32 LightCoral = NamedColors<Rgba32>.LightCoral;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #E0FFFF.
+        /// </summary>
+        public static readonly Rgba32 LightCyan = NamedColors<Rgba32>.LightCyan;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #FAFAD2.
+        /// </summary>
+        public static readonly Rgba32 LightGoldenrodYellow = NamedColors<Rgba32>.LightGoldenrodYellow;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #D3D3D3.
+        /// </summary>
+        public static readonly Rgba32 LightGray = NamedColors<Rgba32>.LightGray;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #90EE90.
+        /// </summary>
+        public static readonly Rgba32 LightGreen = NamedColors<Rgba32>.LightGreen;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #FFB6C1.
+        /// </summary>
+        public static readonly Rgba32 LightPink = NamedColors<Rgba32>.LightPink;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #FFA07A.
+        /// </summary>
+        public static readonly Rgba32 LightSalmon = NamedColors<Rgba32>.LightSalmon;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #20B2AA.
+        /// </summary>
+        public static readonly Rgba32 LightSeaGreen = NamedColors<Rgba32>.LightSeaGreen;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #87CEFA.
+        /// </summary>
+        public static readonly Rgba32 LightSkyBlue = NamedColors<Rgba32>.LightSkyBlue;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #778899.
+        /// </summary>
+        public static readonly Rgba32 LightSlateGray = NamedColors<Rgba32>.LightSlateGray;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #B0C4DE.
+        /// </summary>
+        public static readonly Rgba32 LightSteelBlue = NamedColors<Rgba32>.LightSteelBlue;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #FFFFE0.
+        /// </summary>
+        public static readonly Rgba32 LightYellow = NamedColors<Rgba32>.LightYellow;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #00FF00.
+        /// </summary>
+        public static readonly Rgba32 Lime = NamedColors<Rgba32>.Lime;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #32CD32.
+        /// </summary>
+        public static readonly Rgba32 LimeGreen = NamedColors<Rgba32>.LimeGreen;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #FAF0E6.
+        /// </summary>
+        public static readonly Rgba32 Linen = NamedColors<Rgba32>.Linen;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #FF00FF.
+        /// </summary>
+        public static readonly Rgba32 Magenta = NamedColors<Rgba32>.Magenta;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #800000.
+        /// </summary>
+        public static readonly Rgba32 Maroon = NamedColors<Rgba32>.Maroon;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #66CDAA.
+        /// </summary>
+        public static readonly Rgba32 MediumAquamarine = NamedColors<Rgba32>.MediumAquamarine;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #0000CD.
+        /// </summary>
+        public static readonly Rgba32 MediumBlue = NamedColors<Rgba32>.MediumBlue;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #BA55D3.
+        /// </summary>
+        public static readonly Rgba32 MediumOrchid = NamedColors<Rgba32>.MediumOrchid;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #9370DB.
+        /// </summary>
+        public static readonly Rgba32 MediumPurple = NamedColors<Rgba32>.MediumPurple;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #3CB371.
+        /// </summary>
+        public static readonly Rgba32 MediumSeaGreen = NamedColors<Rgba32>.MediumSeaGreen;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #7B68EE.
+        /// </summary>
+        public static readonly Rgba32 MediumSlateBlue = NamedColors<Rgba32>.MediumSlateBlue;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #00FA9A.
+        /// </summary>
+        public static readonly Rgba32 MediumSpringGreen = NamedColors<Rgba32>.MediumSpringGreen;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #48D1CC.
+        /// </summary>
+        public static readonly Rgba32 MediumTurquoise = NamedColors<Rgba32>.MediumTurquoise;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #C71585.
+        /// </summary>
+        public static readonly Rgba32 MediumVioletRed = NamedColors<Rgba32>.MediumVioletRed;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #191970.
+        /// </summary>
+        public static readonly Rgba32 MidnightBlue = NamedColors<Rgba32>.MidnightBlue;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #F5FFFA.
+        /// </summary>
+        public static readonly Rgba32 MintCream = NamedColors<Rgba32>.MintCream;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #FFE4E1.
+        /// </summary>
+        public static readonly Rgba32 MistyRose = NamedColors<Rgba32>.MistyRose;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #FFE4B5.
+        /// </summary>
+        public static readonly Rgba32 Moccasin = NamedColors<Rgba32>.Moccasin;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #FFDEAD.
+        /// </summary>
+        public static readonly Rgba32 NavajoWhite = NamedColors<Rgba32>.NavajoWhite;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #000080.
+        /// </summary>
+        public static readonly Rgba32 Navy = NamedColors<Rgba32>.Navy;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #FDF5E6.
+        /// </summary>
+        public static readonly Rgba32 OldLace = NamedColors<Rgba32>.OldLace;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #808000.
+        /// </summary>
+        public static readonly Rgba32 Olive = NamedColors<Rgba32>.Olive;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #6B8E23.
+        /// </summary>
+        public static readonly Rgba32 OliveDrab = NamedColors<Rgba32>.OliveDrab;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #FFA500.
+        /// </summary>
+        public static readonly Rgba32 Orange = NamedColors<Rgba32>.Orange;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #FF4500.
+        /// </summary>
+        public static readonly Rgba32 OrangeRed = NamedColors<Rgba32>.OrangeRed;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #DA70D6.
+        /// </summary>
+        public static readonly Rgba32 Orchid = NamedColors<Rgba32>.Orchid;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #EEE8AA.
+        /// </summary>
+        public static readonly Rgba32 PaleGoldenrod = NamedColors<Rgba32>.PaleGoldenrod;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #98FB98.
+        /// </summary>
+        public static readonly Rgba32 PaleGreen = NamedColors<Rgba32>.PaleGreen;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #AFEEEE.
+        /// </summary>
+        public static readonly Rgba32 PaleTurquoise = NamedColors<Rgba32>.PaleTurquoise;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #DB7093.
+        /// </summary>
+        public static readonly Rgba32 PaleVioletRed = NamedColors<Rgba32>.PaleVioletRed;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #FFEFD5.
+        /// </summary>
+        public static readonly Rgba32 PapayaWhip = NamedColors<Rgba32>.PapayaWhip;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #FFDAB9.
+        /// </summary>
+        public static readonly Rgba32 PeachPuff = NamedColors<Rgba32>.PeachPuff;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #CD853F.
+        /// </summary>
+        public static readonly Rgba32 Peru = NamedColors<Rgba32>.Peru;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #FFC0CB.
+        /// </summary>
+        public static readonly Rgba32 Pink = NamedColors<Rgba32>.Pink;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #DDA0DD.
+        /// </summary>
+        public static readonly Rgba32 Plum = NamedColors<Rgba32>.Plum;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #B0E0E6.
+        /// </summary>
+        public static readonly Rgba32 PowderBlue = NamedColors<Rgba32>.PowderBlue;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #800080.
+        /// </summary>
+        public static readonly Rgba32 Purple = NamedColors<Rgba32>.Purple;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #663399.
+        /// </summary>
+        public static readonly Rgba32 RebeccaPurple = NamedColors<Rgba32>.RebeccaPurple;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #FF0000.
+        /// </summary>
+        public static readonly Rgba32 Red = NamedColors<Rgba32>.Red;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #BC8F8F.
+        /// </summary>
+        public static readonly Rgba32 RosyBrown = NamedColors<Rgba32>.RosyBrown;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #4169E1.
+        /// </summary>
+        public static readonly Rgba32 RoyalBlue = NamedColors<Rgba32>.RoyalBlue;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #8B4513.
+        /// </summary>
+        public static readonly Rgba32 SaddleBrown = NamedColors<Rgba32>.SaddleBrown;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #FA8072.
+        /// </summary>
+        public static readonly Rgba32 Salmon = NamedColors<Rgba32>.Salmon;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #F4A460.
+        /// </summary>
+        public static readonly Rgba32 SandyBrown = NamedColors<Rgba32>.SandyBrown;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #2E8B57.
+        /// </summary>
+        public static readonly Rgba32 SeaGreen = NamedColors<Rgba32>.SeaGreen;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #FFF5EE.
+        /// </summary>
+        public static readonly Rgba32 SeaShell = NamedColors<Rgba32>.SeaShell;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #A0522D.
+        /// </summary>
+        public static readonly Rgba32 Sienna = NamedColors<Rgba32>.Sienna;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #C0C0C0.
+        /// </summary>
+        public static readonly Rgba32 Silver = NamedColors<Rgba32>.Silver;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #87CEEB.
+        /// </summary>
+        public static readonly Rgba32 SkyBlue = NamedColors<Rgba32>.SkyBlue;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #6A5ACD.
+        /// </summary>
+        public static readonly Rgba32 SlateBlue = NamedColors<Rgba32>.SlateBlue;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #708090.
+        /// </summary>
+        public static readonly Rgba32 SlateGray = NamedColors<Rgba32>.SlateGray;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #FFFAFA.
+        /// </summary>
+        public static readonly Rgba32 Snow = NamedColors<Rgba32>.Snow;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #00FF7F.
+        /// </summary>
+        public static readonly Rgba32 SpringGreen = NamedColors<Rgba32>.SpringGreen;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #4682B4.
+        /// </summary>
+        public static readonly Rgba32 SteelBlue = NamedColors<Rgba32>.SteelBlue;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #D2B48C.
+        /// </summary>
+        public static readonly Rgba32 Tan = NamedColors<Rgba32>.Tan;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #008080.
+        /// </summary>
+        public static readonly Rgba32 Teal = NamedColors<Rgba32>.Teal;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #D8BFD8.
+        /// </summary>
+        public static readonly Rgba32 Thistle = NamedColors<Rgba32>.Thistle;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #FF6347.
+        /// </summary>
+        public static readonly Rgba32 Tomato = NamedColors<Rgba32>.Tomato;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #FFFFFF.
+        /// </summary>
+        public static readonly Rgba32 Transparent = NamedColors<Rgba32>.Transparent;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #40E0D0.
+        /// </summary>
+        public static readonly Rgba32 Turquoise = NamedColors<Rgba32>.Turquoise;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #EE82EE.
+        /// </summary>
+        public static readonly Rgba32 Violet = NamedColors<Rgba32>.Violet;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #F5DEB3.
+        /// </summary>
+        public static readonly Rgba32 Wheat = NamedColors<Rgba32>.Wheat;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #FFFFFF.
+        /// </summary>
+        public static readonly Rgba32 White = NamedColors<Rgba32>.White;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #F5F5F5.
+        /// </summary>
+        public static readonly Rgba32 WhiteSmoke = NamedColors<Rgba32>.WhiteSmoke;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #FFFF00.
+        /// </summary>
+        public static readonly Rgba32 Yellow = NamedColors<Rgba32>.Yellow;
+
+        /// <summary>
+        /// Represents a <see cref="Rgba32"/> matching the W3C definition that has an hex value of #9ACD32.
+        /// </summary>
+        public static readonly Rgba32 YellowGreen = NamedColors<Rgba32>.YellowGreen;
+    }
+}
\ No newline at end of file
diff --git a/src/ImageSharp/Colors/Color.Transforms.cs b/src/ImageSharp/PixelFormats/Rgba32.Transforms.cs
similarity index 81%
rename from src/ImageSharp/Colors/Color.Transforms.cs
rename to src/ImageSharp/PixelFormats/Rgba32.Transforms.cs
index 15935afc4d..bd13a2de1a 100644
--- a/src/ImageSharp/Colors/Color.Transforms.cs
+++ b/src/ImageSharp/PixelFormats/Rgba32.Transforms.cs
@@ -1,22 +1,17 @@
-// <copyright file="Color.Transforms.cs" company="James Jackson-South">
+// <copyright file="Rgba32.Transforms.cs" company="James Jackson-South">
 // Copyright (c) James Jackson-South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
-namespace ImageSharp
+namespace ImageSharp.PixelFormats
 {
     using System.Numerics;
     using System.Runtime.CompilerServices;
 
-    /// <summary>
-    /// Packed pixel type containing four 8-bit unsigned normalized values ranging from 0 to 255.
-    /// The color components are stored in red, green, blue, and alpha order.
-    /// </summary>
-    /// <remarks>
-    /// This struct is fully mutable. This is done (against the guidelines) for the sake of performance,
-    /// as it avoids the need to create new values for modification operations.
-    /// </remarks>
-    public partial struct Color
+    /// <content>
+    /// Provides operators and composition algorithms.
+    /// </content>
+    public partial struct Rgba32
     {
         /// <summary>
         /// Adds the second color to the first.
@@ -24,10 +19,10 @@ namespace ImageSharp
         /// <param name="left">The first source color.</param>
         /// <param name="right">The second source color.</param>
         /// <returns>
-        /// The <see cref="Color"/>.
+        /// The <see cref="Rgba32"/>.
         /// </returns>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static Color operator +(Color left, Color right)
+        public static Rgba32 operator +(Rgba32 left, Rgba32 right)
         {
             Vector4 add = left.ToVector4() + right.ToVector4();
             return PackNew(ref add);
@@ -39,10 +34,10 @@ namespace ImageSharp
         /// <param name="left">The first source color.</param>
         /// <param name="right">The second source color.</param>
         /// <returns>
-        /// The <see cref="Color"/>.
+        /// The <see cref="Rgba32"/>.
         /// </returns>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static Color operator -(Color left, Color right)
+        public static Rgba32 operator -(Rgba32 left, Rgba32 right)
         {
             Vector4 sub = left.ToVector4() - right.ToVector4();
             return PackNew(ref sub);
@@ -54,9 +49,9 @@ namespace ImageSharp
         /// <param name="backdrop">The backdrop color.</param>
         /// <param name="source">The source color.</param>
         /// <returns>
-        /// The <see cref="Color"/>.
+        /// The <see cref="Rgba32"/>.
         /// </returns>
-        public static Color Normal(Color backdrop, Color source)
+        public static Rgba32 Normal(Rgba32 backdrop, Rgba32 source)
         {
             Vector4 normal = Vector4BlendTransforms.Normal(backdrop.ToVector4(), source.ToVector4());
             return PackNew(ref normal);
@@ -74,9 +69,9 @@ namespace ImageSharp
         /// <param name="backdrop">The backdrop color.</param>
         /// <param name="source">The source color.</param>
         /// <returns>
-        /// The <see cref="Color"/>.
+        /// The <see cref="Rgba32"/>.
         /// </returns>
-        public static Color Multiply(Color backdrop, Color source)
+        public static Rgba32 Multiply(Rgba32 backdrop, Rgba32 source)
         {
             Vector4 multiply = Vector4BlendTransforms.Multiply(backdrop.ToVector4(), source.ToVector4());
             return PackNew(ref multiply);
@@ -93,9 +88,9 @@ namespace ImageSharp
         /// <param name="backdrop">The backdrop color.</param>
         /// <param name="source">The source color.</param>
         /// <returns>
-        /// The <see cref="Color"/>.
+        /// The <see cref="Rgba32"/>.
         /// </returns>
-        public static Color Screen(Color backdrop, Color source)
+        public static Rgba32 Screen(Rgba32 backdrop, Rgba32 source)
         {
             Vector4 subtract = Vector4BlendTransforms.Screen(backdrop.ToVector4(), source.ToVector4());
             return PackNew(ref subtract);
@@ -108,9 +103,9 @@ namespace ImageSharp
         /// <param name="backdrop">The backdrop color.</param>
         /// <param name="source">The source color.</param>
         /// <returns>
-        /// The <see cref="Color"/>.
+        /// The <see cref="Rgba32"/>.
         /// </returns>
-        public static Color HardLight(Color backdrop, Color source)
+        public static Rgba32 HardLight(Rgba32 backdrop, Rgba32 source)
         {
             Vector4 hardlight = Vector4BlendTransforms.HardLight(backdrop.ToVector4(), source.ToVector4());
             return PackNew(ref hardlight);
@@ -127,9 +122,9 @@ namespace ImageSharp
         /// <param name="backdrop">The backdrop color.</param>
         /// <param name="source">The source color.</param>
         /// <returns>
-        /// The <see cref="Color"/>.
+        /// The <see cref="Rgba32"/>.
         /// </returns>
-        public static Color Overlay(Color backdrop, Color source)
+        public static Rgba32 Overlay(Rgba32 backdrop, Rgba32 source)
         {
             Vector4 overlay = Vector4BlendTransforms.Overlay(backdrop.ToVector4(), source.ToVector4());
             return PackNew(ref overlay);
@@ -142,9 +137,9 @@ namespace ImageSharp
         /// <param name="backdrop">The backdrop color.</param>
         /// <param name="source">The source color.</param>
         /// <returns>
-        /// The <see cref="Color"/>.
+        /// The <see cref="Rgba32"/>.
         /// </returns>
-        public static Color Darken(Color backdrop, Color source)
+        public static Rgba32 Darken(Rgba32 backdrop, Rgba32 source)
         {
             Vector4 darken = Vector4BlendTransforms.Darken(backdrop.ToVector4(), source.ToVector4());
             return PackNew(ref darken);
@@ -157,9 +152,9 @@ namespace ImageSharp
         /// <param name="backdrop">The backdrop color.</param>
         /// <param name="source">The source color.</param>
         /// <returns>
-        /// The <see cref="Color"/>.
+        /// The <see cref="Rgba32"/>.
         /// </returns>
-        public static Color Lighten(Color backdrop, Color source)
+        public static Rgba32 Lighten(Rgba32 backdrop, Rgba32 source)
         {
             Vector4 lighten = Vector4BlendTransforms.Lighten(backdrop.ToVector4(), source.ToVector4());
             return PackNew(ref lighten);
@@ -172,9 +167,9 @@ namespace ImageSharp
         /// <param name="backdrop">The backdrop color.</param>
         /// <param name="source">The source color.</param>
         /// <returns>
-        /// The <see cref="Color"/>.
+        /// The <see cref="Rgba32"/>.
         /// </returns>
-        public static Color SoftLight(Color backdrop, Color source)
+        public static Rgba32 SoftLight(Rgba32 backdrop, Rgba32 source)
         {
             Vector4 softlight = Vector4BlendTransforms.SoftLight(backdrop.ToVector4(), source.ToVector4());
             return PackNew(ref softlight);
@@ -186,9 +181,9 @@ namespace ImageSharp
         /// <param name="backdrop">The backdrop color.</param>
         /// <param name="source">The source color.</param>
         /// <returns>
-        /// The <see cref="Color"/>.
+        /// The <see cref="Rgba32"/>.
         /// </returns>
-        public static Color ColorDodge(Color backdrop, Color source)
+        public static Rgba32 ColorDodge(Rgba32 backdrop, Rgba32 source)
         {
             Vector4 dodge = Vector4BlendTransforms.Dodge(backdrop.ToVector4(), source.ToVector4());
             return PackNew(ref dodge);
@@ -200,9 +195,9 @@ namespace ImageSharp
         /// <param name="backdrop">The backdrop color.</param>
         /// <param name="source">The source color.</param>
         /// <returns>
-        /// The <see cref="Color"/>.
+        /// The <see cref="Rgba32"/>.
         /// </returns>
-        public static Color ColorBurn(Color backdrop, Color source)
+        public static Rgba32 ColorBurn(Rgba32 backdrop, Rgba32 source)
         {
             Vector4 burn = Vector4BlendTransforms.Burn(backdrop.ToVector4(), source.ToVector4());
             return PackNew(ref burn);
@@ -215,9 +210,9 @@ namespace ImageSharp
         /// <param name="backdrop">The backdrop color.</param>
         /// <param name="source">The source color.</param>
         /// <returns>
-        /// The <see cref="Color"/>.
+        /// The <see cref="Rgba32"/>.
         /// </returns>
-        public static Color Difference(Color backdrop, Color source)
+        public static Rgba32 Difference(Rgba32 backdrop, Rgba32 source)
         {
             Vector4 difference = Vector4BlendTransforms.Difference(backdrop.ToVector4(), source.ToVector4());
             return PackNew(ref difference);
@@ -230,9 +225,9 @@ namespace ImageSharp
         /// <param name="backdrop">The backdrop color.</param>
         /// <param name="source">The source color.</param>
         /// <returns>
-        /// The <see cref="Color"/>.
+        /// The <see cref="Rgba32"/>.
         /// </returns>
-        public static Color Exclusion(Color backdrop, Color source)
+        public static Rgba32 Exclusion(Rgba32 backdrop, Rgba32 source)
         {
             Vector4 exclusion = Vector4BlendTransforms.Exclusion(backdrop.ToVector4(), source.ToVector4());
             return PackNew(ref exclusion);
@@ -248,9 +243,9 @@ namespace ImageSharp
         /// At amount = 0, "from" is returned, at amount = 1, "to" is returned.
         /// </param>
         /// <returns>
-        /// The <see cref="Color"/>
+        /// The <see cref="Rgba32"/>
         /// </returns>
-        public static Color Lerp(Color from, Color to, float amount)
+        public static Rgba32 Lerp(Rgba32 from, Rgba32 to, float amount)
         {
             Vector4 lerp = Vector4.Lerp(from.ToVector4(), to.ToVector4(), amount);
             return PackNew(ref lerp);
diff --git a/src/ImageSharp/Colors/Color.cs b/src/ImageSharp/PixelFormats/Rgba32.cs
similarity index 84%
rename from src/ImageSharp/Colors/Color.cs
rename to src/ImageSharp/PixelFormats/Rgba32.cs
index fa83429df1..d668be76fd 100644
--- a/src/ImageSharp/Colors/Color.cs
+++ b/src/ImageSharp/PixelFormats/Rgba32.cs
@@ -1,9 +1,9 @@
-// <copyright file="Color.cs" company="James Jackson-South">
+// <copyright file="Rgba32.cs" company="James Jackson-South">
 // Copyright (c) James Jackson-South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
-namespace ImageSharp
+namespace ImageSharp.PixelFormats
 {
     using System.Numerics;
     using System.Runtime.CompilerServices;
@@ -12,13 +12,14 @@ namespace ImageSharp
     /// <summary>
     /// Packed pixel type containing four 8-bit unsigned normalized values ranging from 0 to 255.
     /// The color components are stored in red, green, blue, and alpha order.
+    /// Ranges from &lt;0, 0, 0, 0&gt; to &lt;1, 1, 1, 1&gt; in vector form.
     /// </summary>
     /// <remarks>
     /// This struct is fully mutable. This is done (against the guidelines) for the sake of performance,
     /// as it avoids the need to create new values for modification operations.
     /// </remarks>
     [StructLayout(LayoutKind.Explicit)]
-    public partial struct Color : IPixel<Color>, IPackedVector<uint>
+    public partial struct Rgba32 : IPixel<Rgba32>, IPackedVector<uint>
     {
         /// <summary>
         /// Gets or sets the red component.
@@ -81,14 +82,14 @@ namespace ImageSharp
         private static readonly Vector4 Half = new Vector4(0.5F);
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="Color"/> struct.
+        /// Initializes a new instance of the <see cref="Rgba32"/> struct.
         /// </summary>
         /// <param name="r">The red component.</param>
         /// <param name="g">The green component.</param>
         /// <param name="b">The blue component.</param>
         /// <param name="a">The alpha component.</param>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public Color(byte r, byte g, byte b, byte a = 255)
+        public Rgba32(byte r, byte g, byte b, byte a = 255)
             : this()
         {
             this.R = r;
@@ -98,53 +99,53 @@ namespace ImageSharp
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="Color"/> struct.
+        /// Initializes a new instance of the <see cref="Rgba32"/> struct.
         /// </summary>
         /// <param name="r">The red component.</param>
         /// <param name="g">The green component.</param>
         /// <param name="b">The blue component.</param>
         /// <param name="a">The alpha component.</param>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public Color(float r, float g, float b, float a = 1)
+        public Rgba32(float r, float g, float b, float a = 1)
             : this()
         {
             this.Pack(r, g, b, a);
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="Color"/> struct.
+        /// Initializes a new instance of the <see cref="Rgba32"/> struct.
         /// </summary>
         /// <param name="vector">
         /// The vector containing the components for the packed vector.
         /// </param>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public Color(Vector3 vector)
+        public Rgba32(Vector3 vector)
             : this()
         {
             this.Pack(ref vector);
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="Color"/> struct.
+        /// Initializes a new instance of the <see cref="Rgba32"/> struct.
         /// </summary>
         /// <param name="vector">
         /// The vector containing the components for the packed vector.
         /// </param>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public Color(Vector4 vector)
+        public Rgba32(Vector4 vector)
             : this()
         {
             this = PackNew(ref vector);
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="Color"/> struct.
+        /// Initializes a new instance of the <see cref="Rgba32"/> struct.
         /// </summary>
         /// <param name="packed">
         /// The packed value.
         /// </param>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public Color(uint packed)
+        public Rgba32(uint packed)
             : this()
         {
             this.Rgba = packed;
@@ -154,54 +155,54 @@ namespace ImageSharp
         public uint PackedValue { get => this.Rgba; set => this.Rgba = value; }
 
         /// <summary>
-        /// Compares two <see cref="Color"/> objects for equality.
+        /// Compares two <see cref="Rgba32"/> objects for equality.
         /// </summary>
         /// <param name="left">
-        /// The <see cref="Color"/> on the left side of the operand.
+        /// The <see cref="Rgba32"/> on the left side of the operand.
         /// </param>
         /// <param name="right">
-        /// The <see cref="Color"/> on the right side of the operand.
+        /// The <see cref="Rgba32"/> on the right side of the operand.
         /// </param>
         /// <returns>
         /// True if the <paramref name="left"/> parameter is equal to the <paramref name="right"/> parameter; otherwise, false.
         /// </returns>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static bool operator ==(Color left, Color right)
+        public static bool operator ==(Rgba32 left, Rgba32 right)
         {
             return left.Rgba == right.Rgba;
         }
 
         /// <summary>
-        /// Compares two <see cref="Color"/> objects for equality.
+        /// Compares two <see cref="Rgba32"/> objects for equality.
         /// </summary>
-        /// <param name="left">The <see cref="Color"/> on the left side of the operand.</param>
-        /// <param name="right">The <see cref="Color"/> on the right side of the operand.</param>
+        /// <param name="left">The <see cref="Rgba32"/> on the left side of the operand.</param>
+        /// <param name="right">The <see cref="Rgba32"/> on the right side of the operand.</param>
         /// <returns>
         /// True if the <paramref name="left"/> parameter is not equal to the <paramref name="right"/> parameter; otherwise, false.
         /// </returns>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static bool operator !=(Color left, Color right)
+        public static bool operator !=(Rgba32 left, Rgba32 right)
         {
             return left.Rgba != right.Rgba;
         }
 
         /// <summary>
-        /// Creates a new instance of the <see cref="Color"/> struct.
+        /// Creates a new instance of the <see cref="Rgba32"/> struct.
         /// </summary>
         /// <param name="hex">
         /// The hexadecimal representation of the combined color components arranged
         /// in rgb, rgba, rrggbb, or rrggbbaa format to match web syntax.
         /// </param>
         /// <returns>
-        /// The <see cref="Color"/>.
+        /// The <see cref="Rgba32"/>.
         /// </returns>
-        public static Color FromHex(string hex)
+        public static Rgba32 FromHex(string hex)
         {
-            return ColorBuilder<Color>.FromHex(hex);
+            return ColorBuilder<Rgba32>.FromHex(hex);
         }
 
         /// <inheritdoc />
-        public BulkPixelOperations<Color> CreateBulkOperations() => new BulkOperations();
+        public BulkPixelOperations<Rgba32> CreateBulkOperations() => new BulkOperations();
 
         /// <inheritdoc/>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -278,12 +279,12 @@ namespace ImageSharp
         /// <inheritdoc/>
         public override bool Equals(object obj)
         {
-            return (obj is Color) && this.Equals((Color)obj);
+            return (obj is Rgba32) && this.Equals((Rgba32)obj);
         }
 
         /// <inheritdoc/>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public bool Equals(Color other)
+        public bool Equals(Rgba32 other)
         {
             return this.Rgba == other.Rgba;
         }
@@ -328,15 +329,15 @@ namespace ImageSharp
         /// Packs a <see cref="Vector4"/> into a color returning a new instance as a result.
         /// </summary>
         /// <param name="vector">The vector containing the values to pack.</param>
-        /// <returns>The <see cref="Color"/></returns>
+        /// <returns>The <see cref="Rgba32"/></returns>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static Color PackNew(ref Vector4 vector)
+        private static Rgba32 PackNew(ref Vector4 vector)
         {
             vector *= MaxBytes;
             vector += Half;
             vector = Vector4.Clamp(vector, Vector4.Zero, MaxBytes);
 
-            return new Color((byte)vector.X, (byte)vector.Y, (byte)vector.Z, (byte)vector.W);
+            return new Rgba32((byte)vector.X, (byte)vector.Y, (byte)vector.Z, (byte)vector.W);
         }
 
         /// <summary>
diff --git a/src/ImageSharp/Colors/PackedPixel/Rgba64.cs b/src/ImageSharp/PixelFormats/Rgba64.cs
similarity index 98%
rename from src/ImageSharp/Colors/PackedPixel/Rgba64.cs
rename to src/ImageSharp/PixelFormats/Rgba64.cs
index becc4d072a..20bba9f41e 100644
--- a/src/ImageSharp/Colors/PackedPixel/Rgba64.cs
+++ b/src/ImageSharp/PixelFormats/Rgba64.cs
@@ -3,7 +3,7 @@
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
-namespace ImageSharp
+namespace ImageSharp.PixelFormats
 {
     using System;
     using System.Numerics;
@@ -11,6 +11,7 @@ namespace ImageSharp
 
     /// <summary>
     /// Packed pixel type containing four 16-bit unsigned normalized values ranging from 0 to 1.
+    /// Ranges from &lt;0, 0, 0, 0&gt; to &lt;1, 1, 1, 1&gt; in vector form.
     /// </summary>
     public struct Rgba64 : IPixel<Rgba64>, IPackedVector<ulong>
     {
diff --git a/src/ImageSharp/Colors/RgbaComponent.cs b/src/ImageSharp/PixelFormats/RgbaComponent.cs
similarity index 100%
rename from src/ImageSharp/Colors/RgbaComponent.cs
rename to src/ImageSharp/PixelFormats/RgbaComponent.cs
diff --git a/src/ImageSharp/PixelFormats/RgbaVector.BulkOperations.cs b/src/ImageSharp/PixelFormats/RgbaVector.BulkOperations.cs
new file mode 100644
index 0000000000..9dcfc9074d
--- /dev/null
+++ b/src/ImageSharp/PixelFormats/RgbaVector.BulkOperations.cs
@@ -0,0 +1,27 @@
+// <copyright file="RgbaVector.BulkOperations.cs" company="James Jackson-South">
+// Copyright (c) James Jackson-South and contributors.
+// Licensed under the Apache License, Version 2.0.
+// </copyright>
+
+namespace ImageSharp.PixelFormats
+{
+    using System.Numerics;
+
+    /// <content>
+    /// Provides optimized overrides for bulk operations.
+    /// </content>
+    public partial struct RgbaVector
+    {
+        /// <summary>
+        /// <see cref="BulkPixelOperations{TPixel}"/> implementation optimized for <see cref="RgbaVector"/>.
+        /// </summary>
+        internal class BulkOperations : BulkPixelOperations<RgbaVector>
+        {
+            /// <inheritdoc />
+            internal override unsafe void ToVector4(BufferSpan<RgbaVector> sourceColors, BufferSpan<Vector4> destVectors, int count)
+            {
+                BufferSpan.Copy(sourceColors.AsBytes(), destVectors.AsBytes(), count * sizeof(Vector4));
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/ImageSharp/PixelFormats/RgbaVector.Definitions.cs b/src/ImageSharp/PixelFormats/RgbaVector.Definitions.cs
new file mode 100644
index 0000000000..dc965f9ff5
--- /dev/null
+++ b/src/ImageSharp/PixelFormats/RgbaVector.Definitions.cs
@@ -0,0 +1,723 @@
+// <copyright file="RgbaVector.Definitions.cs" company="James Jackson-South">
+// Copyright (c) James Jackson-South and contributors.
+// Licensed under the Apache License, Version 2.0.
+// </copyright>
+
+namespace ImageSharp.PixelFormats
+{
+    /// <content>
+    /// Provides operators and composition algorithms.
+    /// </content>
+    public partial struct RgbaVector
+    {
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #F0F8FF.
+        /// </summary>
+        public static readonly RgbaVector AliceBlue = NamedColors<RgbaVector>.AliceBlue;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #FAEBD7.
+        /// </summary>
+        public static readonly RgbaVector AntiqueWhite = NamedColors<RgbaVector>.AntiqueWhite;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #00FFFF.
+        /// </summary>
+        public static readonly RgbaVector Aqua = NamedColors<RgbaVector>.Aqua;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #7FFFD4.
+        /// </summary>
+        public static readonly RgbaVector Aquamarine = NamedColors<RgbaVector>.Aquamarine;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #F0FFFF.
+        /// </summary>
+        public static readonly RgbaVector Azure = NamedColors<RgbaVector>.Azure;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #F5F5DC.
+        /// </summary>
+        public static readonly RgbaVector Beige = NamedColors<RgbaVector>.Beige;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #FFE4C4.
+        /// </summary>
+        public static readonly RgbaVector Bisque = NamedColors<RgbaVector>.Bisque;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #000000.
+        /// </summary>
+        public static readonly RgbaVector Black = NamedColors<RgbaVector>.Black;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #FFEBCD.
+        /// </summary>
+        public static readonly RgbaVector BlanchedAlmond = NamedColors<RgbaVector>.BlanchedAlmond;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #0000FF.
+        /// </summary>
+        public static readonly RgbaVector Blue = NamedColors<RgbaVector>.Blue;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #8A2BE2.
+        /// </summary>
+        public static readonly RgbaVector BlueViolet = NamedColors<RgbaVector>.BlueViolet;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #A52A2A.
+        /// </summary>
+        public static readonly RgbaVector Brown = NamedColors<RgbaVector>.Brown;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #DEB887.
+        /// </summary>
+        public static readonly RgbaVector BurlyWood = NamedColors<RgbaVector>.BurlyWood;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #5F9EA0.
+        /// </summary>
+        public static readonly RgbaVector CadetBlue = NamedColors<RgbaVector>.CadetBlue;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #7FFF00.
+        /// </summary>
+        public static readonly RgbaVector Chartreuse = NamedColors<RgbaVector>.Chartreuse;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #D2691E.
+        /// </summary>
+        public static readonly RgbaVector Chocolate = NamedColors<RgbaVector>.Chocolate;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #FF7F50.
+        /// </summary>
+        public static readonly RgbaVector Coral = NamedColors<RgbaVector>.Coral;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #6495ED.
+        /// </summary>
+        public static readonly RgbaVector CornflowerBlue = NamedColors<RgbaVector>.CornflowerBlue;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #FFF8DC.
+        /// </summary>
+        public static readonly RgbaVector Cornsilk = NamedColors<RgbaVector>.Cornsilk;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #DC143C.
+        /// </summary>
+        public static readonly RgbaVector Crimson = NamedColors<RgbaVector>.Crimson;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #00FFFF.
+        /// </summary>
+        public static readonly RgbaVector Cyan = NamedColors<RgbaVector>.Cyan;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #00008B.
+        /// </summary>
+        public static readonly RgbaVector DarkBlue = NamedColors<RgbaVector>.DarkBlue;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #008B8B.
+        /// </summary>
+        public static readonly RgbaVector DarkCyan = NamedColors<RgbaVector>.DarkCyan;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #B8860B.
+        /// </summary>
+        public static readonly RgbaVector DarkGoldenrod = NamedColors<RgbaVector>.DarkGoldenrod;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #A9A9A9.
+        /// </summary>
+        public static readonly RgbaVector DarkGray = NamedColors<RgbaVector>.DarkGray;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #006400.
+        /// </summary>
+        public static readonly RgbaVector DarkGreen = NamedColors<RgbaVector>.DarkGreen;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #BDB76B.
+        /// </summary>
+        public static readonly RgbaVector DarkKhaki = NamedColors<RgbaVector>.DarkKhaki;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #8B008B.
+        /// </summary>
+        public static readonly RgbaVector DarkMagenta = NamedColors<RgbaVector>.DarkMagenta;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #556B2F.
+        /// </summary>
+        public static readonly RgbaVector DarkOliveGreen = NamedColors<RgbaVector>.DarkOliveGreen;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #FF8C00.
+        /// </summary>
+        public static readonly RgbaVector DarkOrange = NamedColors<RgbaVector>.DarkOrange;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #9932CC.
+        /// </summary>
+        public static readonly RgbaVector DarkOrchid = NamedColors<RgbaVector>.DarkOrchid;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #8B0000.
+        /// </summary>
+        public static readonly RgbaVector DarkRed = NamedColors<RgbaVector>.DarkRed;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #E9967A.
+        /// </summary>
+        public static readonly RgbaVector DarkSalmon = NamedColors<RgbaVector>.DarkSalmon;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #8FBC8B.
+        /// </summary>
+        public static readonly RgbaVector DarkSeaGreen = NamedColors<RgbaVector>.DarkSeaGreen;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #483D8B.
+        /// </summary>
+        public static readonly RgbaVector DarkSlateBlue = NamedColors<RgbaVector>.DarkSlateBlue;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #2F4F4F.
+        /// </summary>
+        public static readonly RgbaVector DarkSlateGray = NamedColors<RgbaVector>.DarkSlateGray;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #00CED1.
+        /// </summary>
+        public static readonly RgbaVector DarkTurquoise = NamedColors<RgbaVector>.DarkTurquoise;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #9400D3.
+        /// </summary>
+        public static readonly RgbaVector DarkViolet = NamedColors<RgbaVector>.DarkViolet;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #FF1493.
+        /// </summary>
+        public static readonly RgbaVector DeepPink = NamedColors<RgbaVector>.DeepPink;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #00BFFF.
+        /// </summary>
+        public static readonly RgbaVector DeepSkyBlue = NamedColors<RgbaVector>.DeepSkyBlue;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #696969.
+        /// </summary>
+        public static readonly RgbaVector DimGray = NamedColors<RgbaVector>.DimGray;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #1E90FF.
+        /// </summary>
+        public static readonly RgbaVector DodgerBlue = NamedColors<RgbaVector>.DodgerBlue;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #B22222.
+        /// </summary>
+        public static readonly RgbaVector Firebrick = NamedColors<RgbaVector>.Firebrick;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #FFFAF0.
+        /// </summary>
+        public static readonly RgbaVector FloralWhite = NamedColors<RgbaVector>.FloralWhite;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #228B22.
+        /// </summary>
+        public static readonly RgbaVector ForestGreen = NamedColors<RgbaVector>.ForestGreen;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #FF00FF.
+        /// </summary>
+        public static readonly RgbaVector Fuchsia = NamedColors<RgbaVector>.Fuchsia;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #DCDCDC.
+        /// </summary>
+        public static readonly RgbaVector Gainsboro = NamedColors<RgbaVector>.Gainsboro;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #F8F8FF.
+        /// </summary>
+        public static readonly RgbaVector GhostWhite = NamedColors<RgbaVector>.GhostWhite;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #FFD700.
+        /// </summary>
+        public static readonly RgbaVector Gold = NamedColors<RgbaVector>.Gold;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #DAA520.
+        /// </summary>
+        public static readonly RgbaVector Goldenrod = NamedColors<RgbaVector>.Goldenrod;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #808080.
+        /// </summary>
+        public static readonly RgbaVector Gray = NamedColors<RgbaVector>.Gray;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #008000.
+        /// </summary>
+        public static readonly RgbaVector Green = NamedColors<RgbaVector>.Green;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #ADFF2F.
+        /// </summary>
+        public static readonly RgbaVector GreenYellow = NamedColors<RgbaVector>.GreenYellow;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #F0FFF0.
+        /// </summary>
+        public static readonly RgbaVector Honeydew = NamedColors<RgbaVector>.Honeydew;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #FF69B4.
+        /// </summary>
+        public static readonly RgbaVector HotPink = NamedColors<RgbaVector>.HotPink;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #CD5C5C.
+        /// </summary>
+        public static readonly RgbaVector IndianRed = NamedColors<RgbaVector>.IndianRed;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #4B0082.
+        /// </summary>
+        public static readonly RgbaVector Indigo = NamedColors<RgbaVector>.Indigo;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #FFFFF0.
+        /// </summary>
+        public static readonly RgbaVector Ivory = NamedColors<RgbaVector>.Ivory;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #F0E68C.
+        /// </summary>
+        public static readonly RgbaVector Khaki = NamedColors<RgbaVector>.Khaki;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #E6E6FA.
+        /// </summary>
+        public static readonly RgbaVector Lavender = NamedColors<RgbaVector>.Lavender;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #FFF0F5.
+        /// </summary>
+        public static readonly RgbaVector LavenderBlush = NamedColors<RgbaVector>.LavenderBlush;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #7CFC00.
+        /// </summary>
+        public static readonly RgbaVector LawnGreen = NamedColors<RgbaVector>.LawnGreen;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #FFFACD.
+        /// </summary>
+        public static readonly RgbaVector LemonChiffon = NamedColors<RgbaVector>.LemonChiffon;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #ADD8E6.
+        /// </summary>
+        public static readonly RgbaVector LightBlue = NamedColors<RgbaVector>.LightBlue;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #F08080.
+        /// </summary>
+        public static readonly RgbaVector LightCoral = NamedColors<RgbaVector>.LightCoral;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #E0FFFF.
+        /// </summary>
+        public static readonly RgbaVector LightCyan = NamedColors<RgbaVector>.LightCyan;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #FAFAD2.
+        /// </summary>
+        public static readonly RgbaVector LightGoldenrodYellow = NamedColors<RgbaVector>.LightGoldenrodYellow;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #D3D3D3.
+        /// </summary>
+        public static readonly RgbaVector LightGray = NamedColors<RgbaVector>.LightGray;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #90EE90.
+        /// </summary>
+        public static readonly RgbaVector LightGreen = NamedColors<RgbaVector>.LightGreen;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #FFB6C1.
+        /// </summary>
+        public static readonly RgbaVector LightPink = NamedColors<RgbaVector>.LightPink;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #FFA07A.
+        /// </summary>
+        public static readonly RgbaVector LightSalmon = NamedColors<RgbaVector>.LightSalmon;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #20B2AA.
+        /// </summary>
+        public static readonly RgbaVector LightSeaGreen = NamedColors<RgbaVector>.LightSeaGreen;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #87CEFA.
+        /// </summary>
+        public static readonly RgbaVector LightSkyBlue = NamedColors<RgbaVector>.LightSkyBlue;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #778899.
+        /// </summary>
+        public static readonly RgbaVector LightSlateGray = NamedColors<RgbaVector>.LightSlateGray;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #B0C4DE.
+        /// </summary>
+        public static readonly RgbaVector LightSteelBlue = NamedColors<RgbaVector>.LightSteelBlue;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #FFFFE0.
+        /// </summary>
+        public static readonly RgbaVector LightYellow = NamedColors<RgbaVector>.LightYellow;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #00FF00.
+        /// </summary>
+        public static readonly RgbaVector Lime = NamedColors<RgbaVector>.Lime;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #32CD32.
+        /// </summary>
+        public static readonly RgbaVector LimeGreen = NamedColors<RgbaVector>.LimeGreen;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #FAF0E6.
+        /// </summary>
+        public static readonly RgbaVector Linen = NamedColors<RgbaVector>.Linen;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #FF00FF.
+        /// </summary>
+        public static readonly RgbaVector Magenta = NamedColors<RgbaVector>.Magenta;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #800000.
+        /// </summary>
+        public static readonly RgbaVector Maroon = NamedColors<RgbaVector>.Maroon;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #66CDAA.
+        /// </summary>
+        public static readonly RgbaVector MediumAquamarine = NamedColors<RgbaVector>.MediumAquamarine;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #0000CD.
+        /// </summary>
+        public static readonly RgbaVector MediumBlue = NamedColors<RgbaVector>.MediumBlue;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #BA55D3.
+        /// </summary>
+        public static readonly RgbaVector MediumOrchid = NamedColors<RgbaVector>.MediumOrchid;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #9370DB.
+        /// </summary>
+        public static readonly RgbaVector MediumPurple = NamedColors<RgbaVector>.MediumPurple;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #3CB371.
+        /// </summary>
+        public static readonly RgbaVector MediumSeaGreen = NamedColors<RgbaVector>.MediumSeaGreen;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #7B68EE.
+        /// </summary>
+        public static readonly RgbaVector MediumSlateBlue = NamedColors<RgbaVector>.MediumSlateBlue;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #00FA9A.
+        /// </summary>
+        public static readonly RgbaVector MediumSpringGreen = NamedColors<RgbaVector>.MediumSpringGreen;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #48D1CC.
+        /// </summary>
+        public static readonly RgbaVector MediumTurquoise = NamedColors<RgbaVector>.MediumTurquoise;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #C71585.
+        /// </summary>
+        public static readonly RgbaVector MediumVioletRed = NamedColors<RgbaVector>.MediumVioletRed;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #191970.
+        /// </summary>
+        public static readonly RgbaVector MidnightBlue = NamedColors<RgbaVector>.MidnightBlue;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #F5FFFA.
+        /// </summary>
+        public static readonly RgbaVector MintCream = NamedColors<RgbaVector>.MintCream;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #FFE4E1.
+        /// </summary>
+        public static readonly RgbaVector MistyRose = NamedColors<RgbaVector>.MistyRose;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #FFE4B5.
+        /// </summary>
+        public static readonly RgbaVector Moccasin = NamedColors<RgbaVector>.Moccasin;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #FFDEAD.
+        /// </summary>
+        public static readonly RgbaVector NavajoWhite = NamedColors<RgbaVector>.NavajoWhite;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #000080.
+        /// </summary>
+        public static readonly RgbaVector Navy = NamedColors<RgbaVector>.Navy;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #FDF5E6.
+        /// </summary>
+        public static readonly RgbaVector OldLace = NamedColors<RgbaVector>.OldLace;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #808000.
+        /// </summary>
+        public static readonly RgbaVector Olive = NamedColors<RgbaVector>.Olive;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #6B8E23.
+        /// </summary>
+        public static readonly RgbaVector OliveDrab = NamedColors<RgbaVector>.OliveDrab;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #FFA500.
+        /// </summary>
+        public static readonly RgbaVector Orange = NamedColors<RgbaVector>.Orange;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #FF4500.
+        /// </summary>
+        public static readonly RgbaVector OrangeRed = NamedColors<RgbaVector>.OrangeRed;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #DA70D6.
+        /// </summary>
+        public static readonly RgbaVector Orchid = NamedColors<RgbaVector>.Orchid;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #EEE8AA.
+        /// </summary>
+        public static readonly RgbaVector PaleGoldenrod = NamedColors<RgbaVector>.PaleGoldenrod;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #98FB98.
+        /// </summary>
+        public static readonly RgbaVector PaleGreen = NamedColors<RgbaVector>.PaleGreen;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #AFEEEE.
+        /// </summary>
+        public static readonly RgbaVector PaleTurquoise = NamedColors<RgbaVector>.PaleTurquoise;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #DB7093.
+        /// </summary>
+        public static readonly RgbaVector PaleVioletRed = NamedColors<RgbaVector>.PaleVioletRed;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #FFEFD5.
+        /// </summary>
+        public static readonly RgbaVector PapayaWhip = NamedColors<RgbaVector>.PapayaWhip;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #FFDAB9.
+        /// </summary>
+        public static readonly RgbaVector PeachPuff = NamedColors<RgbaVector>.PeachPuff;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #CD853F.
+        /// </summary>
+        public static readonly RgbaVector Peru = NamedColors<RgbaVector>.Peru;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #FFC0CB.
+        /// </summary>
+        public static readonly RgbaVector Pink = NamedColors<RgbaVector>.Pink;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #DDA0DD.
+        /// </summary>
+        public static readonly RgbaVector Plum = NamedColors<RgbaVector>.Plum;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #B0E0E6.
+        /// </summary>
+        public static readonly RgbaVector PowderBlue = NamedColors<RgbaVector>.PowderBlue;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #800080.
+        /// </summary>
+        public static readonly RgbaVector Purple = NamedColors<RgbaVector>.Purple;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #663399.
+        /// </summary>
+        public static readonly RgbaVector RebeccaPurple = NamedColors<RgbaVector>.RebeccaPurple;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #FF0000.
+        /// </summary>
+        public static readonly RgbaVector Red = NamedColors<RgbaVector>.Red;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #BC8F8F.
+        /// </summary>
+        public static readonly RgbaVector RosyBrown = NamedColors<RgbaVector>.RosyBrown;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #4169E1.
+        /// </summary>
+        public static readonly RgbaVector RoyalBlue = NamedColors<RgbaVector>.RoyalBlue;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #8B4513.
+        /// </summary>
+        public static readonly RgbaVector SaddleBrown = NamedColors<RgbaVector>.SaddleBrown;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #FA8072.
+        /// </summary>
+        public static readonly RgbaVector Salmon = NamedColors<RgbaVector>.Salmon;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #F4A460.
+        /// </summary>
+        public static readonly RgbaVector SandyBrown = NamedColors<RgbaVector>.SandyBrown;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #2E8B57.
+        /// </summary>
+        public static readonly RgbaVector SeaGreen = NamedColors<RgbaVector>.SeaGreen;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #FFF5EE.
+        /// </summary>
+        public static readonly RgbaVector SeaShell = NamedColors<RgbaVector>.SeaShell;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #A0522D.
+        /// </summary>
+        public static readonly RgbaVector Sienna = NamedColors<RgbaVector>.Sienna;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #C0C0C0.
+        /// </summary>
+        public static readonly RgbaVector Silver = NamedColors<RgbaVector>.Silver;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #87CEEB.
+        /// </summary>
+        public static readonly RgbaVector SkyBlue = NamedColors<RgbaVector>.SkyBlue;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #6A5ACD.
+        /// </summary>
+        public static readonly RgbaVector SlateBlue = NamedColors<RgbaVector>.SlateBlue;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #708090.
+        /// </summary>
+        public static readonly RgbaVector SlateGray = NamedColors<RgbaVector>.SlateGray;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #FFFAFA.
+        /// </summary>
+        public static readonly RgbaVector Snow = NamedColors<RgbaVector>.Snow;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #00FF7F.
+        /// </summary>
+        public static readonly RgbaVector SpringGreen = NamedColors<RgbaVector>.SpringGreen;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #4682B4.
+        /// </summary>
+        public static readonly RgbaVector SteelBlue = NamedColors<RgbaVector>.SteelBlue;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #D2B48C.
+        /// </summary>
+        public static readonly RgbaVector Tan = NamedColors<RgbaVector>.Tan;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #008080.
+        /// </summary>
+        public static readonly RgbaVector Teal = NamedColors<RgbaVector>.Teal;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #D8BFD8.
+        /// </summary>
+        public static readonly RgbaVector Thistle = NamedColors<RgbaVector>.Thistle;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #FF6347.
+        /// </summary>
+        public static readonly RgbaVector Tomato = NamedColors<RgbaVector>.Tomato;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #FFFFFF.
+        /// </summary>
+        public static readonly RgbaVector Transparent = NamedColors<RgbaVector>.Transparent;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #40E0D0.
+        /// </summary>
+        public static readonly RgbaVector Turquoise = NamedColors<RgbaVector>.Turquoise;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #EE82EE.
+        /// </summary>
+        public static readonly RgbaVector Violet = NamedColors<RgbaVector>.Violet;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #F5DEB3.
+        /// </summary>
+        public static readonly RgbaVector Wheat = NamedColors<RgbaVector>.Wheat;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #FFFFFF.
+        /// </summary>
+        public static readonly RgbaVector White = NamedColors<RgbaVector>.White;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #F5F5F5.
+        /// </summary>
+        public static readonly RgbaVector WhiteSmoke = NamedColors<RgbaVector>.WhiteSmoke;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #FFFF00.
+        /// </summary>
+        public static readonly RgbaVector Yellow = NamedColors<RgbaVector>.Yellow;
+
+        /// <summary>
+        /// Represents a <see cref="RgbaVector"/> matching the W3C definition that has an hex value of #9ACD32.
+        /// </summary>
+        public static readonly RgbaVector YellowGreen = NamedColors<RgbaVector>.YellowGreen;
+    }
+}
\ No newline at end of file
diff --git a/src/ImageSharp/Colors/ColorVector.Transforms.cs b/src/ImageSharp/PixelFormats/RgbaVector.Transforms.cs
similarity index 71%
rename from src/ImageSharp/Colors/ColorVector.Transforms.cs
rename to src/ImageSharp/PixelFormats/RgbaVector.Transforms.cs
index a884f2618c..fec1aa346e 100644
--- a/src/ImageSharp/Colors/ColorVector.Transforms.cs
+++ b/src/ImageSharp/PixelFormats/RgbaVector.Transforms.cs
@@ -1,22 +1,17 @@
-// <copyright file="ColorVector.Transforms.cs" company="James Jackson-South">
+// <copyright file="RgbaVector.Transforms.cs" company="James Jackson-South">
 // Copyright (c) James Jackson-South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
-namespace ImageSharp
+namespace ImageSharp.PixelFormats
 {
     using System.Numerics;
     using System.Runtime.CompilerServices;
 
-    /// <summary>
-    /// Unpacked pixel type containing four 16-bit floating-point values typically ranging from 0 to 1.
-    /// The color components are stored in red, green, blue, and alpha order.
-    /// </summary>
-    /// <remarks>
-    /// This struct is fully mutable. This is done (against the guidelines) for the sake of performance,
-    /// as it avoids the need to create new values for modification operations.
-    /// </remarks>
-    public partial struct ColorVector
+    /// <content>
+    /// Provides operators and composition algorithms.
+    /// </content>
+    public partial struct RgbaVector
     {
         /// <summary>
         /// Adds the second color to the first.
@@ -24,12 +19,12 @@ namespace ImageSharp
         /// <param name="left">The first source color.</param>
         /// <param name="right">The second source color.</param>
         /// <returns>
-        /// The <see cref="ColorVector"/>.
+        /// The <see cref="RgbaVector"/>.
         /// </returns>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static ColorVector operator +(ColorVector left, ColorVector right)
+        public static RgbaVector operator +(RgbaVector left, RgbaVector right)
         {
-            return new ColorVector(left.backingVector + right.backingVector);
+            return new RgbaVector(left.backingVector + right.backingVector);
         }
 
         /// <summary>
@@ -38,12 +33,12 @@ namespace ImageSharp
         /// <param name="left">The first source color.</param>
         /// <param name="right">The second source color.</param>
         /// <returns>
-        /// The <see cref="ColorVector"/>.
+        /// The <see cref="RgbaVector"/>.
         /// </returns>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static ColorVector operator -(ColorVector left, ColorVector right)
+        public static RgbaVector operator -(RgbaVector left, RgbaVector right)
         {
-            return new ColorVector(left.backingVector - right.backingVector);
+            return new RgbaVector(left.backingVector - right.backingVector);
         }
 
         /// <summary>
@@ -52,12 +47,12 @@ namespace ImageSharp
         /// <param name="backdrop">The backdrop color.</param>
         /// <param name="source">The source color.</param>
         /// <returns>
-        /// The <see cref="ColorVector"/>.
+        /// The <see cref="RgbaVector"/>.
         /// </returns>
-        public static ColorVector Normal(ColorVector backdrop, ColorVector source)
+        public static RgbaVector Normal(RgbaVector backdrop, RgbaVector source)
         {
             Vector4 normal = Vector4BlendTransforms.Normal(backdrop.backingVector, source.backingVector);
-            return new ColorVector(normal);
+            return new RgbaVector(normal);
         }
 
         /// <summary>
@@ -72,12 +67,12 @@ namespace ImageSharp
         /// <param name="backdrop">The backdrop color.</param>
         /// <param name="source">The source color.</param>
         /// <returns>
-        /// The <see cref="ColorVector"/>.
+        /// The <see cref="RgbaVector"/>.
         /// </returns>
-        public static ColorVector Multiply(ColorVector backdrop, ColorVector source)
+        public static RgbaVector Multiply(RgbaVector backdrop, RgbaVector source)
         {
             Vector4 multiply = Vector4BlendTransforms.Multiply(backdrop.backingVector, source.backingVector);
-            return new ColorVector(multiply);
+            return new RgbaVector(multiply);
         }
 
         /// <summary>
@@ -91,12 +86,12 @@ namespace ImageSharp
         /// <param name="backdrop">The backdrop color.</param>
         /// <param name="source">The source color.</param>
         /// <returns>
-        /// The <see cref="ColorVector"/>.
+        /// The <see cref="RgbaVector"/>.
         /// </returns>
-        public static ColorVector Screen(ColorVector backdrop, ColorVector source)
+        public static RgbaVector Screen(RgbaVector backdrop, RgbaVector source)
         {
             Vector4 subtract = Vector4BlendTransforms.Screen(backdrop.backingVector, source.backingVector);
-            return new ColorVector(subtract);
+            return new RgbaVector(subtract);
         }
 
         /// <summary>
@@ -106,12 +101,12 @@ namespace ImageSharp
         /// <param name="backdrop">The backdrop color.</param>
         /// <param name="source">The source color.</param>
         /// <returns>
-        /// The <see cref="ColorVector"/>.
+        /// The <see cref="RgbaVector"/>.
         /// </returns>
-        public static ColorVector HardLight(ColorVector backdrop, ColorVector source)
+        public static RgbaVector HardLight(RgbaVector backdrop, RgbaVector source)
         {
             Vector4 hardlight = Vector4BlendTransforms.HardLight(backdrop.backingVector, source.backingVector);
-            return new ColorVector(hardlight);
+            return new RgbaVector(hardlight);
         }
 
         /// <summary>
@@ -125,12 +120,12 @@ namespace ImageSharp
         /// <param name="backdrop">The backdrop color.</param>
         /// <param name="source">The source color.</param>
         /// <returns>
-        /// The <see cref="ColorVector"/>.
+        /// The <see cref="RgbaVector"/>.
         /// </returns>
-        public static ColorVector Overlay(ColorVector backdrop, ColorVector source)
+        public static RgbaVector Overlay(RgbaVector backdrop, RgbaVector source)
         {
             Vector4 overlay = Vector4BlendTransforms.Overlay(backdrop.backingVector, source.backingVector);
-            return new ColorVector(overlay);
+            return new RgbaVector(overlay);
         }
 
         /// <summary>
@@ -140,12 +135,12 @@ namespace ImageSharp
         /// <param name="backdrop">The backdrop color.</param>
         /// <param name="source">The source color.</param>
         /// <returns>
-        /// The <see cref="ColorVector"/>.
+        /// The <see cref="RgbaVector"/>.
         /// </returns>
-        public static ColorVector Darken(ColorVector backdrop, ColorVector source)
+        public static RgbaVector Darken(RgbaVector backdrop, RgbaVector source)
         {
             Vector4 darken = Vector4BlendTransforms.Darken(backdrop.backingVector, source.backingVector);
-            return new ColorVector(darken);
+            return new RgbaVector(darken);
         }
 
         /// <summary>
@@ -155,12 +150,12 @@ namespace ImageSharp
         /// <param name="backdrop">The backdrop color.</param>
         /// <param name="source">The source color.</param>
         /// <returns>
-        /// The <see cref="ColorVector"/>.
+        /// The <see cref="RgbaVector"/>.
         /// </returns>
-        public static ColorVector Lighten(ColorVector backdrop, ColorVector source)
+        public static RgbaVector Lighten(RgbaVector backdrop, RgbaVector source)
         {
             Vector4 lighten = Vector4BlendTransforms.Lighten(backdrop.backingVector, source.backingVector);
-            return new ColorVector(lighten);
+            return new RgbaVector(lighten);
         }
 
         /// <summary>
@@ -170,12 +165,12 @@ namespace ImageSharp
         /// <param name="backdrop">The backdrop color.</param>
         /// <param name="source">The source color.</param>
         /// <returns>
-        /// The <see cref="ColorVector"/>.
+        /// The <see cref="RgbaVector"/>.
         /// </returns>
-        public static ColorVector SoftLight(ColorVector backdrop, ColorVector source)
+        public static RgbaVector SoftLight(RgbaVector backdrop, RgbaVector source)
         {
             Vector4 softlight = Vector4BlendTransforms.SoftLight(backdrop.backingVector, source.backingVector);
-            return new ColorVector(softlight);
+            return new RgbaVector(softlight);
         }
 
         /// <summary>
@@ -184,12 +179,12 @@ namespace ImageSharp
         /// <param name="backdrop">The backdrop color.</param>
         /// <param name="source">The source color.</param>
         /// <returns>
-        /// The <see cref="ColorVector"/>.
+        /// The <see cref="RgbaVector"/>.
         /// </returns>
-        public static ColorVector ColorDodge(ColorVector backdrop, ColorVector source)
+        public static RgbaVector ColorDodge(RgbaVector backdrop, RgbaVector source)
         {
             Vector4 dodge = Vector4BlendTransforms.Dodge(backdrop.backingVector, source.backingVector);
-            return new ColorVector(dodge);
+            return new RgbaVector(dodge);
         }
 
         /// <summary>
@@ -198,12 +193,12 @@ namespace ImageSharp
         /// <param name="backdrop">The backdrop color.</param>
         /// <param name="source">The source color.</param>
         /// <returns>
-        /// The <see cref="ColorVector"/>.
+        /// The <see cref="RgbaVector"/>.
         /// </returns>
-        public static ColorVector ColorBurn(ColorVector backdrop, ColorVector source)
+        public static RgbaVector ColorBurn(RgbaVector backdrop, RgbaVector source)
         {
             Vector4 burn = Vector4BlendTransforms.Burn(backdrop.backingVector, source.backingVector);
-            return new ColorVector(burn);
+            return new RgbaVector(burn);
         }
 
         /// <summary>
@@ -213,12 +208,12 @@ namespace ImageSharp
         /// <param name="backdrop">The backdrop color.</param>
         /// <param name="source">The source color.</param>
         /// <returns>
-        /// The <see cref="ColorVector"/>.
+        /// The <see cref="RgbaVector"/>.
         /// </returns>
-        public static ColorVector Difference(ColorVector backdrop, ColorVector source)
+        public static RgbaVector Difference(RgbaVector backdrop, RgbaVector source)
         {
             Vector4 difference = Vector4BlendTransforms.Difference(backdrop.backingVector, source.backingVector);
-            return new ColorVector(difference);
+            return new RgbaVector(difference);
         }
 
         /// <summary>
@@ -228,12 +223,12 @@ namespace ImageSharp
         /// <param name="backdrop">The backdrop color.</param>
         /// <param name="source">The source color.</param>
         /// <returns>
-        /// The <see cref="ColorVector"/>.
+        /// The <see cref="RgbaVector"/>.
         /// </returns>
-        public static ColorVector Exclusion(ColorVector backdrop, ColorVector source)
+        public static RgbaVector Exclusion(RgbaVector backdrop, RgbaVector source)
         {
             Vector4 exclusion = Vector4BlendTransforms.Exclusion(backdrop.backingVector, source.backingVector);
-            return new ColorVector(exclusion);
+            return new RgbaVector(exclusion);
         }
 
         /// <summary>
@@ -246,11 +241,11 @@ namespace ImageSharp
         /// At amount = 0, "from" is returned, at amount = 1, "to" is returned.
         /// </param>
         /// <returns>
-        /// The <see cref="ColorVector"/>
+        /// The <see cref="RgbaVector"/>
         /// </returns>
-        public static ColorVector Lerp(ColorVector from, ColorVector to, float amount)
+        public static RgbaVector Lerp(RgbaVector from, RgbaVector to, float amount)
         {
-            return new ColorVector(Vector4.Lerp(from.backingVector, to.backingVector, amount));
+            return new RgbaVector(Vector4.Lerp(from.backingVector, to.backingVector, amount));
         }
     }
 }
\ No newline at end of file
diff --git a/src/ImageSharp/Colors/ColorVector.cs b/src/ImageSharp/PixelFormats/RgbaVector.cs
similarity index 83%
rename from src/ImageSharp/Colors/ColorVector.cs
rename to src/ImageSharp/PixelFormats/RgbaVector.cs
index 06ee5b805c..c59e932590 100644
--- a/src/ImageSharp/Colors/ColorVector.cs
+++ b/src/ImageSharp/PixelFormats/RgbaVector.cs
@@ -1,9 +1,9 @@
-// <copyright file="ColorVector.cs" company="James Jackson-South">
+// <copyright file="RgbaVector.cs" company="James Jackson-South">
 // Copyright (c) James Jackson-South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
-namespace ImageSharp
+namespace ImageSharp.PixelFormats
 {
     using System.Numerics;
     using System.Runtime.CompilerServices;
@@ -11,12 +11,13 @@ namespace ImageSharp
     /// <summary>
     /// Unpacked pixel type containing four 16-bit floating-point values typically ranging from 0 to 1.
     /// The color components are stored in red, green, blue, and alpha order.
+    /// Ranges from &lt;0, 0, 0, 0&gt; to &lt;1, 1, 1, 1&gt; in vector form.
     /// </summary>
     /// <remarks>
     /// This struct is fully mutable. This is done (against the guidelines) for the sake of performance,
     /// as it avoids the need to create new values for modification operations.
     /// </remarks>
-    public partial struct ColorVector : IPixel<ColorVector>
+    public partial struct RgbaVector : IPixel<RgbaVector>
     {
         /// <summary>
         /// The maximum byte value.
@@ -34,54 +35,54 @@ namespace ImageSharp
         private Vector4 backingVector;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="ColorVector"/> struct.
+        /// Initializes a new instance of the <see cref="RgbaVector"/> struct.
         /// </summary>
         /// <param name="r">The red component.</param>
         /// <param name="g">The green component.</param>
         /// <param name="b">The blue component.</param>
         /// <param name="a">The alpha component.</param>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public ColorVector(byte r, byte g, byte b, byte a = 255)
+        public RgbaVector(byte r, byte g, byte b, byte a = 255)
             : this()
         {
             this.backingVector = new Vector4(r, g, b, a) / MaxBytes;
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="ColorVector"/> struct.
+        /// Initializes a new instance of the <see cref="RgbaVector"/> struct.
         /// </summary>
         /// <param name="r">The red component.</param>
         /// <param name="g">The green component.</param>
         /// <param name="b">The blue component.</param>
         /// <param name="a">The alpha component.</param>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public ColorVector(float r, float g, float b, float a = 1)
+        public RgbaVector(float r, float g, float b, float a = 1)
             : this()
         {
             this.backingVector = new Vector4(r, g, b, a);
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="ColorVector"/> struct.
+        /// Initializes a new instance of the <see cref="RgbaVector"/> struct.
         /// </summary>
         /// <param name="vector">
         /// The vector containing the components for the packed vector.
         /// </param>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public ColorVector(Vector3 vector)
+        public RgbaVector(Vector3 vector)
             : this()
         {
             this.backingVector = new Vector4(vector, 1);
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="ColorVector"/> struct.
+        /// Initializes a new instance of the <see cref="RgbaVector"/> struct.
         /// </summary>
         /// <param name="vector">
         /// The vector containing the components for the packed vector.
         /// </param>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public ColorVector(Vector4 vector)
+        public RgbaVector(Vector4 vector)
             : this()
         {
             this.backingVector = vector;
@@ -160,54 +161,54 @@ namespace ImageSharp
         }
 
         /// <summary>
-        /// Compares two <see cref="ColorVector"/> objects for equality.
+        /// Compares two <see cref="RgbaVector"/> objects for equality.
         /// </summary>
         /// <param name="left">
-        /// The <see cref="ColorVector"/> on the left side of the operand.
+        /// The <see cref="RgbaVector"/> on the left side of the operand.
         /// </param>
         /// <param name="right">
-        /// The <see cref="ColorVector"/> on the right side of the operand.
+        /// The <see cref="RgbaVector"/> on the right side of the operand.
         /// </param>
         /// <returns>
         /// True if the <paramref name="left"/> parameter is equal to the <paramref name="right"/> parameter; otherwise, false.
         /// </returns>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static bool operator ==(ColorVector left, ColorVector right)
+        public static bool operator ==(RgbaVector left, RgbaVector right)
         {
             return left.backingVector == right.backingVector;
         }
 
         /// <summary>
-        /// Compares two <see cref="ColorVector"/> objects for equality.
+        /// Compares two <see cref="RgbaVector"/> objects for equality.
         /// </summary>
-        /// <param name="left">The <see cref="ColorVector"/> on the left side of the operand.</param>
-        /// <param name="right">The <see cref="ColorVector"/> on the right side of the operand.</param>
+        /// <param name="left">The <see cref="RgbaVector"/> on the left side of the operand.</param>
+        /// <param name="right">The <see cref="RgbaVector"/> on the right side of the operand.</param>
         /// <returns>
         /// True if the <paramref name="left"/> parameter is not equal to the <paramref name="right"/> parameter; otherwise, false.
         /// </returns>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static bool operator !=(ColorVector left, ColorVector right)
+        public static bool operator !=(RgbaVector left, RgbaVector right)
         {
             return left.backingVector != right.backingVector;
         }
 
         /// <summary>
-        /// Creates a new instance of the <see cref="ColorVector"/> struct.
+        /// Creates a new instance of the <see cref="RgbaVector"/> struct.
         /// </summary>
         /// <param name="hex">
         /// The hexadecimal representation of the combined color components arranged
         /// in rgb, rgba, rrggbb, or rrggbbaa format to match web syntax.
         /// </param>
         /// <returns>
-        /// The <see cref="ColorVector"/>.
+        /// The <see cref="RgbaVector"/>.
         /// </returns>
-        public static ColorVector FromHex(string hex)
+        public static RgbaVector FromHex(string hex)
         {
-            return ColorBuilder<ColorVector>.FromHex(hex);
+            return ColorBuilder<RgbaVector>.FromHex(hex);
         }
 
         /// <inheritdoc />
-        public BulkPixelOperations<ColorVector> CreateBulkOperations() => new ColorVector.BulkOperations();
+        public BulkPixelOperations<RgbaVector> CreateBulkOperations() => new RgbaVector.BulkOperations();
 
         /// <inheritdoc/>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -292,12 +293,12 @@ namespace ImageSharp
         /// <inheritdoc/>
         public override bool Equals(object obj)
         {
-            return (obj is ColorVector) && this.Equals((ColorVector)obj);
+            return (obj is RgbaVector) && this.Equals((RgbaVector)obj);
         }
 
         /// <inheritdoc/>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public bool Equals(ColorVector other)
+        public bool Equals(RgbaVector other)
         {
             return this.backingVector == other.backingVector;
         }
diff --git a/src/ImageSharp/Colors/PackedPixel/Short2.cs b/src/ImageSharp/PixelFormats/Short2.cs
similarity index 98%
rename from src/ImageSharp/Colors/PackedPixel/Short2.cs
rename to src/ImageSharp/PixelFormats/Short2.cs
index 167a1e786f..60fbb5b35e 100644
--- a/src/ImageSharp/Colors/PackedPixel/Short2.cs
+++ b/src/ImageSharp/PixelFormats/Short2.cs
@@ -3,7 +3,7 @@
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
-namespace ImageSharp
+namespace ImageSharp.PixelFormats
 {
     using System;
     using System.Numerics;
@@ -11,6 +11,7 @@ namespace ImageSharp
 
     /// <summary>
     /// Packed pixel type containing two 16-bit signed integer values.
+    /// Ranges from &lt;-32767, -32767, 0, 1&gt; to &lt;32767, 32767, 0, 1&gt; in vector form.
     /// </summary>
     public struct Short2 : IPixel<Short2>, IPackedVector<uint>
     {
diff --git a/src/ImageSharp/Colors/PackedPixel/Short4.cs b/src/ImageSharp/PixelFormats/Short4.cs
similarity index 98%
rename from src/ImageSharp/Colors/PackedPixel/Short4.cs
rename to src/ImageSharp/PixelFormats/Short4.cs
index e1a559c326..65ce51eb21 100644
--- a/src/ImageSharp/Colors/PackedPixel/Short4.cs
+++ b/src/ImageSharp/PixelFormats/Short4.cs
@@ -3,7 +3,7 @@
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
-namespace ImageSharp
+namespace ImageSharp.PixelFormats
 {
     using System;
     using System.Numerics;
@@ -11,6 +11,7 @@ namespace ImageSharp
 
     /// <summary>
     /// Packed pixel type containing four 16-bit signed integer values.
+    /// Ranges from &lt;-37267, -37267, -37267, -37267&gt; to &lt;37267, 37267, 37267, 37267&gt; in vector form.
     /// </summary>
     public struct Short4 : IPixel<Short4>, IPackedVector<ulong>
     {
diff --git a/src/ImageSharp/Colors/Vector4BlendTransforms.cs b/src/ImageSharp/PixelFormats/Vector4BlendTransforms.cs
similarity index 99%
rename from src/ImageSharp/Colors/Vector4BlendTransforms.cs
rename to src/ImageSharp/PixelFormats/Vector4BlendTransforms.cs
index a7e2e0e919..87c7a289ed 100644
--- a/src/ImageSharp/Colors/Vector4BlendTransforms.cs
+++ b/src/ImageSharp/PixelFormats/Vector4BlendTransforms.cs
@@ -3,7 +3,7 @@
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
-namespace ImageSharp
+namespace ImageSharp.PixelFormats
 {
     using System.Numerics;
 
@@ -289,4 +289,4 @@ namespace ImageSharp
             return b + s - (2F * b * s);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/ImageSharp/Processing/Binarization/BinaryThreshold.cs b/src/ImageSharp/Processing/Binarization/BinaryThreshold.cs
index 672726d929..f50616aa30 100644
--- a/src/ImageSharp/Processing/Binarization/BinaryThreshold.cs
+++ b/src/ImageSharp/Processing/Binarization/BinaryThreshold.cs
@@ -7,22 +7,24 @@ namespace ImageSharp
 {
     using System;
 
+    using ImageSharp.PixelFormats;
+
     using Processing.Processors;
 
     /// <summary>
-    /// Extension methods for the <see cref="Image{TColor}"/> type.
+    /// Extension methods for the <see cref="Image{TPixel}"/> type.
     /// </summary>
     public static partial class ImageExtensions
     {
         /// <summary>
         /// Applies binarization to the image splitting the pixels at the given threshold.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="threshold">The threshold to apply binarization of the image. Must be between 0 and 1.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> BinaryThreshold<TColor>(this Image<TColor> source, float threshold)
-            where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> BinaryThreshold<TPixel>(this Image<TPixel> source, float threshold)
+            where TPixel : struct, IPixel<TPixel>
         {
             return BinaryThreshold(source, threshold, source.Bounds);
         }
@@ -30,17 +32,17 @@ namespace ImageSharp
         /// <summary>
         /// Applies binarization to the image splitting the pixels at the given threshold.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="threshold">The threshold to apply binarization of the image. Must be between 0 and 1.</param>
         /// <param name="rectangle">
         /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to alter.
         /// </param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> BinaryThreshold<TColor>(this Image<TColor> source, float threshold, Rectangle rectangle)
-            where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> BinaryThreshold<TPixel>(this Image<TPixel> source, float threshold, Rectangle rectangle)
+            where TPixel : struct, IPixel<TPixel>
         {
-            source.ApplyProcessor(new BinaryThresholdProcessor<TColor>(threshold), rectangle);
+            source.ApplyProcessor(new BinaryThresholdProcessor<TPixel>(threshold), rectangle);
             return source;
         }
     }
diff --git a/src/ImageSharp/Processing/Binarization/Dither.cs b/src/ImageSharp/Processing/Binarization/Dither.cs
index dd6dfe8a14..617883d6aa 100644
--- a/src/ImageSharp/Processing/Binarization/Dither.cs
+++ b/src/ImageSharp/Processing/Binarization/Dither.cs
@@ -8,6 +8,7 @@ namespace ImageSharp
     using System;
 
     using ImageSharp.Dithering;
+    using ImageSharp.PixelFormats;
     using ImageSharp.Processing.Processors;
 
     /// <summary>
@@ -18,13 +19,13 @@ namespace ImageSharp
         /// <summary>
         /// Dithers the image reducing it to two colors using ordered dithering.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="dither">The ordered ditherer.</param>
         /// <param name="index">The component index to test the threshold against. Must range from 0 to 3.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Dither<TColor>(this Image<TColor> source, IOrderedDither dither, int index = 0)
-            where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Dither<TPixel>(this Image<TPixel> source, IOrderedDither dither, int index = 0)
+            where TPixel : struct, IPixel<TPixel>
         {
             return Dither(source, dither, source.Bounds, index);
         }
@@ -32,7 +33,7 @@ namespace ImageSharp
         /// <summary>
         /// Dithers the image reducing it to two colors using ordered dithering.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="dither">The ordered ditherer.</param>
         /// <param name="rectangle">
@@ -40,23 +41,23 @@ namespace ImageSharp
         /// </param>
         /// <param name="index">The component index to test the threshold against. Must range from 0 to 3.</param>
         /// <returns>The <see cref="Image"/>.</returns>
-        public static Image<TColor> Dither<TColor>(this Image<TColor> source, IOrderedDither dither, Rectangle rectangle, int index = 0)
-            where TColor : struct, IPixel<TColor>
+        public static Image<TPixel> Dither<TPixel>(this Image<TPixel> source, IOrderedDither dither, Rectangle rectangle, int index = 0)
+            where TPixel : struct, IPixel<TPixel>
         {
-            source.ApplyProcessor(new OrderedDitherProcessor<TColor>(dither, index), rectangle);
+            source.ApplyProcessor(new OrderedDitherProcessor<TPixel>(dither, index), rectangle);
             return source;
         }
 
         /// <summary>
         /// Dithers the image reducing it to two colors using error diffusion.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="diffuser">The diffusion algorithm to apply.</param>
         /// <param name="threshold">The threshold to apply binarization of the image. Must be between 0 and 1.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Dither<TColor>(this Image<TColor> source, IErrorDiffuser diffuser, float threshold)
-            where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Dither<TPixel>(this Image<TPixel> source, IErrorDiffuser diffuser, float threshold)
+            where TPixel : struct, IPixel<TPixel>
         {
             return Dither(source, diffuser, threshold, source.Bounds);
         }
@@ -64,7 +65,7 @@ namespace ImageSharp
         /// <summary>
         /// Dithers the image reducing it to two colors using error diffusion.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="diffuser">The diffusion algorithm to apply.</param>
         /// <param name="threshold">The threshold to apply binarization of the image. Must be between 0 and 1.</param>
@@ -72,10 +73,10 @@ namespace ImageSharp
         /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to alter.
         /// </param>
         /// <returns>The <see cref="Image"/>.</returns>
-        public static Image<TColor> Dither<TColor>(this Image<TColor> source, IErrorDiffuser diffuser, float threshold, Rectangle rectangle)
-            where TColor : struct, IPixel<TColor>
+        public static Image<TPixel> Dither<TPixel>(this Image<TPixel> source, IErrorDiffuser diffuser, float threshold, Rectangle rectangle)
+            where TPixel : struct, IPixel<TPixel>
         {
-            source.ApplyProcessor(new ErrorDiffusionDitherProcessor<TColor>(diffuser, threshold), rectangle);
+            source.ApplyProcessor(new ErrorDiffusionDitherProcessor<TPixel>(diffuser, threshold), rectangle);
             return source;
         }
     }
diff --git a/src/ImageSharp/Processing/ColorMatrix/BlackWhite.cs b/src/ImageSharp/Processing/ColorMatrix/BlackWhite.cs
index 63d6dd33c5..76977455a4 100644
--- a/src/ImageSharp/Processing/ColorMatrix/BlackWhite.cs
+++ b/src/ImageSharp/Processing/ColorMatrix/BlackWhite.cs
@@ -7,22 +7,24 @@ namespace ImageSharp
 {
     using System;
 
+    using ImageSharp.PixelFormats;
+
     using Processing;
     using Processing.Processors;
 
     /// <summary>
-    /// Extension methods for the <see cref="Image{TColor}"/> type.
+    /// Extension methods for the <see cref="Image{TPixel}"/> type.
     /// </summary>
     public static partial class ImageExtensions
     {
         /// <summary>
         /// Applies black and white toning to the image.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> BlackWhite<TColor>(this Image<TColor> source)
-            where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> BlackWhite<TPixel>(this Image<TPixel> source)
+            where TPixel : struct, IPixel<TPixel>
         {
             return BlackWhite(source, source.Bounds);
         }
@@ -30,16 +32,16 @@ namespace ImageSharp
         /// <summary>
         /// Applies black and white toning to the image.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="rectangle">
         /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to alter.
         /// </param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> BlackWhite<TColor>(this Image<TColor> source, Rectangle rectangle)
-            where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> BlackWhite<TPixel>(this Image<TPixel> source, Rectangle rectangle)
+            where TPixel : struct, IPixel<TPixel>
         {
-            source.ApplyProcessor(new BlackWhiteProcessor<TColor>(), rectangle);
+            source.ApplyProcessor(new BlackWhiteProcessor<TPixel>(), rectangle);
             return source;
         }
     }
diff --git a/src/ImageSharp/Processing/ColorMatrix/ColorBlindness.cs b/src/ImageSharp/Processing/ColorMatrix/ColorBlindness.cs
index 36a139d0ea..d012d6fe2b 100644
--- a/src/ImageSharp/Processing/ColorMatrix/ColorBlindness.cs
+++ b/src/ImageSharp/Processing/ColorMatrix/ColorBlindness.cs
@@ -7,23 +7,25 @@ namespace ImageSharp
 {
     using System;
 
+    using ImageSharp.PixelFormats;
+
     using Processing;
     using Processing.Processors;
 
     /// <summary>
-    /// Extension methods for the <see cref="Image{TColor}"/> type.
+    /// Extension methods for the <see cref="Image{TPixel}"/> type.
     /// </summary>
     public static partial class ImageExtensions
     {
         /// <summary>
         /// Applies the given colorblindness simulator to the image.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="colorBlindness">The type of color blindness simulator to apply.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> ColorBlindness<TColor>(this Image<TColor> source, ColorBlindness colorBlindness)
-            where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> ColorBlindness<TPixel>(this Image<TPixel> source, ColorBlindness colorBlindness)
+            where TPixel : struct, IPixel<TPixel>
         {
             return ColorBlindness(source, colorBlindness, source.Bounds);
         }
@@ -31,50 +33,50 @@ namespace ImageSharp
         /// <summary>
         /// Applies the given colorblindness simulator to the image.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="colorBlindness">The type of color blindness simulator to apply.</param>
         /// <param name="rectangle">
         /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to alter.
         /// </param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> ColorBlindness<TColor>(this Image<TColor> source, ColorBlindness colorBlindness, Rectangle rectangle)
-            where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> ColorBlindness<TPixel>(this Image<TPixel> source, ColorBlindness colorBlindness, Rectangle rectangle)
+            where TPixel : struct, IPixel<TPixel>
         {
-            IImageProcessor<TColor> processor;
+            IImageProcessor<TPixel> processor;
 
             switch (colorBlindness)
             {
                 case ImageSharp.Processing.ColorBlindness.Achromatomaly:
-                    processor = new AchromatomalyProcessor<TColor>();
+                    processor = new AchromatomalyProcessor<TPixel>();
                     break;
 
                 case ImageSharp.Processing.ColorBlindness.Achromatopsia:
-                    processor = new AchromatopsiaProcessor<TColor>();
+                    processor = new AchromatopsiaProcessor<TPixel>();
                     break;
 
                 case ImageSharp.Processing.ColorBlindness.Deuteranomaly:
-                    processor = new DeuteranomalyProcessor<TColor>();
+                    processor = new DeuteranomalyProcessor<TPixel>();
                     break;
 
                 case ImageSharp.Processing.ColorBlindness.Deuteranopia:
-                    processor = new DeuteranopiaProcessor<TColor>();
+                    processor = new DeuteranopiaProcessor<TPixel>();
                     break;
 
                 case ImageSharp.Processing.ColorBlindness.Protanomaly:
-                    processor = new ProtanomalyProcessor<TColor>();
+                    processor = new ProtanomalyProcessor<TPixel>();
                     break;
 
                 case ImageSharp.Processing.ColorBlindness.Protanopia:
-                    processor = new ProtanopiaProcessor<TColor>();
+                    processor = new ProtanopiaProcessor<TPixel>();
                     break;
 
                 case ImageSharp.Processing.ColorBlindness.Tritanomaly:
-                    processor = new TritanomalyProcessor<TColor>();
+                    processor = new TritanomalyProcessor<TPixel>();
                     break;
 
                 default:
-                    processor = new TritanopiaProcessor<TColor>();
+                    processor = new TritanopiaProcessor<TPixel>();
                     break;
             }
 
diff --git a/src/ImageSharp/Processing/ColorMatrix/Grayscale.cs b/src/ImageSharp/Processing/ColorMatrix/Grayscale.cs
index 613b999d44..8700b63e88 100644
--- a/src/ImageSharp/Processing/ColorMatrix/Grayscale.cs
+++ b/src/ImageSharp/Processing/ColorMatrix/Grayscale.cs
@@ -7,23 +7,25 @@ namespace ImageSharp
 {
     using System;
 
+    using ImageSharp.PixelFormats;
+
     using Processing;
     using Processing.Processors;
 
     /// <summary>
-    /// Extension methods for the <see cref="Image{TColor}"/> type.
+    /// Extension methods for the <see cref="Image{TPixel}"/> type.
     /// </summary>
     public static partial class ImageExtensions
     {
         /// <summary>
         /// Applies Grayscale toning to the image.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="mode">The formula to apply to perform the operation.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Grayscale<TColor>(this Image<TColor> source, GrayscaleMode mode = GrayscaleMode.Bt709)
-            where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Grayscale<TPixel>(this Image<TPixel> source, GrayscaleMode mode = GrayscaleMode.Bt709)
+            where TPixel : struct, IPixel<TPixel>
         {
             return Grayscale(source, source.Bounds, mode);
         }
@@ -31,19 +33,19 @@ namespace ImageSharp
         /// <summary>
         /// Applies Grayscale toning to the image.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="rectangle">
         /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to alter.
         /// </param>
         /// <param name="mode">The formula to apply to perform the operation.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Grayscale<TColor>(this Image<TColor> source, Rectangle rectangle, GrayscaleMode mode = GrayscaleMode.Bt709)
-            where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Grayscale<TPixel>(this Image<TPixel> source, Rectangle rectangle, GrayscaleMode mode = GrayscaleMode.Bt709)
+            where TPixel : struct, IPixel<TPixel>
         {
-            IImageProcessor<TColor> processor = mode == GrayscaleMode.Bt709
-                ? (IImageProcessor<TColor>)new GrayscaleBt709Processor<TColor>()
-                : new GrayscaleBt601Processor<TColor>();
+            IImageProcessor<TPixel> processor = mode == GrayscaleMode.Bt709
+                ? (IImageProcessor<TPixel>)new GrayscaleBt709Processor<TPixel>()
+                : new GrayscaleBt601Processor<TPixel>();
 
             source.ApplyProcessor(processor, rectangle);
             return source;
diff --git a/src/ImageSharp/Processing/ColorMatrix/Hue.cs b/src/ImageSharp/Processing/ColorMatrix/Hue.cs
index 8edeb2ff31..8dbc555307 100644
--- a/src/ImageSharp/Processing/ColorMatrix/Hue.cs
+++ b/src/ImageSharp/Processing/ColorMatrix/Hue.cs
@@ -7,23 +7,25 @@ namespace ImageSharp
 {
     using System;
 
+    using ImageSharp.PixelFormats;
+
     using Processing;
     using Processing.Processors;
 
     /// <summary>
-    /// Extension methods for the <see cref="Image{TColor}"/> type.
+    /// Extension methods for the <see cref="Image{TPixel}"/> type.
     /// </summary>
     public static partial class ImageExtensions
     {
         /// <summary>
         /// Alters the hue component of the image.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="degrees">The angle in degrees to adjust the image.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Hue<TColor>(this Image<TColor> source, float degrees)
-            where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Hue<TPixel>(this Image<TPixel> source, float degrees)
+            where TPixel : struct, IPixel<TPixel>
         {
             return Hue(source, degrees, source.Bounds);
         }
@@ -31,17 +33,17 @@ namespace ImageSharp
         /// <summary>
         /// Alters the hue component of the image.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="degrees">The angle in degrees to adjust the image.</param>
         /// <param name="rectangle">
         /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to alter.
         /// </param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Hue<TColor>(this Image<TColor> source, float degrees, Rectangle rectangle)
-            where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Hue<TPixel>(this Image<TPixel> source, float degrees, Rectangle rectangle)
+            where TPixel : struct, IPixel<TPixel>
         {
-            source.ApplyProcessor(new HueProcessor<TColor>(degrees), rectangle);
+            source.ApplyProcessor(new HueProcessor<TPixel>(degrees), rectangle);
             return source;
         }
     }
diff --git a/src/ImageSharp/Processing/ColorMatrix/Kodachrome.cs b/src/ImageSharp/Processing/ColorMatrix/Kodachrome.cs
index 5084c96b25..13a71a71ef 100644
--- a/src/ImageSharp/Processing/ColorMatrix/Kodachrome.cs
+++ b/src/ImageSharp/Processing/ColorMatrix/Kodachrome.cs
@@ -7,22 +7,24 @@ namespace ImageSharp
 {
     using System;
 
+    using ImageSharp.PixelFormats;
+
     using Processing;
     using Processing.Processors;
 
     /// <summary>
-    /// Extension methods for the <see cref="Image{TColor}"/> type.
+    /// Extension methods for the <see cref="Image{TPixel}"/> type.
     /// </summary>
     public static partial class ImageExtensions
     {
         /// <summary>
         /// Alters the colors of the image recreating an old Kodachrome camera effect.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Kodachrome<TColor>(this Image<TColor> source)
-            where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Kodachrome<TPixel>(this Image<TPixel> source)
+            where TPixel : struct, IPixel<TPixel>
         {
             return Kodachrome(source, source.Bounds);
         }
@@ -30,16 +32,16 @@ namespace ImageSharp
         /// <summary>
         /// Alters the colors of the image recreating an old Kodachrome camera effect.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="rectangle">
         /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to alter.
         /// </param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Kodachrome<TColor>(this Image<TColor> source, Rectangle rectangle)
-            where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Kodachrome<TPixel>(this Image<TPixel> source, Rectangle rectangle)
+            where TPixel : struct, IPixel<TPixel>
         {
-            source.ApplyProcessor(new KodachromeProcessor<TColor>(), rectangle);
+            source.ApplyProcessor(new KodachromeProcessor<TPixel>(), rectangle);
             return source;
         }
     }
diff --git a/src/ImageSharp/Processing/ColorMatrix/Lomograph.cs b/src/ImageSharp/Processing/ColorMatrix/Lomograph.cs
index ef6b23d5da..3299add7f7 100644
--- a/src/ImageSharp/Processing/ColorMatrix/Lomograph.cs
+++ b/src/ImageSharp/Processing/ColorMatrix/Lomograph.cs
@@ -7,22 +7,24 @@ namespace ImageSharp
 {
     using System;
 
+    using ImageSharp.PixelFormats;
+
     using Processing;
     using Processing.Processors;
 
     /// <summary>
-    /// Extension methods for the <see cref="Image{TColor}"/> type.
+    /// Extension methods for the <see cref="Image{TPixel}"/> type.
     /// </summary>
     public static partial class ImageExtensions
     {
         /// <summary>
         /// Alters the colors of the image recreating an old Lomograph camera effect.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Lomograph<TColor>(this Image<TColor> source)
-            where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Lomograph<TPixel>(this Image<TPixel> source)
+            where TPixel : struct, IPixel<TPixel>
         {
             return Lomograph(source, source.Bounds);
         }
@@ -30,16 +32,16 @@ namespace ImageSharp
         /// <summary>
         /// Alters the colors of the image recreating an old Lomograph camera effect.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="rectangle">
         /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to alter.
         /// </param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Lomograph<TColor>(this Image<TColor> source, Rectangle rectangle)
-            where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Lomograph<TPixel>(this Image<TPixel> source, Rectangle rectangle)
+            where TPixel : struct, IPixel<TPixel>
         {
-            source.ApplyProcessor(new LomographProcessor<TColor>(), rectangle);
+            source.ApplyProcessor(new LomographProcessor<TPixel>(), rectangle);
             return source;
         }
     }
diff --git a/src/ImageSharp/Processing/ColorMatrix/Polaroid.cs b/src/ImageSharp/Processing/ColorMatrix/Polaroid.cs
index 68b10173cc..194800ec72 100644
--- a/src/ImageSharp/Processing/ColorMatrix/Polaroid.cs
+++ b/src/ImageSharp/Processing/ColorMatrix/Polaroid.cs
@@ -7,22 +7,24 @@ namespace ImageSharp
 {
     using System;
 
+    using ImageSharp.PixelFormats;
+
     using Processing;
     using Processing.Processors;
 
     /// <summary>
-    /// Extension methods for the <see cref="Image{TColor}"/> type.
+    /// Extension methods for the <see cref="Image{TPixel}"/> type.
     /// </summary>
     public static partial class ImageExtensions
     {
         /// <summary>
         /// Alters the colors of the image recreating an old Polaroid camera effect.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Polaroid<TColor>(this Image<TColor> source)
-            where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Polaroid<TPixel>(this Image<TPixel> source)
+            where TPixel : struct, IPixel<TPixel>
         {
             return Polaroid(source, source.Bounds);
         }
@@ -30,16 +32,16 @@ namespace ImageSharp
         /// <summary>
         /// Alters the colors of the image recreating an old Polaroid camera effect.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="rectangle">
         /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to alter.
         /// </param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Polaroid<TColor>(this Image<TColor> source, Rectangle rectangle)
-            where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Polaroid<TPixel>(this Image<TPixel> source, Rectangle rectangle)
+            where TPixel : struct, IPixel<TPixel>
         {
-            source.ApplyProcessor(new PolaroidProcessor<TColor>(), rectangle);
+            source.ApplyProcessor(new PolaroidProcessor<TPixel>(), rectangle);
             return source;
         }
     }
diff --git a/src/ImageSharp/Processing/ColorMatrix/Saturation.cs b/src/ImageSharp/Processing/ColorMatrix/Saturation.cs
index 7a6359744b..c41f304b4e 100644
--- a/src/ImageSharp/Processing/ColorMatrix/Saturation.cs
+++ b/src/ImageSharp/Processing/ColorMatrix/Saturation.cs
@@ -7,23 +7,25 @@ namespace ImageSharp
 {
     using System;
 
+    using ImageSharp.PixelFormats;
+
     using Processing;
     using Processing.Processors;
 
     /// <summary>
-    /// Extension methods for the <see cref="Image{TColor}"/> type.
+    /// Extension methods for the <see cref="Image{TPixel}"/> type.
     /// </summary>
     public static partial class ImageExtensions
     {
         /// <summary>
         /// Alters the saturation component of the image.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="amount">The new saturation of the image. Must be between -100 and 100.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Saturation<TColor>(this Image<TColor> source, int amount)
-            where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Saturation<TPixel>(this Image<TPixel> source, int amount)
+            where TPixel : struct, IPixel<TPixel>
         {
             return Saturation(source, amount, source.Bounds);
         }
@@ -31,17 +33,17 @@ namespace ImageSharp
         /// <summary>
         /// Alters the saturation component of the image.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="amount">The new saturation of the image. Must be between -100 and 100.</param>
         /// <param name="rectangle">
         /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to alter.
         /// </param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Saturation<TColor>(this Image<TColor> source, int amount, Rectangle rectangle)
-            where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Saturation<TPixel>(this Image<TPixel> source, int amount, Rectangle rectangle)
+            where TPixel : struct, IPixel<TPixel>
         {
-            source.ApplyProcessor(new SaturationProcessor<TColor>(amount), rectangle);
+            source.ApplyProcessor(new SaturationProcessor<TPixel>(amount), rectangle);
             return source;
         }
     }
diff --git a/src/ImageSharp/Processing/ColorMatrix/Sepia.cs b/src/ImageSharp/Processing/ColorMatrix/Sepia.cs
index 4943635e06..d60ec7165a 100644
--- a/src/ImageSharp/Processing/ColorMatrix/Sepia.cs
+++ b/src/ImageSharp/Processing/ColorMatrix/Sepia.cs
@@ -7,22 +7,24 @@ namespace ImageSharp
 {
     using System;
 
+    using ImageSharp.PixelFormats;
+
     using Processing;
     using Processing.Processors;
 
     /// <summary>
-    /// Extension methods for the <see cref="Image{TColor}"/> type.
+    /// Extension methods for the <see cref="Image{TPixel}"/> type.
     /// </summary>
     public static partial class ImageExtensions
     {
         /// <summary>
         /// Applies sepia toning to the image.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <returns>The <see cref="Image"/>.</returns>
-        public static Image<TColor> Sepia<TColor>(this Image<TColor> source)
-            where TColor : struct, IPixel<TColor>
+        public static Image<TPixel> Sepia<TPixel>(this Image<TPixel> source)
+            where TPixel : struct, IPixel<TPixel>
         {
             return Sepia(source, source.Bounds);
         }
@@ -30,16 +32,16 @@ namespace ImageSharp
         /// <summary>
         /// Applies sepia toning to the image.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="rectangle">
         /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to alter.
         /// </param>
         /// <returns>The <see cref="Image"/>.</returns>
-        public static Image<TColor> Sepia<TColor>(this Image<TColor> source, Rectangle rectangle)
-            where TColor : struct, IPixel<TColor>
+        public static Image<TPixel> Sepia<TPixel>(this Image<TPixel> source, Rectangle rectangle)
+            where TPixel : struct, IPixel<TPixel>
         {
-            source.ApplyProcessor(new SepiaProcessor<TColor>(), rectangle);
+            source.ApplyProcessor(new SepiaProcessor<TPixel>(), rectangle);
             return source;
         }
     }
diff --git a/src/ImageSharp/Processing/Convolution/BoxBlur.cs b/src/ImageSharp/Processing/Convolution/BoxBlur.cs
index 428142ffa8..46c134ee20 100644
--- a/src/ImageSharp/Processing/Convolution/BoxBlur.cs
+++ b/src/ImageSharp/Processing/Convolution/BoxBlur.cs
@@ -7,22 +7,24 @@ namespace ImageSharp
 {
     using System;
 
+    using ImageSharp.PixelFormats;
+
     using Processing.Processors;
 
     /// <summary>
-    /// Extension methods for the <see cref="Image{TColor}"/> type.
+    /// Extension methods for the <see cref="Image{TPixel}"/> type.
     /// </summary>
     public static partial class ImageExtensions
     {
         /// <summary>
         /// Applies a box blur to the image.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="radius">The 'radius' value representing the size of the area to sample.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> BoxBlur<TColor>(this Image<TColor> source, int radius = 7)
-            where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> BoxBlur<TPixel>(this Image<TPixel> source, int radius = 7)
+            where TPixel : struct, IPixel<TPixel>
         {
             return BoxBlur(source, radius, source.Bounds);
         }
@@ -30,17 +32,17 @@ namespace ImageSharp
         /// <summary>
         /// Applies a box blur to the image.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="radius">The 'radius' value representing the size of the area to sample.</param>
         /// <param name="rectangle">
         /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to alter.
         /// </param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> BoxBlur<TColor>(this Image<TColor> source, int radius, Rectangle rectangle)
-            where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> BoxBlur<TPixel>(this Image<TPixel> source, int radius, Rectangle rectangle)
+            where TPixel : struct, IPixel<TPixel>
         {
-            source.ApplyProcessor(new BoxBlurProcessor<TColor>(radius), rectangle);
+            source.ApplyProcessor(new BoxBlurProcessor<TPixel>(radius), rectangle);
             return source;
         }
     }
diff --git a/src/ImageSharp/Processing/Convolution/DetectEdges.cs b/src/ImageSharp/Processing/Convolution/DetectEdges.cs
index dba062b563..3aa1d0b513 100644
--- a/src/ImageSharp/Processing/Convolution/DetectEdges.cs
+++ b/src/ImageSharp/Processing/Convolution/DetectEdges.cs
@@ -7,53 +7,55 @@ namespace ImageSharp
 {
     using System;
 
+    using ImageSharp.PixelFormats;
+
     using Processing;
     using Processing.Processors;
 
     /// <summary>
-    /// Extension methods for the <see cref="Image{TColor}"/> type.
+    /// Extension methods for the <see cref="Image{TPixel}"/> type.
     /// </summary>
     public static partial class ImageExtensions
     {
         /// <summary>
-        /// Detects any edges within the image. Uses the <see cref="SobelProcessor{TColor}"/> filter
+        /// Detects any edges within the image. Uses the <see cref="SobelProcessor{TPixel}"/> filter
         /// operating in Grayscale mode.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> DetectEdges<TColor>(this Image<TColor> source)
-            where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> DetectEdges<TPixel>(this Image<TPixel> source)
+            where TPixel : struct, IPixel<TPixel>
         {
-            return DetectEdges(source, source.Bounds, new SobelProcessor<TColor> { Grayscale = true });
+            return DetectEdges(source, source.Bounds, new SobelProcessor<TPixel> { Grayscale = true });
         }
 
         /// <summary>
-        /// Detects any edges within the image. Uses the <see cref="SobelProcessor{TColor}"/> filter
+        /// Detects any edges within the image. Uses the <see cref="SobelProcessor{TPixel}"/> filter
         /// operating in Grayscale mode.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="rectangle">
         /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to alter.
         /// </param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> DetectEdges<TColor>(this Image<TColor> source, Rectangle rectangle)
-            where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> DetectEdges<TPixel>(this Image<TPixel> source, Rectangle rectangle)
+            where TPixel : struct, IPixel<TPixel>
         {
-            return DetectEdges(source, rectangle, new SobelProcessor<TColor> { Grayscale = true });
+            return DetectEdges(source, rectangle, new SobelProcessor<TPixel> { Grayscale = true });
         }
 
         /// <summary>
         /// Detects any edges within the image.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="filter">The filter for detecting edges.</param>
         /// <param name="grayscale">Whether to convert the image to Grayscale first. Defaults to true.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> DetectEdges<TColor>(this Image<TColor> source, EdgeDetection filter, bool grayscale = true)
-            where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> DetectEdges<TPixel>(this Image<TPixel> source, EdgeDetection filter, bool grayscale = true)
+            where TPixel : struct, IPixel<TPixel>
         {
             return DetectEdges(source, filter, source.Bounds, grayscale);
         }
@@ -61,59 +63,59 @@ namespace ImageSharp
         /// <summary>
         /// Detects any edges within the image.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="filter">The filter for detecting edges.</param>
         /// <param name="rectangle">
         /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to alter.
         /// </param>
         /// <param name="grayscale">Whether to convert the image to Grayscale first. Defaults to true.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> DetectEdges<TColor>(this Image<TColor> source, EdgeDetection filter, Rectangle rectangle, bool grayscale = true)
-            where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> DetectEdges<TPixel>(this Image<TPixel> source, EdgeDetection filter, Rectangle rectangle, bool grayscale = true)
+            where TPixel : struct, IPixel<TPixel>
         {
-            IEdgeDetectorProcessor<TColor> processor;
+            IEdgeDetectorProcessor<TPixel> processor;
 
             switch (filter)
             {
                 case EdgeDetection.Kayyali:
-                    processor = new KayyaliProcessor<TColor> { Grayscale = grayscale };
+                    processor = new KayyaliProcessor<TPixel> { Grayscale = grayscale };
                     break;
 
                 case EdgeDetection.Kirsch:
-                    processor = new KirschProcessor<TColor> { Grayscale = grayscale };
+                    processor = new KirschProcessor<TPixel> { Grayscale = grayscale };
                     break;
 
                 case EdgeDetection.Lapacian3X3:
-                    processor = new Laplacian3X3Processor<TColor> { Grayscale = grayscale };
+                    processor = new Laplacian3X3Processor<TPixel> { Grayscale = grayscale };
                     break;
 
                 case EdgeDetection.Lapacian5X5:
-                    processor = new Laplacian5X5Processor<TColor> { Grayscale = grayscale };
+                    processor = new Laplacian5X5Processor<TPixel> { Grayscale = grayscale };
                     break;
 
                 case EdgeDetection.LaplacianOfGaussian:
-                    processor = new LaplacianOfGaussianProcessor<TColor> { Grayscale = grayscale };
+                    processor = new LaplacianOfGaussianProcessor<TPixel> { Grayscale = grayscale };
                     break;
 
                 case EdgeDetection.Prewitt:
-                    processor = new PrewittProcessor<TColor> { Grayscale = grayscale };
+                    processor = new PrewittProcessor<TPixel> { Grayscale = grayscale };
                     break;
 
                 case EdgeDetection.RobertsCross:
-                    processor = new RobertsCrossProcessor<TColor> { Grayscale = grayscale };
+                    processor = new RobertsCrossProcessor<TPixel> { Grayscale = grayscale };
                     break;
 
                 case EdgeDetection.Robinson:
-                    processor = new RobinsonProcessor<TColor> { Grayscale = grayscale };
+                    processor = new RobinsonProcessor<TPixel> { Grayscale = grayscale };
                     break;
 
                 case EdgeDetection.Scharr:
-                    processor = new ScharrProcessor<TColor> { Grayscale = grayscale };
+                    processor = new ScharrProcessor<TPixel> { Grayscale = grayscale };
                     break;
 
                 default:
-                    processor = new SobelProcessor<TColor> { Grayscale = grayscale };
+                    processor = new SobelProcessor<TPixel> { Grayscale = grayscale };
                     break;
             }
 
@@ -123,12 +125,12 @@ namespace ImageSharp
         /// <summary>
         /// Detects any edges within the image.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="filter">The filter for detecting edges.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> DetectEdges<TColor>(this Image<TColor> source, IEdgeDetectorProcessor<TColor> filter)
-            where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> DetectEdges<TPixel>(this Image<TPixel> source, IEdgeDetectorProcessor<TPixel> filter)
+            where TPixel : struct, IPixel<TPixel>
         {
             return DetectEdges(source, source.Bounds, filter);
         }
@@ -136,15 +138,15 @@ namespace ImageSharp
         /// <summary>
         /// Detects any edges within the image.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="rectangle">
         /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to alter.
         /// </param>
         /// <param name="filter">The filter for detecting edges.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> DetectEdges<TColor>(this Image<TColor> source, Rectangle rectangle, IEdgeDetectorProcessor<TColor> filter)
-            where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> DetectEdges<TPixel>(this Image<TPixel> source, Rectangle rectangle, IEdgeDetectorProcessor<TPixel> filter)
+            where TPixel : struct, IPixel<TPixel>
         {
             source.ApplyProcessor(filter, rectangle);
             return source;
diff --git a/src/ImageSharp/Processing/Convolution/GaussianBlur.cs b/src/ImageSharp/Processing/Convolution/GaussianBlur.cs
index 81f8546380..72abec6df9 100644
--- a/src/ImageSharp/Processing/Convolution/GaussianBlur.cs
+++ b/src/ImageSharp/Processing/Convolution/GaussianBlur.cs
@@ -7,23 +7,25 @@ namespace ImageSharp
 {
     using System;
 
+    using ImageSharp.PixelFormats;
+
     using Processing;
     using Processing.Processors;
 
     /// <summary>
-    /// Extension methods for the <see cref="Image{TColor}"/> type.
+    /// Extension methods for the <see cref="Image{TPixel}"/> type.
     /// </summary>
     public static partial class ImageExtensions
     {
         /// <summary>
         /// Applies a Gaussian blur to the image.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="sigma">The 'sigma' value representing the weight of the blur.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> GaussianBlur<TColor>(this Image<TColor> source, float sigma = 3f)
-            where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> GaussianBlur<TPixel>(this Image<TPixel> source, float sigma = 3f)
+            where TPixel : struct, IPixel<TPixel>
         {
             return GaussianBlur(source, sigma, source.Bounds);
         }
@@ -31,17 +33,17 @@ namespace ImageSharp
         /// <summary>
         /// Applies a Gaussian blur to the image.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="sigma">The 'sigma' value representing the weight of the blur.</param>
         /// <param name="rectangle">
         /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to alter.
         /// </param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> GaussianBlur<TColor>(this Image<TColor> source, float sigma, Rectangle rectangle)
-            where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> GaussianBlur<TPixel>(this Image<TPixel> source, float sigma, Rectangle rectangle)
+            where TPixel : struct, IPixel<TPixel>
         {
-            source.ApplyProcessor(new GaussianBlurProcessor<TColor>(sigma), rectangle);
+            source.ApplyProcessor(new GaussianBlurProcessor<TPixel>(sigma), rectangle);
             return source;
         }
     }
diff --git a/src/ImageSharp/Processing/Convolution/GaussianSharpen.cs b/src/ImageSharp/Processing/Convolution/GaussianSharpen.cs
index 61816198a5..2ed99ea260 100644
--- a/src/ImageSharp/Processing/Convolution/GaussianSharpen.cs
+++ b/src/ImageSharp/Processing/Convolution/GaussianSharpen.cs
@@ -7,23 +7,25 @@ namespace ImageSharp
 {
     using System;
 
+    using ImageSharp.PixelFormats;
+
     using Processing;
     using Processing.Processors;
 
     /// <summary>
-    /// Extension methods for the <see cref="Image{TColor}"/> type.
+    /// Extension methods for the <see cref="Image{TPixel}"/> type.
     /// </summary>
     public static partial class ImageExtensions
     {
         /// <summary>
         /// Applies a Gaussian sharpening filter to the image.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="sigma">The 'sigma' value representing the weight of the blur.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> GaussianSharpen<TColor>(this Image<TColor> source, float sigma = 3f)
-            where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> GaussianSharpen<TPixel>(this Image<TPixel> source, float sigma = 3f)
+            where TPixel : struct, IPixel<TPixel>
         {
             return GaussianSharpen(source, sigma, source.Bounds);
         }
@@ -31,17 +33,17 @@ namespace ImageSharp
         /// <summary>
         /// Applies a Gaussian sharpening filter to the image.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="sigma">The 'sigma' value representing the weight of the blur.</param>
         /// <param name="rectangle">
         /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to alter.
         /// </param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> GaussianSharpen<TColor>(this Image<TColor> source, float sigma, Rectangle rectangle)
-            where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> GaussianSharpen<TPixel>(this Image<TPixel> source, float sigma, Rectangle rectangle)
+            where TPixel : struct, IPixel<TPixel>
         {
-            source.ApplyProcessor(new GaussianSharpenProcessor<TColor>(sigma), rectangle);
+            source.ApplyProcessor(new GaussianSharpenProcessor<TPixel>(sigma), rectangle);
             return source;
         }
     }
diff --git a/src/ImageSharp/Processing/Effects/Alpha.cs b/src/ImageSharp/Processing/Effects/Alpha.cs
index 39849d4d4b..a54bde675b 100644
--- a/src/ImageSharp/Processing/Effects/Alpha.cs
+++ b/src/ImageSharp/Processing/Effects/Alpha.cs
@@ -7,6 +7,8 @@ namespace ImageSharp
 {
     using System;
 
+    using ImageSharp.PixelFormats;
+
     using Processing.Processors;
 
     /// <summary>
@@ -17,12 +19,12 @@ namespace ImageSharp
         /// <summary>
         /// Alters the alpha component of the image.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="percent">The new opacity of the image. Must be between 0 and 100.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Alpha<TColor>(this Image<TColor> source, int percent)
-            where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Alpha<TPixel>(this Image<TPixel> source, int percent)
+            where TPixel : struct, IPixel<TPixel>
         {
             return Alpha(source, percent, source.Bounds);
         }
@@ -30,17 +32,17 @@ namespace ImageSharp
         /// <summary>
         /// Alters the alpha component of the image.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="percent">The new opacity of the image. Must be between 0 and 100.</param>
         /// <param name="rectangle">
         /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to alter.
         /// </param>
         /// <returns>The <see cref="Image"/>.</returns>
-        public static Image<TColor> Alpha<TColor>(this Image<TColor> source, int percent, Rectangle rectangle)
-            where TColor : struct, IPixel<TColor>
+        public static Image<TPixel> Alpha<TPixel>(this Image<TPixel> source, int percent, Rectangle rectangle)
+            where TPixel : struct, IPixel<TPixel>
         {
-            source.ApplyProcessor(new AlphaProcessor<TColor>(percent), rectangle);
+            source.ApplyProcessor(new AlphaProcessor<TPixel>(percent), rectangle);
             return source;
         }
     }
diff --git a/src/ImageSharp/Processing/Effects/BackgroundColor.cs b/src/ImageSharp/Processing/Effects/BackgroundColor.cs
index 2e621172e1..cb189338e7 100644
--- a/src/ImageSharp/Processing/Effects/BackgroundColor.cs
+++ b/src/ImageSharp/Processing/Effects/BackgroundColor.cs
@@ -7,24 +7,26 @@ namespace ImageSharp
 {
     using System;
 
+    using ImageSharp.PixelFormats;
+
     using Processing.Processors;
 
     /// <summary>
-    /// Extension methods for the <see cref="Image{TColor}"/> type.
+    /// Extension methods for the <see cref="Image{TPixel}"/> type.
     /// </summary>
     public static partial class ImageExtensions
     {
         /// <summary>
         /// Replaces the background color of image with the given one.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="color">The color to set as the background.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> BackgroundColor<TColor>(this Image<TColor> source, TColor color)
-            where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> BackgroundColor<TPixel>(this Image<TPixel> source, TPixel color)
+            where TPixel : struct, IPixel<TPixel>
         {
-            source.ApplyProcessor(new BackgroundColorProcessor<TColor>(color), source.Bounds);
+            source.ApplyProcessor(new BackgroundColorProcessor<TPixel>(color), source.Bounds);
             return source;
         }
     }
diff --git a/src/ImageSharp/Processing/Effects/Brightness.cs b/src/ImageSharp/Processing/Effects/Brightness.cs
index 8ba702c4f5..6b7477488a 100644
--- a/src/ImageSharp/Processing/Effects/Brightness.cs
+++ b/src/ImageSharp/Processing/Effects/Brightness.cs
@@ -7,22 +7,24 @@ namespace ImageSharp
 {
     using System;
 
+    using ImageSharp.PixelFormats;
+
     using Processing.Processors;
 
     /// <summary>
-    /// Extension methods for the <see cref="Image{TColor}"/> type.
+    /// Extension methods for the <see cref="Image{TPixel}"/> type.
     /// </summary>
     public static partial class ImageExtensions
     {
         /// <summary>
         /// Alters the brightness component of the image.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
                 /// <param name="source">The image this method extends.</param>
         /// <param name="amount">The new brightness of the image. Must be between -100 and 100.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Brightness<TColor>(this Image<TColor> source, int amount)
-            where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Brightness<TPixel>(this Image<TPixel> source, int amount)
+            where TPixel : struct, IPixel<TPixel>
                     {
             return Brightness(source, amount, source.Bounds);
         }
@@ -30,17 +32,17 @@ namespace ImageSharp
         /// <summary>
         /// Alters the brightness component of the image.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
                 /// <param name="source">The image this method extends.</param>
         /// <param name="amount">The new brightness of the image. Must be between -100 and 100.</param>
         /// <param name="rectangle">
         /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to alter.
         /// </param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Brightness<TColor>(this Image<TColor> source, int amount, Rectangle rectangle)
-            where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Brightness<TPixel>(this Image<TPixel> source, int amount, Rectangle rectangle)
+            where TPixel : struct, IPixel<TPixel>
         {
-            source.ApplyProcessor(new BrightnessProcessor<TColor>(amount), rectangle);
+            source.ApplyProcessor(new BrightnessProcessor<TPixel>(amount), rectangle);
             return source;
         }
     }
diff --git a/src/ImageSharp/Processing/Effects/Contrast.cs b/src/ImageSharp/Processing/Effects/Contrast.cs
index 0228f4fe37..8f226d08e2 100644
--- a/src/ImageSharp/Processing/Effects/Contrast.cs
+++ b/src/ImageSharp/Processing/Effects/Contrast.cs
@@ -7,22 +7,24 @@ namespace ImageSharp
 {
     using System;
 
+    using ImageSharp.PixelFormats;
+
     using Processing.Processors;
 
     /// <summary>
-    /// Extension methods for the <see cref="Image{TColor}"/> type.
+    /// Extension methods for the <see cref="Image{TPixel}"/> type.
     /// </summary>
     public static partial class ImageExtensions
     {
         /// <summary>
         /// Alters the contrast component of the image.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="amount">The new contrast of the image. Must be between -100 and 100.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Contrast<TColor>(this Image<TColor> source, int amount)
-            where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Contrast<TPixel>(this Image<TPixel> source, int amount)
+            where TPixel : struct, IPixel<TPixel>
         {
             return Contrast(source, amount, source.Bounds);
         }
@@ -30,17 +32,17 @@ namespace ImageSharp
         /// <summary>
         /// Alters the contrast component of the image.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="amount">The new contrast of the image. Must be between -100 and 100.</param>
         /// <param name="rectangle">
         /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to alter.
         /// </param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Contrast<TColor>(this Image<TColor> source, int amount, Rectangle rectangle)
-            where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Contrast<TPixel>(this Image<TPixel> source, int amount, Rectangle rectangle)
+            where TPixel : struct, IPixel<TPixel>
         {
-            source.ApplyProcessor(new ContrastProcessor<TColor>(amount), rectangle);
+            source.ApplyProcessor(new ContrastProcessor<TPixel>(amount), rectangle);
             return source;
         }
     }
diff --git a/src/ImageSharp/Processing/Effects/Invert.cs b/src/ImageSharp/Processing/Effects/Invert.cs
index 6c51ad3eb3..113d8289e7 100644
--- a/src/ImageSharp/Processing/Effects/Invert.cs
+++ b/src/ImageSharp/Processing/Effects/Invert.cs
@@ -7,21 +7,23 @@ namespace ImageSharp
 {
     using System;
 
+    using ImageSharp.PixelFormats;
+
     using Processing.Processors;
 
     /// <summary>
-    /// Extension methods for the <see cref="Image{TColor}"/> type.
+    /// Extension methods for the <see cref="Image{TPixel}"/> type.
     /// </summary>
     public static partial class ImageExtensions
     {
         /// <summary>
         /// Inverts the colors of the image.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <returns>The <see cref="Image"/>.</returns>
-        public static Image<TColor> Invert<TColor>(this Image<TColor> source)
-            where TColor : struct, IPixel<TColor>
+        public static Image<TPixel> Invert<TPixel>(this Image<TPixel> source)
+            where TPixel : struct, IPixel<TPixel>
         {
             return Invert(source, source.Bounds);
         }
@@ -29,16 +31,16 @@ namespace ImageSharp
         /// <summary>
         /// Inverts the colors of the image.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="rectangle">
         /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to alter.
         /// </param>
         /// <returns>The <see cref="Image"/>.</returns>
-        public static Image<TColor> Invert<TColor>(this Image<TColor> source, Rectangle rectangle)
-            where TColor : struct, IPixel<TColor>
+        public static Image<TPixel> Invert<TPixel>(this Image<TPixel> source, Rectangle rectangle)
+            where TPixel : struct, IPixel<TPixel>
         {
-            source.ApplyProcessor(new InvertProcessor<TColor>(), rectangle);
+            source.ApplyProcessor(new InvertProcessor<TPixel>(), rectangle);
             return source;
         }
     }
diff --git a/src/ImageSharp/Processing/Effects/OilPainting.cs b/src/ImageSharp/Processing/Effects/OilPainting.cs
index d7d8444c01..d4528b55ba 100644
--- a/src/ImageSharp/Processing/Effects/OilPainting.cs
+++ b/src/ImageSharp/Processing/Effects/OilPainting.cs
@@ -7,23 +7,25 @@ namespace ImageSharp
 {
     using System;
 
+    using ImageSharp.PixelFormats;
+
     using Processing.Processors;
 
     /// <summary>
-    /// Extension methods for the <see cref="Image{TColor}"/> type.
+    /// Extension methods for the <see cref="Image{TPixel}"/> type.
     /// </summary>
     public static partial class ImageExtensions
     {
         /// <summary>
         /// Alters the colors of the image recreating an oil painting effect.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="levels">The number of intensity levels. Higher values result in a broader range of color intensities forming part of the result image.</param>
         /// <param name="brushSize">The number of neighboring pixels used in calculating each individual pixel value.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> OilPaint<TColor>(this Image<TColor> source, int levels = 10, int brushSize = 15)
-            where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> OilPaint<TPixel>(this Image<TPixel> source, int levels = 10, int brushSize = 15)
+            where TPixel : struct, IPixel<TPixel>
         {
             return OilPaint(source, levels, brushSize, source.Bounds);
         }
@@ -31,16 +33,16 @@ namespace ImageSharp
         /// <summary>
         /// Alters the colors of the image recreating an oil painting effect.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="levels">The number of intensity levels. Higher values result in a broader range of color intensities forming part of the result image.</param>
         /// <param name="brushSize">The number of neighboring pixels used in calculating each individual pixel value.</param>
         /// <param name="rectangle">
         /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to alter.
         /// </param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> OilPaint<TColor>(this Image<TColor> source, int levels, int brushSize, Rectangle rectangle)
-            where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> OilPaint<TPixel>(this Image<TPixel> source, int levels, int brushSize, Rectangle rectangle)
+            where TPixel : struct, IPixel<TPixel>
         {
             Guard.MustBeGreaterThan(levels, 0, nameof(levels));
 
@@ -49,7 +51,7 @@ namespace ImageSharp
                 throw new ArgumentOutOfRangeException(nameof(brushSize));
             }
 
-            source.ApplyProcessor(new OilPaintingProcessor<TColor>(levels, brushSize), rectangle);
+            source.ApplyProcessor(new OilPaintingProcessor<TPixel>(levels, brushSize), rectangle);
             return source;
         }
     }
diff --git a/src/ImageSharp/Processing/Effects/Pixelate.cs b/src/ImageSharp/Processing/Effects/Pixelate.cs
index 721dd930b0..eeffff0925 100644
--- a/src/ImageSharp/Processing/Effects/Pixelate.cs
+++ b/src/ImageSharp/Processing/Effects/Pixelate.cs
@@ -7,22 +7,24 @@ namespace ImageSharp
 {
     using System;
 
+    using ImageSharp.PixelFormats;
+
     using Processing.Processors;
 
     /// <summary>
-    /// Extension methods for the <see cref="Image{TColor}"/> type.
+    /// Extension methods for the <see cref="Image{TPixel}"/> type.
     /// </summary>
     public static partial class ImageExtensions
     {
         /// <summary>
         /// Pixelates an image with the given pixel size.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="size">The size of the pixels.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Pixelate<TColor>(this Image<TColor> source, int size = 4)
-            where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Pixelate<TPixel>(this Image<TPixel> source, int size = 4)
+            where TPixel : struct, IPixel<TPixel>
         {
             return Pixelate(source, size, source.Bounds);
         }
@@ -30,22 +32,22 @@ namespace ImageSharp
         /// <summary>
         /// Pixelates an image with the given pixel size.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="size">The size of the pixels.</param>
         /// <param name="rectangle">
         /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to alter.
         /// </param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Pixelate<TColor>(this Image<TColor> source, int size, Rectangle rectangle)
-            where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Pixelate<TPixel>(this Image<TPixel> source, int size, Rectangle rectangle)
+            where TPixel : struct, IPixel<TPixel>
         {
             if (size <= 0 || size > source.Height || size > source.Width)
             {
                 throw new ArgumentOutOfRangeException(nameof(size));
             }
 
-            source.ApplyProcessor(new PixelateProcessor<TColor>(size), rectangle);
+            source.ApplyProcessor(new PixelateProcessor<TPixel>(size), rectangle);
             return source;
         }
     }
diff --git a/src/ImageSharp/Processing/Overlays/Glow.cs b/src/ImageSharp/Processing/Overlays/Glow.cs
index e8dfbdf0ef..1be15ad650 100644
--- a/src/ImageSharp/Processing/Overlays/Glow.cs
+++ b/src/ImageSharp/Processing/Overlays/Glow.cs
@@ -7,34 +7,36 @@ namespace ImageSharp
 {
     using System;
 
+    using ImageSharp.PixelFormats;
+
     using Processing.Processors;
 
     /// <summary>
-    /// Extension methods for the <see cref="Image{TColor}"/> type.
+    /// Extension methods for the <see cref="Image{TPixel}"/> type.
     /// </summary>
     public static partial class ImageExtensions
     {
         /// <summary>
         /// Applies a radial glow effect to an image.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Glow<TColor>(this Image<TColor> source)
-            where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Glow<TPixel>(this Image<TPixel> source)
+            where TPixel : struct, IPixel<TPixel>
         {
-            return Glow(source, NamedColors<TColor>.Black, source.Bounds.Width * .5F, source.Bounds);
+            return Glow(source, NamedColors<TPixel>.Black, source.Bounds.Width * .5F, source.Bounds);
         }
 
         /// <summary>
         /// Applies a radial glow effect to an image.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="color">The color to set as the glow.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Glow<TColor>(this Image<TColor> source, TColor color)
-            where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Glow<TPixel>(this Image<TPixel> source, TPixel color)
+            where TPixel : struct, IPixel<TPixel>
         {
             return Glow(source, color, source.Bounds.Width * .5F, source.Bounds);
         }
@@ -42,46 +44,46 @@ namespace ImageSharp
         /// <summary>
         /// Applies a radial glow effect to an image.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="radius">The the radius.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Glow<TColor>(this Image<TColor> source, float radius)
-            where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Glow<TPixel>(this Image<TPixel> source, float radius)
+            where TPixel : struct, IPixel<TPixel>
         {
-            return Glow(source, NamedColors<TColor>.Black, radius, source.Bounds);
+            return Glow(source, NamedColors<TPixel>.Black, radius, source.Bounds);
         }
 
         /// <summary>
         /// Applies a radial glow effect to an image.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="rectangle">
         /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to alter.
         /// </param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Glow<TColor>(this Image<TColor> source, Rectangle rectangle)
-            where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Glow<TPixel>(this Image<TPixel> source, Rectangle rectangle)
+            where TPixel : struct, IPixel<TPixel>
         {
-            return Glow(source, NamedColors<TColor>.Black, 0, rectangle);
+            return Glow(source, NamedColors<TPixel>.Black, 0, rectangle);
         }
 
         /// <summary>
         /// Applies a radial glow effect to an image.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="color">The color to set as the glow.</param>
         /// <param name="radius">The the radius.</param>
         /// <param name="rectangle">
         /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to alter.
         /// </param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Glow<TColor>(this Image<TColor> source, TColor color, float radius, Rectangle rectangle)
-            where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Glow<TPixel>(this Image<TPixel> source, TPixel color, float radius, Rectangle rectangle)
+            where TPixel : struct, IPixel<TPixel>
         {
-            GlowProcessor<TColor> processor = new GlowProcessor<TColor>(color) { Radius = radius, };
+            GlowProcessor<TPixel> processor = new GlowProcessor<TPixel>(color) { Radius = radius, };
             source.ApplyProcessor(processor, rectangle);
             return source;
         }
diff --git a/src/ImageSharp/Processing/Overlays/Vignette.cs b/src/ImageSharp/Processing/Overlays/Vignette.cs
index e42ead8d3a..f805dd07a0 100644
--- a/src/ImageSharp/Processing/Overlays/Vignette.cs
+++ b/src/ImageSharp/Processing/Overlays/Vignette.cs
@@ -7,34 +7,36 @@ namespace ImageSharp
 {
     using System;
 
+    using ImageSharp.PixelFormats;
+
     using Processing.Processors;
 
     /// <summary>
-    /// Extension methods for the <see cref="Image{TColor}"/> type.
+    /// Extension methods for the <see cref="Image{TPixel}"/> type.
     /// </summary>
     public static partial class ImageExtensions
     {
         /// <summary>
         /// Applies a radial vignette effect to an image.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Vignette<TColor>(this Image<TColor> source)
-            where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Vignette<TPixel>(this Image<TPixel> source)
+            where TPixel : struct, IPixel<TPixel>
         {
-            return Vignette(source, NamedColors<TColor>.Black, source.Bounds.Width * .5F, source.Bounds.Height * .5F, source.Bounds);
+            return Vignette(source, NamedColors<TPixel>.Black, source.Bounds.Width * .5F, source.Bounds.Height * .5F, source.Bounds);
         }
 
         /// <summary>
         /// Applies a radial vignette effect to an image.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="color">The color to set as the vignette.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Vignette<TColor>(this Image<TColor> source, TColor color)
-            where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Vignette<TPixel>(this Image<TPixel> source, TPixel color)
+            where TPixel : struct, IPixel<TPixel>
         {
             return Vignette(source, color, source.Bounds.Width * .5F, source.Bounds.Height * .5F, source.Bounds);
         }
@@ -42,36 +44,36 @@ namespace ImageSharp
         /// <summary>
         /// Applies a radial vignette effect to an image.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="radiusX">The the x-radius.</param>
         /// <param name="radiusY">The the y-radius.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Vignette<TColor>(this Image<TColor> source, float radiusX, float radiusY)
-            where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Vignette<TPixel>(this Image<TPixel> source, float radiusX, float radiusY)
+            where TPixel : struct, IPixel<TPixel>
         {
-            return Vignette(source, NamedColors<TColor>.Black, radiusX, radiusY, source.Bounds);
+            return Vignette(source, NamedColors<TPixel>.Black, radiusX, radiusY, source.Bounds);
         }
 
         /// <summary>
         /// Applies a radial vignette effect to an image.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="rectangle">
         /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to alter.
         /// </param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Vignette<TColor>(this Image<TColor> source, Rectangle rectangle)
-            where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Vignette<TPixel>(this Image<TPixel> source, Rectangle rectangle)
+            where TPixel : struct, IPixel<TPixel>
         {
-            return Vignette(source, NamedColors<TColor>.Black, 0, 0, rectangle);
+            return Vignette(source, NamedColors<TPixel>.Black, 0, 0, rectangle);
         }
 
         /// <summary>
         /// Applies a radial vignette effect to an image.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="color">The color to set as the vignette.</param>
         /// <param name="radiusX">The the x-radius.</param>
@@ -79,11 +81,11 @@ namespace ImageSharp
         /// <param name="rectangle">
         /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to alter.
         /// </param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Vignette<TColor>(this Image<TColor> source, TColor color, float radiusX, float radiusY, Rectangle rectangle)
-            where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Vignette<TPixel>(this Image<TPixel> source, TPixel color, float radiusX, float radiusY, Rectangle rectangle)
+            where TPixel : struct, IPixel<TPixel>
         {
-            VignetteProcessor<TColor> processor = new VignetteProcessor<TColor>(color) { RadiusX = radiusX, RadiusY = radiusY };
+            VignetteProcessor<TPixel> processor = new VignetteProcessor<TPixel>(color) { RadiusX = radiusX, RadiusY = radiusY };
             source.ApplyProcessor(processor, rectangle);
             return source;
         }
diff --git a/src/ImageSharp/Processing/Processors/Binarization/BinaryThresholdProcessor.cs b/src/ImageSharp/Processing/Processors/Binarization/BinaryThresholdProcessor.cs
index 5555463418..566449b275 100644
--- a/src/ImageSharp/Processing/Processors/Binarization/BinaryThresholdProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Binarization/BinaryThresholdProcessor.cs
@@ -8,16 +8,18 @@ namespace ImageSharp.Processing.Processors
     using System;
     using System.Threading.Tasks;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
-    /// An <see cref="IImageProcessor{TColor}"/> to perform binary threshold filtering against an
+    /// An <see cref="IImageProcessor{TPixel}"/> to perform binary threshold filtering against an
     /// <see cref="Image"/>. The image will be converted to grayscale before thresholding occurs.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    internal class BinaryThresholdProcessor<TColor> : ImageProcessor<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    internal class BinaryThresholdProcessor<TPixel> : ImageProcessor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
-        /// Initializes a new instance of the <see cref="BinaryThresholdProcessor{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="BinaryThresholdProcessor{TPixel}"/> class.
         /// </summary>
         /// <param name="threshold">The threshold to split the image. Must be between 0 and 1.</param>
         public BinaryThresholdProcessor(float threshold)
@@ -27,8 +29,8 @@ namespace ImageSharp.Processing.Processors
             this.Threshold = threshold;
 
             // Default to white/black for upper/lower.
-            this.UpperColor = NamedColors<TColor>.White;
-            this.LowerColor = NamedColors<TColor>.Black;
+            this.UpperColor = NamedColors<TPixel>.White;
+            this.LowerColor = NamedColors<TPixel>.Black;
         }
 
         /// <summary>
@@ -39,25 +41,25 @@ namespace ImageSharp.Processing.Processors
         /// <summary>
         /// Gets or sets the color to use for pixels that are above the threshold.
         /// </summary>
-        public TColor UpperColor { get; set; }
+        public TPixel UpperColor { get; set; }
 
         /// <summary>
         /// Gets or sets the color to use for pixels that fall below the threshold.
         /// </summary>
-        public TColor LowerColor { get; set; }
+        public TPixel LowerColor { get; set; }
 
         /// <inheritdoc/>
-        protected override void BeforeApply(ImageBase<TColor> source, Rectangle sourceRectangle)
+        protected override void BeforeApply(ImageBase<TPixel> source, Rectangle sourceRectangle)
         {
-            new GrayscaleBt709Processor<TColor>().Apply(source, sourceRectangle);
+            new GrayscaleBt709Processor<TPixel>().Apply(source, sourceRectangle);
         }
 
         /// <inheritdoc/>
-        protected override void OnApply(ImageBase<TColor> source, Rectangle sourceRectangle)
+        protected override void OnApply(ImageBase<TPixel> source, Rectangle sourceRectangle)
         {
             float threshold = this.Threshold;
-            TColor upper = this.UpperColor;
-            TColor lower = this.LowerColor;
+            TPixel upper = this.UpperColor;
+            TPixel lower = this.LowerColor;
 
             int startY = sourceRectangle.Y;
             int endY = sourceRectangle.Bottom;
@@ -81,7 +83,7 @@ namespace ImageSharp.Processing.Processors
                 startY = 0;
             }
 
-            using (PixelAccessor<TColor> sourcePixels = source.Lock())
+            using (PixelAccessor<TPixel> sourcePixels = source.Lock())
             {
                 Parallel.For(
                     minY,
@@ -93,7 +95,7 @@ namespace ImageSharp.Processing.Processors
                         for (int x = minX; x < maxX; x++)
                         {
                             int offsetX = x - startX;
-                            TColor color = sourcePixels[offsetX, offsetY];
+                            TPixel color = sourcePixels[offsetX, offsetY];
 
                             // Any channel will do since it's Grayscale.
                             sourcePixels[offsetX, offsetY] = color.ToVector4().X >= threshold ? upper : lower;
diff --git a/src/ImageSharp/Processing/Processors/Binarization/ErrorDiffusionDitherProcessor.cs b/src/ImageSharp/Processing/Processors/Binarization/ErrorDiffusionDitherProcessor.cs
index 50f042bd69..af2d9f760a 100644
--- a/src/ImageSharp/Processing/Processors/Binarization/ErrorDiffusionDitherProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Binarization/ErrorDiffusionDitherProcessor.cs
@@ -8,16 +8,17 @@ namespace ImageSharp.Processing.Processors
     using System;
 
     using ImageSharp.Dithering;
+    using ImageSharp.PixelFormats;
 
     /// <summary>
-    /// An <see cref="IImageProcessor{TColor}"/> that dithers an image using error diffusion.
+    /// An <see cref="IImageProcessor{TPixel}"/> that dithers an image using error diffusion.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    internal class ErrorDiffusionDitherProcessor<TColor> : ImageProcessor<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    internal class ErrorDiffusionDitherProcessor<TPixel> : ImageProcessor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
-        /// Initializes a new instance of the <see cref="ErrorDiffusionDitherProcessor{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="ErrorDiffusionDitherProcessor{TPixel}"/> class.
         /// </summary>
         /// <param name="diffuser">The error diffuser</param>
         /// <param name="threshold">The threshold to split the image. Must be between 0 and 1.</param>
@@ -29,8 +30,8 @@ namespace ImageSharp.Processing.Processors
             this.Threshold = threshold;
 
             // Default to white/black for upper/lower.
-            this.UpperColor = NamedColors<TColor>.White;
-            this.LowerColor = NamedColors<TColor>.Black;
+            this.UpperColor = NamedColors<TPixel>.White;
+            this.LowerColor = NamedColors<TPixel>.Black;
         }
 
         /// <summary>
@@ -46,21 +47,21 @@ namespace ImageSharp.Processing.Processors
         /// <summary>
         /// Gets or sets the color to use for pixels that are above the threshold.
         /// </summary>
-        public TColor UpperColor { get; set; }
+        public TPixel UpperColor { get; set; }
 
         /// <summary>
         /// Gets or sets the color to use for pixels that fall below the threshold.
         /// </summary>
-        public TColor LowerColor { get; set; }
+        public TPixel LowerColor { get; set; }
 
         /// <inheritdoc/>
-        protected override void BeforeApply(ImageBase<TColor> source, Rectangle sourceRectangle)
+        protected override void BeforeApply(ImageBase<TPixel> source, Rectangle sourceRectangle)
         {
-            new GrayscaleBt709Processor<TColor>().Apply(source, sourceRectangle);
+            new GrayscaleBt709Processor<TPixel>().Apply(source, sourceRectangle);
         }
 
         /// <inheritdoc/>
-        protected override void OnApply(ImageBase<TColor> source, Rectangle sourceRectangle)
+        protected override void OnApply(ImageBase<TPixel> source, Rectangle sourceRectangle)
         {
             int startY = sourceRectangle.Y;
             int endY = sourceRectangle.Bottom;
@@ -84,7 +85,7 @@ namespace ImageSharp.Processing.Processors
                 startY = 0;
             }
 
-            using (PixelAccessor<TColor> sourcePixels = source.Lock())
+            using (PixelAccessor<TPixel> sourcePixels = source.Lock())
             {
                 for (int y = minY; y < maxY; y++)
                 {
@@ -92,8 +93,8 @@ namespace ImageSharp.Processing.Processors
                     for (int x = minX; x < maxX; x++)
                     {
                         int offsetX = x - startX;
-                        TColor sourceColor = sourcePixels[offsetX, offsetY];
-                        TColor transformedColor = sourceColor.ToVector4().X >= this.Threshold ? this.UpperColor : this.LowerColor;
+                        TPixel sourceColor = sourcePixels[offsetX, offsetY];
+                        TPixel transformedColor = sourceColor.ToVector4().X >= this.Threshold ? this.UpperColor : this.LowerColor;
                         this.Diffuser.Dither(sourcePixels, sourceColor, transformedColor, offsetX, offsetY, maxX, maxY);
                     }
                 }
diff --git a/src/ImageSharp/Processing/Processors/Binarization/OrderedDitherProcessor.cs b/src/ImageSharp/Processing/Processors/Binarization/OrderedDitherProcessor.cs
index c7f4d20ace..c4d71d9afe 100644
--- a/src/ImageSharp/Processing/Processors/Binarization/OrderedDitherProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Binarization/OrderedDitherProcessor.cs
@@ -9,16 +9,17 @@ namespace ImageSharp.Processing.Processors
     using System.Buffers;
 
     using ImageSharp.Dithering;
+    using ImageSharp.PixelFormats;
 
     /// <summary>
-    /// An <see cref="IImageProcessor{TColor}"/> that dithers an image using error diffusion.
+    /// An <see cref="IImageProcessor{TPixel}"/> that dithers an image using error diffusion.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    internal class OrderedDitherProcessor<TColor> : ImageProcessor<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    internal class OrderedDitherProcessor<TPixel> : ImageProcessor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
-        /// Initializes a new instance of the <see cref="OrderedDitherProcessor{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="OrderedDitherProcessor{TPixel}"/> class.
         /// </summary>
         /// <param name="dither">The ordered ditherer.</param>
         /// <param name="index">The component index to test the threshold against. Must range from 0 to 3.</param>
@@ -28,7 +29,7 @@ namespace ImageSharp.Processing.Processors
             Guard.MustBeBetweenOrEqualTo(index, 0, 3, nameof(index));
 
             // Alpha8 only stores the pixel data in the alpha channel.
-            if (typeof(TColor) == typeof(Alpha8))
+            if (typeof(TPixel) == typeof(Alpha8))
             {
                 index = 3;
             }
@@ -37,8 +38,8 @@ namespace ImageSharp.Processing.Processors
             this.Index = index;
 
             // Default to white/black for upper/lower.
-            this.UpperColor = NamedColors<TColor>.White;
-            this.LowerColor = NamedColors<TColor>.Black;
+            this.UpperColor = NamedColors<TPixel>.White;
+            this.LowerColor = NamedColors<TPixel>.Black;
         }
 
         /// <summary>
@@ -54,21 +55,21 @@ namespace ImageSharp.Processing.Processors
         /// <summary>
         /// Gets or sets the color to use for pixels that are above the threshold.
         /// </summary>
-        public TColor UpperColor { get; set; }
+        public TPixel UpperColor { get; set; }
 
         /// <summary>
         /// Gets or sets the color to use for pixels that fall below the threshold.
         /// </summary>
-        public TColor LowerColor { get; set; }
+        public TPixel LowerColor { get; set; }
 
         /// <inheritdoc/>
-        protected override void BeforeApply(ImageBase<TColor> source, Rectangle sourceRectangle)
+        protected override void BeforeApply(ImageBase<TPixel> source, Rectangle sourceRectangle)
         {
-            new GrayscaleBt709Processor<TColor>().Apply(source, sourceRectangle);
+            new GrayscaleBt709Processor<TPixel>().Apply(source, sourceRectangle);
         }
 
         /// <inheritdoc/>
-        protected override void OnApply(ImageBase<TColor> source, Rectangle sourceRectangle)
+        protected override void OnApply(ImageBase<TPixel> source, Rectangle sourceRectangle)
         {
             int startY = sourceRectangle.Y;
             int endY = sourceRectangle.Bottom;
@@ -92,7 +93,7 @@ namespace ImageSharp.Processing.Processors
                 startY = 0;
             }
 
-            using (PixelAccessor<TColor> sourcePixels = source.Lock())
+            using (PixelAccessor<TPixel> sourcePixels = source.Lock())
             {
                 for (int y = minY; y < maxY; y++)
                 {
@@ -102,7 +103,7 @@ namespace ImageSharp.Processing.Processors
                     for (int x = minX; x < maxX; x++)
                     {
                         int offsetX = x - startX;
-                        TColor sourceColor = sourcePixels[offsetX, offsetY];
+                        TPixel sourceColor = sourcePixels[offsetX, offsetY];
                         this.Dither.Dither(sourcePixels, sourceColor, this.UpperColor, this.LowerColor, bytes, this.Index, offsetX, offsetY, maxX, maxY);
                     }
 
diff --git a/src/ImageSharp/Processing/Processors/ColorMatrix/BlackWhiteProcessor.cs b/src/ImageSharp/Processing/Processors/ColorMatrix/BlackWhiteProcessor.cs
index 0214af72de..d37d119a41 100644
--- a/src/ImageSharp/Processing/Processors/ColorMatrix/BlackWhiteProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/ColorMatrix/BlackWhiteProcessor.cs
@@ -8,12 +8,14 @@ namespace ImageSharp.Processing.Processors
     using System;
     using System.Numerics;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// Converts the colors of the image to their black and white equivalent.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    internal class BlackWhiteProcessor<TColor> : ColorMatrixProcessor<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    internal class BlackWhiteProcessor<TPixel> : ColorMatrixProcessor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <inheritdoc/>
         public override Matrix4x4 Matrix => new Matrix4x4()
diff --git a/src/ImageSharp/Processing/Processors/ColorMatrix/ColorBlindness/AchromatomalyProcessor.cs b/src/ImageSharp/Processing/Processors/ColorMatrix/ColorBlindness/AchromatomalyProcessor.cs
index d1e986a9df..a91bd19467 100644
--- a/src/ImageSharp/Processing/Processors/ColorMatrix/ColorBlindness/AchromatomalyProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/ColorMatrix/ColorBlindness/AchromatomalyProcessor.cs
@@ -8,12 +8,14 @@ namespace ImageSharp.Processing.Processors
     using System;
     using System.Numerics;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// Converts the colors of the image recreating Achromatomaly (Color desensitivity) color blindness.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    internal class AchromatomalyProcessor<TColor> : ColorMatrixProcessor<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    internal class AchromatomalyProcessor<TPixel> : ColorMatrixProcessor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <inheritdoc/>
         public override Matrix4x4 Matrix => new Matrix4x4()
diff --git a/src/ImageSharp/Processing/Processors/ColorMatrix/ColorBlindness/AchromatopsiaProcessor.cs b/src/ImageSharp/Processing/Processors/ColorMatrix/ColorBlindness/AchromatopsiaProcessor.cs
index d17e28dcaf..d543c4edca 100644
--- a/src/ImageSharp/Processing/Processors/ColorMatrix/ColorBlindness/AchromatopsiaProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/ColorMatrix/ColorBlindness/AchromatopsiaProcessor.cs
@@ -8,12 +8,14 @@ namespace ImageSharp.Processing.Processors
     using System;
     using System.Numerics;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// Converts the colors of the image recreating Achromatopsia (Monochrome) color blindness.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    internal class AchromatopsiaProcessor<TColor> : ColorMatrixProcessor<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    internal class AchromatopsiaProcessor<TPixel> : ColorMatrixProcessor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <inheritdoc/>
         public override Matrix4x4 Matrix => new Matrix4x4()
diff --git a/src/ImageSharp/Processing/Processors/ColorMatrix/ColorBlindness/DeuteranomalyProcessor.cs b/src/ImageSharp/Processing/Processors/ColorMatrix/ColorBlindness/DeuteranomalyProcessor.cs
index 7f4529ba47..ea73d0c662 100644
--- a/src/ImageSharp/Processing/Processors/ColorMatrix/ColorBlindness/DeuteranomalyProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/ColorMatrix/ColorBlindness/DeuteranomalyProcessor.cs
@@ -8,12 +8,14 @@ namespace ImageSharp.Processing.Processors
     using System;
     using System.Numerics;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// Converts the colors of the image recreating Deuteranomaly (Green-Weak) color blindness.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    internal class DeuteranomalyProcessor<TColor> : ColorMatrixProcessor<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    internal class DeuteranomalyProcessor<TPixel> : ColorMatrixProcessor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <inheritdoc/>
         public override Matrix4x4 Matrix => new Matrix4x4()
diff --git a/src/ImageSharp/Processing/Processors/ColorMatrix/ColorBlindness/DeuteranopiaProcessor.cs b/src/ImageSharp/Processing/Processors/ColorMatrix/ColorBlindness/DeuteranopiaProcessor.cs
index 493ed2caed..4b5129a8bf 100644
--- a/src/ImageSharp/Processing/Processors/ColorMatrix/ColorBlindness/DeuteranopiaProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/ColorMatrix/ColorBlindness/DeuteranopiaProcessor.cs
@@ -8,12 +8,14 @@ namespace ImageSharp.Processing.Processors
     using System;
     using System.Numerics;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// Converts the colors of the image recreating Deuteranopia (Green-Blind) color blindness.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    internal class DeuteranopiaProcessor<TColor> : ColorMatrixProcessor<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    internal class DeuteranopiaProcessor<TPixel> : ColorMatrixProcessor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <inheritdoc/>
         public override Matrix4x4 Matrix => new Matrix4x4()
diff --git a/src/ImageSharp/Processing/Processors/ColorMatrix/ColorBlindness/ProtanomalyProcessor.cs b/src/ImageSharp/Processing/Processors/ColorMatrix/ColorBlindness/ProtanomalyProcessor.cs
index ddea24be01..14eea08126 100644
--- a/src/ImageSharp/Processing/Processors/ColorMatrix/ColorBlindness/ProtanomalyProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/ColorMatrix/ColorBlindness/ProtanomalyProcessor.cs
@@ -8,12 +8,14 @@ namespace ImageSharp.Processing.Processors
     using System;
     using System.Numerics;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// Converts the colors of the image recreating Protanopia (Red-Weak) color blindness.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    internal class ProtanomalyProcessor<TColor> : ColorMatrixProcessor<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    internal class ProtanomalyProcessor<TPixel> : ColorMatrixProcessor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <inheritdoc/>
         public override Matrix4x4 Matrix => new Matrix4x4()
diff --git a/src/ImageSharp/Processing/Processors/ColorMatrix/ColorBlindness/ProtanopiaProcessor.cs b/src/ImageSharp/Processing/Processors/ColorMatrix/ColorBlindness/ProtanopiaProcessor.cs
index c5446dbe1a..39cb715bde 100644
--- a/src/ImageSharp/Processing/Processors/ColorMatrix/ColorBlindness/ProtanopiaProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/ColorMatrix/ColorBlindness/ProtanopiaProcessor.cs
@@ -8,12 +8,14 @@ namespace ImageSharp.Processing.Processors
     using System;
     using System.Numerics;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// Converts the colors of the image recreating Protanopia (Red-Blind) color blindness.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    internal class ProtanopiaProcessor<TColor> : ColorMatrixProcessor<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    internal class ProtanopiaProcessor<TPixel> : ColorMatrixProcessor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <inheritdoc/>
         public override Matrix4x4 Matrix => new Matrix4x4()
diff --git a/src/ImageSharp/Processing/Processors/ColorMatrix/ColorBlindness/TritanomalyProcessor.cs b/src/ImageSharp/Processing/Processors/ColorMatrix/ColorBlindness/TritanomalyProcessor.cs
index 846e9c61a7..2b402197bc 100644
--- a/src/ImageSharp/Processing/Processors/ColorMatrix/ColorBlindness/TritanomalyProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/ColorMatrix/ColorBlindness/TritanomalyProcessor.cs
@@ -8,12 +8,14 @@ namespace ImageSharp.Processing.Processors
     using System;
     using System.Numerics;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// Converts the colors of the image recreating Tritanomaly (Blue-Weak) color blindness.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    internal class TritanomalyProcessor<TColor> : ColorMatrixProcessor<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    internal class TritanomalyProcessor<TPixel> : ColorMatrixProcessor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <inheritdoc/>
         public override Matrix4x4 Matrix => new Matrix4x4()
diff --git a/src/ImageSharp/Processing/Processors/ColorMatrix/ColorBlindness/TritanopiaProcessor.cs b/src/ImageSharp/Processing/Processors/ColorMatrix/ColorBlindness/TritanopiaProcessor.cs
index a0094f71f0..5d228afa79 100644
--- a/src/ImageSharp/Processing/Processors/ColorMatrix/ColorBlindness/TritanopiaProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/ColorMatrix/ColorBlindness/TritanopiaProcessor.cs
@@ -8,12 +8,14 @@ namespace ImageSharp.Processing.Processors
     using System;
     using System.Numerics;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// Converts the colors of the image recreating Tritanopia (Blue-Blind) color blindness.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    internal class TritanopiaProcessor<TColor> : ColorMatrixProcessor<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    internal class TritanopiaProcessor<TPixel> : ColorMatrixProcessor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <inheritdoc/>
         public override Matrix4x4 Matrix => new Matrix4x4()
diff --git a/src/ImageSharp/Processing/Processors/ColorMatrix/ColorMatrixProcessor.cs b/src/ImageSharp/Processing/Processors/ColorMatrix/ColorMatrixProcessor.cs
index c75da00037..b38093d634 100644
--- a/src/ImageSharp/Processing/Processors/ColorMatrix/ColorMatrixProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/ColorMatrix/ColorMatrixProcessor.cs
@@ -9,12 +9,14 @@ namespace ImageSharp.Processing.Processors
     using System.Numerics;
     using System.Threading.Tasks;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// The color matrix filter. Inherit from this class to perform operation involving color matrices.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    internal abstract class ColorMatrixProcessor<TColor> : ImageProcessor<TColor>, IColorMatrixFilter<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    internal abstract class ColorMatrixProcessor<TPixel> : ImageProcessor<TPixel>, IColorMatrixFilter<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <inheritdoc/>
         public abstract Matrix4x4 Matrix { get; }
@@ -23,7 +25,7 @@ namespace ImageSharp.Processing.Processors
         public override bool Compand { get; set; } = true;
 
         /// <inheritdoc/>
-        protected override void OnApply(ImageBase<TColor> source, Rectangle sourceRectangle)
+        protected override void OnApply(ImageBase<TPixel> source, Rectangle sourceRectangle)
         {
             int startY = sourceRectangle.Y;
             int endY = sourceRectangle.Bottom;
@@ -50,7 +52,7 @@ namespace ImageSharp.Processing.Processors
             Matrix4x4 matrix = this.Matrix;
             bool compand = this.Compand;
 
-            using (PixelAccessor<TColor> sourcePixels = source.Lock())
+            using (PixelAccessor<TPixel> sourcePixels = source.Lock())
             {
                 Parallel.For(
                     minY,
@@ -75,9 +77,9 @@ namespace ImageSharp.Processing.Processors
         /// <param name="matrix">The matrix.</param>
         /// <param name="compand">Whether to compand the color during processing.</param>
         /// <returns>
-        /// The <see cref="Color"/>.
+        /// The <see cref="Rgba32"/>.
         /// </returns>
-        private TColor ApplyMatrix(TColor color, Matrix4x4 matrix, bool compand)
+        private TPixel ApplyMatrix(TPixel color, Matrix4x4 matrix, bool compand)
         {
             Vector4 vector = color.ToVector4();
 
@@ -87,7 +89,7 @@ namespace ImageSharp.Processing.Processors
             }
 
             vector = Vector4.Transform(vector, matrix);
-            TColor packed = default(TColor);
+            TPixel packed = default(TPixel);
             packed.PackFromVector4(compand ? vector.Compress() : vector);
             return packed;
         }
diff --git a/src/ImageSharp/Processing/Processors/ColorMatrix/GrayscaleBt601Processor.cs b/src/ImageSharp/Processing/Processors/ColorMatrix/GrayscaleBt601Processor.cs
index 1f5a0fa7e9..65de8a66d2 100644
--- a/src/ImageSharp/Processing/Processors/ColorMatrix/GrayscaleBt601Processor.cs
+++ b/src/ImageSharp/Processing/Processors/ColorMatrix/GrayscaleBt601Processor.cs
@@ -8,13 +8,15 @@ namespace ImageSharp.Processing.Processors
     using System;
     using System.Numerics;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// Converts the colors of the image to Grayscale applying the formula as specified by ITU-R Recommendation BT.601
     /// <see href="https://en.wikipedia.org/wiki/Luma_%28video%29#Rec._601_luma_versus_Rec._709_luma_coefficients"/>.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    internal class GrayscaleBt601Processor<TColor> : ColorMatrixProcessor<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    internal class GrayscaleBt601Processor<TPixel> : ColorMatrixProcessor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <inheritdoc/>
         public override Matrix4x4 Matrix => new Matrix4x4()
diff --git a/src/ImageSharp/Processing/Processors/ColorMatrix/GrayscaleBt709Processor.cs b/src/ImageSharp/Processing/Processors/ColorMatrix/GrayscaleBt709Processor.cs
index 048462696a..5f71e357b7 100644
--- a/src/ImageSharp/Processing/Processors/ColorMatrix/GrayscaleBt709Processor.cs
+++ b/src/ImageSharp/Processing/Processors/ColorMatrix/GrayscaleBt709Processor.cs
@@ -8,13 +8,15 @@ namespace ImageSharp.Processing.Processors
     using System;
     using System.Numerics;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// Converts the colors of the image to Grayscale applying the formula as specified by ITU-R Recommendation BT.709
     /// <see href="https://en.wikipedia.org/wiki/Rec._709#Luma_coefficients"/>.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    internal class GrayscaleBt709Processor<TColor> : ColorMatrixProcessor<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    internal class GrayscaleBt709Processor<TPixel> : ColorMatrixProcessor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <inheritdoc/>
         public override Matrix4x4 Matrix => new Matrix4x4()
diff --git a/src/ImageSharp/Processing/Processors/ColorMatrix/HueProcessor.cs b/src/ImageSharp/Processing/Processors/ColorMatrix/HueProcessor.cs
index 0d06c58682..8995663a3b 100644
--- a/src/ImageSharp/Processing/Processors/ColorMatrix/HueProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/ColorMatrix/HueProcessor.cs
@@ -8,15 +8,17 @@ namespace ImageSharp.Processing.Processors
     using System;
     using System.Numerics;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
-    /// An <see cref="ImageProcessor{TColor}"/> to change the hue of an <see cref="Image{TColor}"/>.
+    /// An <see cref="ImageProcessor{TPixel}"/> to change the hue of an <see cref="Image{TPixel}"/>.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    internal class HueProcessor<TColor> : ColorMatrixProcessor<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    internal class HueProcessor<TPixel> : ColorMatrixProcessor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
-        /// Initializes a new instance of the <see cref="HueProcessor{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="HueProcessor{TPixel}"/> class.
         /// </summary>
         /// <param name="angle">The new brightness of the image. Must be between -100 and 100.</param>
         public HueProcessor(float angle)
diff --git a/src/ImageSharp/Processing/Processors/ColorMatrix/IColorMatrixFilter.cs b/src/ImageSharp/Processing/Processors/ColorMatrix/IColorMatrixFilter.cs
index 57296a0c3b..0c29c65a10 100644
--- a/src/ImageSharp/Processing/Processors/ColorMatrix/IColorMatrixFilter.cs
+++ b/src/ImageSharp/Processing/Processors/ColorMatrix/IColorMatrixFilter.cs
@@ -8,13 +8,15 @@ namespace ImageSharp.Processing.Processors
     using System;
     using System.Numerics;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// Encapsulates properties and methods for creating processors that utilize a matrix to
     /// alter the image pixels.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    internal interface IColorMatrixFilter<TColor> : IImageProcessor<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    internal interface IColorMatrixFilter<TPixel> : IImageProcessor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
         /// Gets the <see cref="Matrix4x4"/> used to alter the image.
diff --git a/src/ImageSharp/Processing/Processors/ColorMatrix/KodachromeProcessor.cs b/src/ImageSharp/Processing/Processors/ColorMatrix/KodachromeProcessor.cs
index 8df8efcd19..18514236f7 100644
--- a/src/ImageSharp/Processing/Processors/ColorMatrix/KodachromeProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/ColorMatrix/KodachromeProcessor.cs
@@ -8,12 +8,14 @@ namespace ImageSharp.Processing.Processors
     using System;
     using System.Numerics;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// Converts the colors of the image recreating an old Kodachrome camera effect.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    internal class KodachromeProcessor<TColor> : ColorMatrixProcessor<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    internal class KodachromeProcessor<TPixel> : ColorMatrixProcessor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <inheritdoc/>
         public override Matrix4x4 Matrix => new Matrix4x4()
diff --git a/src/ImageSharp/Processing/Processors/ColorMatrix/LomographProcessor.cs b/src/ImageSharp/Processing/Processors/ColorMatrix/LomographProcessor.cs
index b89caec863..70b9979972 100644
--- a/src/ImageSharp/Processing/Processors/ColorMatrix/LomographProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/ColorMatrix/LomographProcessor.cs
@@ -8,14 +8,16 @@ namespace ImageSharp.Processing.Processors
     using System;
     using System.Numerics;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// Converts the colors of the image recreating an old Lomograph effect.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    internal class LomographProcessor<TColor> : ColorMatrixProcessor<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    internal class LomographProcessor<TPixel> : ColorMatrixProcessor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
-        private static readonly TColor VeryDarkGreen = ColorBuilder<TColor>.FromRGBA(0, 10, 0, 255);
+        private static readonly TPixel VeryDarkGreen = ColorBuilder<TPixel>.FromRGBA(0, 10, 0, 255);
 
         /// <inheritdoc/>
         public override Matrix4x4 Matrix => new Matrix4x4()
@@ -30,9 +32,9 @@ namespace ImageSharp.Processing.Processors
         };
 
         /// <inheritdoc/>
-        protected override void AfterApply(ImageBase<TColor> source, Rectangle sourceRectangle)
+        protected override void AfterApply(ImageBase<TPixel> source, Rectangle sourceRectangle)
         {
-            new VignetteProcessor<TColor>(VeryDarkGreen).Apply(source, sourceRectangle);
+            new VignetteProcessor<TPixel>(VeryDarkGreen).Apply(source, sourceRectangle);
         }
     }
 }
\ No newline at end of file
diff --git a/src/ImageSharp/Processing/Processors/ColorMatrix/PolaroidProcessor.cs b/src/ImageSharp/Processing/Processors/ColorMatrix/PolaroidProcessor.cs
index b5a23f8557..ccc3c00608 100644
--- a/src/ImageSharp/Processing/Processors/ColorMatrix/PolaroidProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/ColorMatrix/PolaroidProcessor.cs
@@ -8,15 +8,17 @@ namespace ImageSharp.Processing.Processors
     using System;
     using System.Numerics;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// Converts the colors of the image recreating an old Polaroid effect.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    internal class PolaroidProcessor<TColor> : ColorMatrixProcessor<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    internal class PolaroidProcessor<TPixel> : ColorMatrixProcessor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
-        private static TColor veryDarkOrange = ColorBuilder<TColor>.FromRGB(102, 34, 0);
-        private static TColor lightOrange = ColorBuilder<TColor>.FromRGBA(255, 153, 102, 178);
+        private static TPixel veryDarkOrange = ColorBuilder<TPixel>.FromRGB(102, 34, 0);
+        private static TPixel lightOrange = ColorBuilder<TPixel>.FromRGBA(255, 153, 102, 178);
 
         /// <inheritdoc/>
         public override Matrix4x4 Matrix => new Matrix4x4()
@@ -37,10 +39,10 @@ namespace ImageSharp.Processing.Processors
         };
 
         /// <inheritdoc/>
-        protected override void AfterApply(ImageBase<TColor> source, Rectangle sourceRectangle)
+        protected override void AfterApply(ImageBase<TPixel> source, Rectangle sourceRectangle)
         {
-            new VignetteProcessor<TColor>(veryDarkOrange).Apply(source, sourceRectangle);
-            new GlowProcessor<TColor>(lightOrange) { Radius = source.Width / 4F }.Apply(source, sourceRectangle);
+            new VignetteProcessor<TPixel>(veryDarkOrange).Apply(source, sourceRectangle);
+            new GlowProcessor<TPixel>(lightOrange) { Radius = source.Width / 4F }.Apply(source, sourceRectangle);
         }
     }
 }
\ No newline at end of file
diff --git a/src/ImageSharp/Processing/Processors/ColorMatrix/SaturationProcessor.cs b/src/ImageSharp/Processing/Processors/ColorMatrix/SaturationProcessor.cs
index 371294dd56..3adfb83114 100644
--- a/src/ImageSharp/Processing/Processors/ColorMatrix/SaturationProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/ColorMatrix/SaturationProcessor.cs
@@ -8,15 +8,17 @@ namespace ImageSharp.Processing.Processors
     using System;
     using System.Numerics;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
-    /// An <see cref="ImageProcessor{TColor}"/> to change the saturation of an <see cref="Image{TColor}"/>.
+    /// An <see cref="ImageProcessor{TPixel}"/> to change the saturation of an <see cref="Image{TPixel}"/>.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    internal class SaturationProcessor<TColor> : ColorMatrixProcessor<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    internal class SaturationProcessor<TPixel> : ColorMatrixProcessor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
-        /// Initializes a new instance of the <see cref="SaturationProcessor{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="SaturationProcessor{TPixel}"/> class.
         /// </summary>
         /// <param name="saturation">The new saturation of the image. Must be between -100 and 100.</param>
         /// <exception cref="System.ArgumentException">
diff --git a/src/ImageSharp/Processing/Processors/ColorMatrix/SepiaProcessor.cs b/src/ImageSharp/Processing/Processors/ColorMatrix/SepiaProcessor.cs
index 49a071bd98..89be3acad5 100644
--- a/src/ImageSharp/Processing/Processors/ColorMatrix/SepiaProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/ColorMatrix/SepiaProcessor.cs
@@ -8,13 +8,15 @@ namespace ImageSharp.Processing.Processors
     using System;
     using System.Numerics;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// Converts the colors of the image to their sepia equivalent.
     /// The formula used matches the svg specification. <see href="http://www.w3.org/TR/filter-effects/#sepiaEquivalent"/>
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    internal class SepiaProcessor<TColor> : ColorMatrixProcessor<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    internal class SepiaProcessor<TPixel> : ColorMatrixProcessor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <inheritdoc/>
         public override Matrix4x4 Matrix => new Matrix4x4
diff --git a/src/ImageSharp/Processing/Processors/Convolution/BoxBlurProcessor.cs b/src/ImageSharp/Processing/Processors/Convolution/BoxBlurProcessor.cs
index 7ffca534cd..6524423880 100644
--- a/src/ImageSharp/Processing/Processors/Convolution/BoxBlurProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Convolution/BoxBlurProcessor.cs
@@ -7,12 +7,14 @@ namespace ImageSharp.Processing.Processors
 {
     using System;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// Applies a Box blur sampler to the image.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    internal class BoxBlurProcessor<TColor> : ImageProcessor<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    internal class BoxBlurProcessor<TPixel> : ImageProcessor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
         /// The maximum size of the kernel in either direction.
@@ -20,7 +22,7 @@ namespace ImageSharp.Processing.Processors
         private readonly int kernelSize;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="BoxBlurProcessor{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="BoxBlurProcessor{TPixel}"/> class.
         /// </summary>
         /// <param name="radius">
         /// The 'radius' value representing the size of the area to sample.
@@ -43,9 +45,9 @@ namespace ImageSharp.Processing.Processors
         public Fast2DArray<float> KernelY { get; }
 
         /// <inheritdoc/>
-        protected override void OnApply(ImageBase<TColor> source, Rectangle sourceRectangle)
+        protected override void OnApply(ImageBase<TPixel> source, Rectangle sourceRectangle)
         {
-            new Convolution2PassProcessor<TColor>(this.KernelX, this.KernelY).Apply(source, sourceRectangle);
+            new Convolution2PassProcessor<TPixel>(this.KernelX, this.KernelY).Apply(source, sourceRectangle);
         }
 
         /// <summary>
diff --git a/src/ImageSharp/Processing/Processors/Convolution/Convolution2DProcessor.cs b/src/ImageSharp/Processing/Processors/Convolution/Convolution2DProcessor.cs
index fa06a863ec..ac96c40ae6 100644
--- a/src/ImageSharp/Processing/Processors/Convolution/Convolution2DProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Convolution/Convolution2DProcessor.cs
@@ -9,15 +9,17 @@ namespace ImageSharp.Processing.Processors
     using System.Numerics;
     using System.Threading.Tasks;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// Defines a sampler that uses two one-dimensional matrices to perform convolution against an image.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    internal class Convolution2DProcessor<TColor> : ImageProcessor<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    internal class Convolution2DProcessor<TPixel> : ImageProcessor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
-        /// Initializes a new instance of the <see cref="Convolution2DProcessor{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="Convolution2DProcessor{TPixel}"/> class.
         /// </summary>
         /// <param name="kernelX">The horizontal gradient operator.</param>
         /// <param name="kernelY">The vertical gradient operator.</param>
@@ -38,7 +40,7 @@ namespace ImageSharp.Processing.Processors
         public Fast2DArray<float> KernelY { get; }
 
         /// <inheritdoc/>
-        protected override void OnApply(ImageBase<TColor> source, Rectangle sourceRectangle)
+        protected override void OnApply(ImageBase<TPixel> source, Rectangle sourceRectangle)
         {
             int kernelYHeight = this.KernelY.Height;
             int kernelYWidth = this.KernelY.Width;
@@ -54,9 +56,9 @@ namespace ImageSharp.Processing.Processors
             int maxY = endY - 1;
             int maxX = endX - 1;
 
-            using (PixelAccessor<TColor> targetPixels = new PixelAccessor<TColor>(source.Width, source.Height))
+            using (PixelAccessor<TPixel> targetPixels = new PixelAccessor<TPixel>(source.Width, source.Height))
             {
-                using (PixelAccessor<TColor> sourcePixels = source.Lock())
+                using (PixelAccessor<TPixel> sourcePixels = source.Lock())
                 {
                     Parallel.For(
                     startY,
@@ -112,7 +114,7 @@ namespace ImageSharp.Processing.Processors
                             float green = MathF.Sqrt((gX * gX) + (gY * gY));
                             float blue = MathF.Sqrt((bX * bX) + (bY * bY));
 
-                            TColor packed = default(TColor);
+                            TPixel packed = default(TPixel);
                             packed.PackFromVector4(new Vector4(red, green, blue, sourcePixels[x, y].ToVector4().W));
                             targetPixels[x, y] = packed;
                         }
diff --git a/src/ImageSharp/Processing/Processors/Convolution/Convolution2PassProcessor.cs b/src/ImageSharp/Processing/Processors/Convolution/Convolution2PassProcessor.cs
index 45906a46fc..9b95cb1a37 100644
--- a/src/ImageSharp/Processing/Processors/Convolution/Convolution2PassProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Convolution/Convolution2PassProcessor.cs
@@ -9,15 +9,17 @@ namespace ImageSharp.Processing.Processors
     using System.Numerics;
     using System.Threading.Tasks;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// Defines a sampler that uses two one-dimensional matrices to perform two-pass convolution against an image.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    internal class Convolution2PassProcessor<TColor> : ImageProcessor<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    internal class Convolution2PassProcessor<TPixel> : ImageProcessor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
-        /// Initializes a new instance of the <see cref="Convolution2PassProcessor{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="Convolution2PassProcessor{TPixel}"/> class.
         /// </summary>
         /// <param name="kernelX">The horizontal gradient operator.</param>
         /// <param name="kernelY">The vertical gradient operator.</param>
@@ -38,15 +40,15 @@ namespace ImageSharp.Processing.Processors
         public Fast2DArray<float> KernelY { get; }
 
         /// <inheritdoc/>
-        protected override void OnApply(ImageBase<TColor> source, Rectangle sourceRectangle)
+        protected override void OnApply(ImageBase<TPixel> source, Rectangle sourceRectangle)
         {
             int width = source.Width;
             int height = source.Height;
 
-            using (PixelAccessor<TColor> targetPixels = new PixelAccessor<TColor>(width, height))
+            using (PixelAccessor<TPixel> targetPixels = new PixelAccessor<TPixel>(width, height))
             {
-                using (PixelAccessor<TColor> firstPassPixels = new PixelAccessor<TColor>(width, height))
-                using (PixelAccessor<TColor> sourcePixels = source.Lock())
+                using (PixelAccessor<TPixel> firstPassPixels = new PixelAccessor<TPixel>(width, height))
+                using (PixelAccessor<TPixel> sourcePixels = source.Lock())
                 {
                     this.ApplyConvolution(firstPassPixels, sourcePixels, sourceRectangle, this.KernelX);
                     this.ApplyConvolution(targetPixels, firstPassPixels, sourceRectangle, this.KernelY);
@@ -57,7 +59,7 @@ namespace ImageSharp.Processing.Processors
         }
 
         /// <summary>
-        /// Applies the process to the specified portion of the specified <see cref="ImageBase{TColor}"/> at the specified location
+        /// Applies the process to the specified portion of the specified <see cref="ImageBase{TPixel}"/> at the specified location
         /// and with the specified size.
         /// </summary>
         /// <param name="targetPixels">The target pixels to apply the process to.</param>
@@ -66,7 +68,7 @@ namespace ImageSharp.Processing.Processors
         /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to draw.
         /// </param>
         /// <param name="kernel">The kernel operator.</param>
-        private void ApplyConvolution(PixelAccessor<TColor> targetPixels, PixelAccessor<TColor> sourcePixels, Rectangle sourceRectangle, Fast2DArray<float> kernel)
+        private void ApplyConvolution(PixelAccessor<TPixel> targetPixels, PixelAccessor<TPixel> sourcePixels, Rectangle sourceRectangle, Fast2DArray<float> kernel)
         {
             int kernelHeight = kernel.Height;
             int kernelWidth = kernel.Width;
@@ -110,7 +112,7 @@ namespace ImageSharp.Processing.Processors
                             }
                         }
 
-                        TColor packed = default(TColor);
+                        TPixel packed = default(TPixel);
                         packed.PackFromVector4(destination);
                         targetPixels[x, y] = packed;
                     }
diff --git a/src/ImageSharp/Processing/Processors/Convolution/ConvolutionProcessor.cs b/src/ImageSharp/Processing/Processors/Convolution/ConvolutionProcessor.cs
index 3ab95c4ce9..a0c1400286 100644
--- a/src/ImageSharp/Processing/Processors/Convolution/ConvolutionProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Convolution/ConvolutionProcessor.cs
@@ -9,15 +9,17 @@ namespace ImageSharp.Processing.Processors
     using System.Numerics;
     using System.Threading.Tasks;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// Defines a sampler that uses a 2 dimensional matrix to perform convolution against an image.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    internal class ConvolutionProcessor<TColor> : ImageProcessor<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    internal class ConvolutionProcessor<TPixel> : ImageProcessor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
-        /// Initializes a new instance of the <see cref="ConvolutionProcessor{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="ConvolutionProcessor{TPixel}"/> class.
         /// </summary>
         /// <param name="kernelXY">The 2d gradient operator.</param>
         public ConvolutionProcessor(Fast2DArray<float> kernelXY)
@@ -31,7 +33,7 @@ namespace ImageSharp.Processing.Processors
         public Fast2DArray<float> KernelXY { get; }
 
         /// <inheritdoc/>
-        protected override void OnApply(ImageBase<TColor> source, Rectangle sourceRectangle)
+        protected override void OnApply(ImageBase<TPixel> source, Rectangle sourceRectangle)
         {
             int kernelLength = this.KernelXY.Height;
             int radius = kernelLength >> 1;
@@ -43,9 +45,9 @@ namespace ImageSharp.Processing.Processors
             int maxY = endY - 1;
             int maxX = endX - 1;
 
-            using (PixelAccessor<TColor> targetPixels = new PixelAccessor<TColor>(source.Width, source.Height))
+            using (PixelAccessor<TPixel> targetPixels = new PixelAccessor<TPixel>(source.Width, source.Height))
             {
-                using (PixelAccessor<TColor> sourcePixels = source.Lock())
+                using (PixelAccessor<TPixel> sourcePixels = source.Lock())
                 {
                     Parallel.For(
                     startY,
@@ -83,7 +85,7 @@ namespace ImageSharp.Processing.Processors
                                 }
                             }
 
-                            TColor packed = default(TColor);
+                            TPixel packed = default(TPixel);
                             packed.PackFromVector4(new Vector4(red, green, blue, sourcePixels[x, y].ToVector4().W));
                             targetPixels[x, y] = packed;
                         }
diff --git a/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/EdgeDetector2DProcessor.cs b/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/EdgeDetector2DProcessor.cs
index b5c6816569..457854a314 100644
--- a/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/EdgeDetector2DProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/EdgeDetector2DProcessor.cs
@@ -7,15 +7,17 @@ namespace ImageSharp.Processing.Processors
 {
     using System;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// Defines a sampler that detects edges within an image using two one-dimensional matrices.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    internal abstract class EdgeDetector2DProcessor<TColor> : ImageProcessor<TColor>, IEdgeDetectorProcessor<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    internal abstract class EdgeDetector2DProcessor<TPixel> : ImageProcessor<TPixel>, IEdgeDetectorProcessor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
-        /// Initializes a new instance of the <see cref="EdgeDetector2DProcessor{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="EdgeDetector2DProcessor{TPixel}"/> class.
         /// </summary>
         /// <param name="kernelX">The horizontal gradient operator.</param>
         /// <param name="kernelY">The vertical gradient operator.</param>
@@ -39,17 +41,17 @@ namespace ImageSharp.Processing.Processors
         public bool Grayscale { get; set; }
 
         /// <inheritdoc />
-        protected override void OnApply(ImageBase<TColor> source, Rectangle sourceRectangle)
+        protected override void OnApply(ImageBase<TPixel> source, Rectangle sourceRectangle)
         {
-            new Convolution2DProcessor<TColor>(this.KernelX, this.KernelY).Apply(source, sourceRectangle);
+            new Convolution2DProcessor<TPixel>(this.KernelX, this.KernelY).Apply(source, sourceRectangle);
         }
 
         /// <inheritdoc/>
-        protected override void BeforeApply(ImageBase<TColor> source, Rectangle sourceRectangle)
+        protected override void BeforeApply(ImageBase<TPixel> source, Rectangle sourceRectangle)
         {
             if (this.Grayscale)
             {
-                new GrayscaleBt709Processor<TColor>().Apply(source, sourceRectangle);
+                new GrayscaleBt709Processor<TPixel>().Apply(source, sourceRectangle);
             }
         }
     }
diff --git a/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/EdgeDetectorCompassProcessor.cs b/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/EdgeDetectorCompassProcessor.cs
index e92c2d1093..a4d1d54094 100644
--- a/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/EdgeDetectorCompassProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/EdgeDetectorCompassProcessor.cs
@@ -9,12 +9,14 @@ namespace ImageSharp.Processing.Processors
     using System.Numerics;
     using System.Threading.Tasks;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// Defines a sampler that detects edges within an image using a eight two dimensional matrices.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    internal abstract class EdgeDetectorCompassProcessor<TColor> : ImageProcessor<TColor>, IEdgeDetectorProcessor<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    internal abstract class EdgeDetectorCompassProcessor<TPixel> : ImageProcessor<TPixel>, IEdgeDetectorProcessor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
         /// Gets the North gradient operator
@@ -60,16 +62,16 @@ namespace ImageSharp.Processing.Processors
         public bool Grayscale { get; set; }
 
         /// <inheritdoc/>
-        protected override void BeforeApply(ImageBase<TColor> source, Rectangle sourceRectangle)
+        protected override void BeforeApply(ImageBase<TPixel> source, Rectangle sourceRectangle)
         {
             if (this.Grayscale)
             {
-                new GrayscaleBt709Processor<TColor>().Apply(source, sourceRectangle);
+                new GrayscaleBt709Processor<TPixel>().Apply(source, sourceRectangle);
             }
         }
 
         /// <inheritdoc />
-        protected override void OnApply(ImageBase<TColor> source, Rectangle sourceRectangle)
+        protected override void OnApply(ImageBase<TPixel> source, Rectangle sourceRectangle)
         {
             Fast2DArray<float>[] kernels = { this.North, this.NorthWest, this.West, this.SouthWest, this.South, this.SouthEast, this.East, this.NorthEast };
 
@@ -85,9 +87,9 @@ namespace ImageSharp.Processing.Processors
             int maxY = Math.Min(source.Height, endY);
 
             // we need a clean copy for each pass to start from
-            using (ImageBase<TColor> cleanCopy = new Image<TColor>(source))
+            using (ImageBase<TPixel> cleanCopy = new Image<TPixel>(source))
             {
-                new ConvolutionProcessor<TColor>(kernels[0]).Apply(source, sourceRectangle);
+                new ConvolutionProcessor<TPixel>(kernels[0]).Apply(source, sourceRectangle);
 
                 if (kernels.Length == 1)
                 {
@@ -112,12 +114,12 @@ namespace ImageSharp.Processing.Processors
                 // ReSharper disable once ForCanBeConvertedToForeach
                 for (int i = 1; i < kernels.Length; i++)
                 {
-                    using (ImageBase<TColor> pass = new Image<TColor>(cleanCopy))
+                    using (ImageBase<TPixel> pass = new Image<TPixel>(cleanCopy))
                     {
-                        new ConvolutionProcessor<TColor>(kernels[i]).Apply(pass, sourceRectangle);
+                        new ConvolutionProcessor<TPixel>(kernels[i]).Apply(pass, sourceRectangle);
 
-                        using (PixelAccessor<TColor> passPixels = pass.Lock())
-                        using (PixelAccessor<TColor> targetPixels = source.Lock())
+                        using (PixelAccessor<TPixel> passPixels = pass.Lock())
+                        using (PixelAccessor<TPixel> targetPixels = source.Lock())
                         {
                             Parallel.For(
                                 minY,
@@ -131,7 +133,7 @@ namespace ImageSharp.Processing.Processors
                                         int offsetX = x - shiftX;
 
                                         // Grab the max components of the two pixels
-                                        TColor packed = default(TColor);
+                                        TPixel packed = default(TPixel);
                                         packed.PackFromVector4(Vector4.Max(passPixels[offsetX, offsetY].ToVector4(), targetPixels[offsetX, offsetY].ToVector4()));
                                         targetPixels[offsetX, offsetY] = packed;
                                     }
diff --git a/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/EdgeDetectorProcessor.cs b/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/EdgeDetectorProcessor.cs
index d8b491faf5..e7670dd1d2 100644
--- a/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/EdgeDetectorProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/EdgeDetectorProcessor.cs
@@ -7,15 +7,17 @@ namespace ImageSharp.Processing.Processors
 {
     using System;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// Defines a sampler that detects edges within an image using a single two dimensional matrix.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    internal abstract class EdgeDetectorProcessor<TColor> : ImageProcessor<TColor>, IEdgeDetectorProcessor<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    internal abstract class EdgeDetectorProcessor<TPixel> : ImageProcessor<TPixel>, IEdgeDetectorProcessor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
-        /// Initializes a new instance of the <see cref="EdgeDetectorProcessor{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="EdgeDetectorProcessor{TPixel}"/> class.
         /// </summary>
         /// <param name="kernelXY">The 2d gradient operator.</param>
         protected EdgeDetectorProcessor(Fast2DArray<float> kernelXY)
@@ -32,18 +34,18 @@ namespace ImageSharp.Processing.Processors
         public Fast2DArray<float> KernelXY { get; }
 
         /// <inheritdoc/>
-        protected override void BeforeApply(ImageBase<TColor> source, Rectangle sourceRectangle)
+        protected override void BeforeApply(ImageBase<TPixel> source, Rectangle sourceRectangle)
         {
             if (this.Grayscale)
             {
-                new GrayscaleBt709Processor<TColor>().Apply(source, sourceRectangle);
+                new GrayscaleBt709Processor<TPixel>().Apply(source, sourceRectangle);
             }
         }
 
         /// <inheritdoc/>
-        protected override void OnApply(ImageBase<TColor> source, Rectangle sourceRectangle)
+        protected override void OnApply(ImageBase<TPixel> source, Rectangle sourceRectangle)
         {
-            new ConvolutionProcessor<TColor>(this.KernelXY).Apply(source, sourceRectangle);
+            new ConvolutionProcessor<TPixel>(this.KernelXY).Apply(source, sourceRectangle);
         }
     }
 }
\ No newline at end of file
diff --git a/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/IEdgeDetectorProcessor.cs b/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/IEdgeDetectorProcessor.cs
index 7c0923bbbd..c7c126794d 100644
--- a/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/IEdgeDetectorProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/IEdgeDetectorProcessor.cs
@@ -7,12 +7,14 @@ namespace ImageSharp.Processing.Processors
 {
     using System;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// Provides properties and methods allowing the detection of edges within an image.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    public interface IEdgeDetectorProcessor<TColor> : IImageProcessor<TColor>, IEdgeDetectorProcessor
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    public interface IEdgeDetectorProcessor<TPixel> : IImageProcessor<TPixel>, IEdgeDetectorProcessor
+        where TPixel : struct, IPixel<TPixel>
     {
     }
 
diff --git a/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/KayyaliProcessor.cs b/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/KayyaliProcessor.cs
index 20e7b1b176..d72816a76d 100644
--- a/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/KayyaliProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/KayyaliProcessor.cs
@@ -8,14 +8,16 @@ namespace ImageSharp.Processing.Processors
     using System;
     using System.Diagnostics.CodeAnalysis;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// The Kayyali operator filter.
     /// <see href="http://edgedetection.webs.com/"/>
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
     [SuppressMessage("ReSharper", "StaticMemberInGenericType", Justification = "We want to use only one instance of each array field for each generic type.")]
-    internal class KayyaliProcessor<TColor> : EdgeDetector2DProcessor<TColor>
-        where TColor : struct, IPixel<TColor>
+    internal class KayyaliProcessor<TPixel> : EdgeDetector2DProcessor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
         /// The horizontal gradient operator.
@@ -40,7 +42,7 @@ namespace ImageSharp.Processing.Processors
             };
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="KayyaliProcessor{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="KayyaliProcessor{TPixel}"/> class.
         /// </summary>
         public KayyaliProcessor()
             : base(KayyaliX, KayyaliY)
diff --git a/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/KirschProcessor.cs b/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/KirschProcessor.cs
index 1b88a2200e..d882bdb169 100644
--- a/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/KirschProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/KirschProcessor.cs
@@ -8,14 +8,16 @@ namespace ImageSharp.Processing.Processors
     using System;
     using System.Diagnostics.CodeAnalysis;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// The Kirsch operator filter.
     /// <see href="http://en.wikipedia.org/wiki/Kirsch_operator"/>
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
     [SuppressMessage("ReSharper", "StaticMemberInGenericType", Justification = "We want to use only one instance of each array field for each generic type.")]
-    internal class KirschProcessor<TColor> : EdgeDetectorCompassProcessor<TColor>
-        where TColor : struct, IPixel<TColor>
+    internal class KirschProcessor<TPixel> : EdgeDetectorCompassProcessor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
         /// The North gradient operator
diff --git a/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/Laplacian3X3Processor.cs b/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/Laplacian3X3Processor.cs
index ec6963b1ea..39f64fb5a3 100644
--- a/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/Laplacian3X3Processor.cs
+++ b/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/Laplacian3X3Processor.cs
@@ -8,14 +8,16 @@ namespace ImageSharp.Processing.Processors
     using System;
     using System.Diagnostics.CodeAnalysis;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// The Laplacian 3 x 3 operator filter.
     /// <see href="http://en.wikipedia.org/wiki/Discrete_Laplace_operator"/>
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
     [SuppressMessage("ReSharper", "StaticMemberInGenericType", Justification = "We want to use only one instance of each array field for each generic type.")]
-    internal class Laplacian3X3Processor<TColor> : EdgeDetectorProcessor<TColor>
-        where TColor : struct, IPixel<TColor>
+    internal class Laplacian3X3Processor<TPixel> : EdgeDetectorProcessor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
         /// The 2d gradient operator.
@@ -29,7 +31,7 @@ namespace ImageSharp.Processing.Processors
             };
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="Laplacian3X3Processor{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="Laplacian3X3Processor{TPixel}"/> class.
         /// </summary>
         public Laplacian3X3Processor()
             : base(Laplacian3X3XY)
diff --git a/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/Laplacian5X5Processor.cs b/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/Laplacian5X5Processor.cs
index cc68c4fb71..c65cb5bd76 100644
--- a/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/Laplacian5X5Processor.cs
+++ b/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/Laplacian5X5Processor.cs
@@ -8,14 +8,16 @@ namespace ImageSharp.Processing.Processors
     using System;
     using System.Diagnostics.CodeAnalysis;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// The Laplacian 5 x 5 operator filter.
     /// <see href="http://en.wikipedia.org/wiki/Discrete_Laplace_operator"/>
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
     [SuppressMessage("ReSharper", "StaticMemberInGenericType", Justification = "We want to use only one instance of each array field for each generic type.")]
-    internal class Laplacian5X5Processor<TColor> : EdgeDetectorProcessor<TColor>
-        where TColor : struct, IPixel<TColor>
+    internal class Laplacian5X5Processor<TPixel> : EdgeDetectorProcessor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
         /// The 2d gradient operator.
@@ -31,7 +33,7 @@ namespace ImageSharp.Processing.Processors
             };
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="Laplacian5X5Processor{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="Laplacian5X5Processor{TPixel}"/> class.
         /// </summary>
         public Laplacian5X5Processor()
             : base(Laplacian5X5XY)
diff --git a/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/LaplacianOfGaussianProcessor.cs b/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/LaplacianOfGaussianProcessor.cs
index f0944e6818..57ab4dce62 100644
--- a/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/LaplacianOfGaussianProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/LaplacianOfGaussianProcessor.cs
@@ -8,14 +8,16 @@ namespace ImageSharp.Processing.Processors
     using System;
     using System.Diagnostics.CodeAnalysis;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// The Laplacian of Gaussian operator filter.
     /// <see href="http://fourier.eng.hmc.edu/e161/lectures/gradient/node8.html"/>
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
     [SuppressMessage("ReSharper", "StaticMemberInGenericType", Justification = "We want to use only one instance of each array field for each generic type.")]
-    internal class LaplacianOfGaussianProcessor<TColor> : EdgeDetectorProcessor<TColor>
-        where TColor : struct, IPixel<TColor>
+    internal class LaplacianOfGaussianProcessor<TPixel> : EdgeDetectorProcessor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
         /// The 2d gradient operator.
@@ -31,7 +33,7 @@ namespace ImageSharp.Processing.Processors
             };
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="LaplacianOfGaussianProcessor{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="LaplacianOfGaussianProcessor{TPixel}"/> class.
         /// </summary>
         public LaplacianOfGaussianProcessor()
             : base(LaplacianOfGaussianXY)
diff --git a/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/PrewittProcessor.cs b/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/PrewittProcessor.cs
index fdb63d837e..d1515dee8e 100644
--- a/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/PrewittProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/PrewittProcessor.cs
@@ -8,14 +8,16 @@ namespace ImageSharp.Processing.Processors
     using System;
     using System.Diagnostics.CodeAnalysis;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// The Prewitt operator filter.
     /// <see href="http://en.wikipedia.org/wiki/Prewitt_operator"/>
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
     [SuppressMessage("ReSharper", "StaticMemberInGenericType", Justification = "We want to use only one instance of each array field for each generic type.")]
-    internal class PrewittProcessor<TColor> : EdgeDetector2DProcessor<TColor>
-        where TColor : struct, IPixel<TColor>
+    internal class PrewittProcessor<TPixel> : EdgeDetector2DProcessor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
         /// The horizontal gradient operator.
@@ -40,7 +42,7 @@ namespace ImageSharp.Processing.Processors
             };
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="PrewittProcessor{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="PrewittProcessor{TPixel}"/> class.
         /// </summary>
         public PrewittProcessor()
             : base(PrewittX, PrewittY)
diff --git a/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/RobertsCrossProcessor.cs b/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/RobertsCrossProcessor.cs
index d9c5f5d213..bab9ff6222 100644
--- a/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/RobertsCrossProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/RobertsCrossProcessor.cs
@@ -8,14 +8,16 @@ namespace ImageSharp.Processing.Processors
     using System;
     using System.Diagnostics.CodeAnalysis;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// The Roberts Cross operator filter.
     /// <see href="http://en.wikipedia.org/wiki/Roberts_cross"/>
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
     [SuppressMessage("ReSharper", "StaticMemberInGenericType", Justification = "We want to use only one instance of each array field for each generic type.")]
-    internal class RobertsCrossProcessor<TColor> : EdgeDetector2DProcessor<TColor>
-        where TColor : struct, IPixel<TColor>
+    internal class RobertsCrossProcessor<TPixel> : EdgeDetector2DProcessor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
         /// The horizontal gradient operator.
@@ -38,7 +40,7 @@ namespace ImageSharp.Processing.Processors
             };
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="RobertsCrossProcessor{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="RobertsCrossProcessor{TPixel}"/> class.
         /// </summary>
         public RobertsCrossProcessor()
             : base(RobertsCrossX, RobertsCrossY)
diff --git a/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/RobinsonProcessor.cs b/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/RobinsonProcessor.cs
index 681d983c45..4afca0f017 100644
--- a/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/RobinsonProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/RobinsonProcessor.cs
@@ -8,14 +8,16 @@ namespace ImageSharp.Processing.Processors
     using System;
     using System.Diagnostics.CodeAnalysis;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// The Kirsch operator filter.
     /// <see href="http://www.tutorialspoint.com/dip/Robinson_Compass_Mask.htm"/>
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
     [SuppressMessage("ReSharper", "StaticMemberInGenericType", Justification = "We want to use only one instance of each array field for each generic type.")]
-    internal class RobinsonProcessor<TColor> : EdgeDetectorCompassProcessor<TColor>
-        where TColor : struct, IPixel<TColor>
+    internal class RobinsonProcessor<TPixel> : EdgeDetectorCompassProcessor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
         /// The North gradient operator
diff --git a/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/ScharrProcessor.cs b/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/ScharrProcessor.cs
index c1e83b7f97..a583d3c0d0 100644
--- a/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/ScharrProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/ScharrProcessor.cs
@@ -8,14 +8,16 @@ namespace ImageSharp.Processing.Processors
     using System;
     using System.Diagnostics.CodeAnalysis;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// The Scharr operator filter.
     /// <see href="http://en.wikipedia.org/wiki/Sobel_operator#Alternative_operators"/>
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
     [SuppressMessage("ReSharper", "StaticMemberInGenericType", Justification = "We want to use only one instance of each array field for each generic type.")]
-    internal class ScharrProcessor<TColor> : EdgeDetector2DProcessor<TColor>
-        where TColor : struct, IPixel<TColor>
+    internal class ScharrProcessor<TPixel> : EdgeDetector2DProcessor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
         /// The horizontal gradient operator.
@@ -40,7 +42,7 @@ namespace ImageSharp.Processing.Processors
             };
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="ScharrProcessor{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="ScharrProcessor{TPixel}"/> class.
         /// </summary>
         public ScharrProcessor()
             : base(ScharrX, ScharrY)
diff --git a/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/SobelProcessor.cs b/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/SobelProcessor.cs
index 0c13fa3d24..1c2a6a18f9 100644
--- a/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/SobelProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Convolution/EdgeDetection/SobelProcessor.cs
@@ -8,14 +8,16 @@ namespace ImageSharp.Processing.Processors
     using System;
     using System.Diagnostics.CodeAnalysis;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// The Sobel operator filter.
     /// <see href="http://en.wikipedia.org/wiki/Sobel_operator"/>
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
     [SuppressMessage("ReSharper", "StaticMemberInGenericType", Justification = "We want to use only one instance of each array field for each generic type.")]
-    internal class SobelProcessor<TColor> : EdgeDetector2DProcessor<TColor>
-        where TColor : struct, IPixel<TColor>
+    internal class SobelProcessor<TPixel> : EdgeDetector2DProcessor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
         /// The horizontal gradient operator.
@@ -40,7 +42,7 @@ namespace ImageSharp.Processing.Processors
             };
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="SobelProcessor{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="SobelProcessor{TPixel}"/> class.
         /// </summary>
         public SobelProcessor()
             : base(SobelX, SobelY)
diff --git a/src/ImageSharp/Processing/Processors/Convolution/GaussianBlurProcessor.cs b/src/ImageSharp/Processing/Processors/Convolution/GaussianBlurProcessor.cs
index 65a137e359..87de922a1d 100644
--- a/src/ImageSharp/Processing/Processors/Convolution/GaussianBlurProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Convolution/GaussianBlurProcessor.cs
@@ -7,12 +7,14 @@ namespace ImageSharp.Processing.Processors
 {
     using System;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// Applies a Gaussian blur sampler to the image.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    internal class GaussianBlurProcessor<TColor> : ImageProcessor<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    internal class GaussianBlurProcessor<TPixel> : ImageProcessor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
         /// The maximum size of the kernel in either direction.
@@ -25,7 +27,7 @@ namespace ImageSharp.Processing.Processors
         private readonly float sigma;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="GaussianBlurProcessor{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="GaussianBlurProcessor{TPixel}"/> class.
         /// </summary>
         /// <param name="sigma">The 'sigma' value representing the weight of the blur.</param>
         public GaussianBlurProcessor(float sigma = 3f)
@@ -37,7 +39,7 @@ namespace ImageSharp.Processing.Processors
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="GaussianBlurProcessor{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="GaussianBlurProcessor{TPixel}"/> class.
         /// </summary>
         /// <param name="radius">
         /// The 'radius' value representing the size of the area to sample.
@@ -51,7 +53,7 @@ namespace ImageSharp.Processing.Processors
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="GaussianBlurProcessor{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="GaussianBlurProcessor{TPixel}"/> class.
         /// </summary>
         /// <param name="sigma">
         /// The 'sigma' value representing the weight of the blur.
@@ -79,9 +81,9 @@ namespace ImageSharp.Processing.Processors
         public Fast2DArray<float> KernelY { get; }
 
         /// <inheritdoc/>
-        protected override void OnApply(ImageBase<TColor> source, Rectangle sourceRectangle)
+        protected override void OnApply(ImageBase<TPixel> source, Rectangle sourceRectangle)
         {
-            new Convolution2PassProcessor<TColor>(this.KernelX, this.KernelY).Apply(source, sourceRectangle);
+            new Convolution2PassProcessor<TPixel>(this.KernelX, this.KernelY).Apply(source, sourceRectangle);
         }
 
         /// <summary>
diff --git a/src/ImageSharp/Processing/Processors/Convolution/GaussianSharpenProcessor.cs b/src/ImageSharp/Processing/Processors/Convolution/GaussianSharpenProcessor.cs
index bb3dc6f999..34d0990335 100644
--- a/src/ImageSharp/Processing/Processors/Convolution/GaussianSharpenProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Convolution/GaussianSharpenProcessor.cs
@@ -7,12 +7,14 @@ namespace ImageSharp.Processing.Processors
 {
     using System;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// Applies a Gaussian sharpening sampler to the image.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    internal class GaussianSharpenProcessor<TColor> : ImageProcessor<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    internal class GaussianSharpenProcessor<TPixel> : ImageProcessor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
         /// The maximum size of the kernel in either direction.
@@ -25,7 +27,7 @@ namespace ImageSharp.Processing.Processors
         private readonly float sigma;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="GaussianSharpenProcessor{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="GaussianSharpenProcessor{TPixel}"/> class.
         /// </summary>
         /// <param name="sigma">
         /// The 'sigma' value representing the weight of the sharpening.
@@ -39,7 +41,7 @@ namespace ImageSharp.Processing.Processors
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="GaussianSharpenProcessor{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="GaussianSharpenProcessor{TPixel}"/> class.
         /// </summary>
         /// <param name="radius">
         /// The 'radius' value representing the size of the area to sample.
@@ -53,7 +55,7 @@ namespace ImageSharp.Processing.Processors
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="GaussianSharpenProcessor{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="GaussianSharpenProcessor{TPixel}"/> class.
         /// </summary>
         /// <param name="sigma">
         /// The 'sigma' value representing the weight of the sharpen.
@@ -81,9 +83,9 @@ namespace ImageSharp.Processing.Processors
         public Fast2DArray<float> KernelY { get; }
 
         /// <inheritdoc/>
-        protected override void OnApply(ImageBase<TColor> source, Rectangle sourceRectangle)
+        protected override void OnApply(ImageBase<TPixel> source, Rectangle sourceRectangle)
         {
-            new Convolution2PassProcessor<TColor>(this.KernelX, this.KernelY).Apply(source, sourceRectangle);
+            new Convolution2PassProcessor<TPixel>(this.KernelX, this.KernelY).Apply(source, sourceRectangle);
         }
 
         /// <summary>
diff --git a/src/ImageSharp/Processing/Processors/Effects/AlphaProcessor.cs b/src/ImageSharp/Processing/Processors/Effects/AlphaProcessor.cs
index ce48aea1ad..a601065461 100644
--- a/src/ImageSharp/Processing/Processors/Effects/AlphaProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Effects/AlphaProcessor.cs
@@ -9,15 +9,17 @@ namespace ImageSharp.Processing.Processors
     using System.Numerics;
     using System.Threading.Tasks;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
-    /// An <see cref="IImageProcessor{TColor}"/> to change the alpha component of an <see cref="Image{TColor}"/>.
+    /// An <see cref="IImageProcessor{TPixel}"/> to change the alpha component of an <see cref="Image{TPixel}"/>.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    internal class AlphaProcessor<TColor> : ImageProcessor<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    internal class AlphaProcessor<TPixel> : ImageProcessor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
-        /// Initializes a new instance of the <see cref="AlphaProcessor{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="AlphaProcessor{TPixel}"/> class.
         /// </summary>
         /// <param name="percent">The percentage to adjust the opacity of the image. Must be between 0 and 100.</param>
         /// <exception cref="System.ArgumentException">
@@ -35,7 +37,7 @@ namespace ImageSharp.Processing.Processors
         public int Value { get; }
 
         /// <inheritdoc/>
-        protected override void OnApply(ImageBase<TColor> source, Rectangle sourceRectangle)
+        protected override void OnApply(ImageBase<TPixel> source, Rectangle sourceRectangle)
         {
             float alpha = this.Value / 100F;
 
@@ -63,7 +65,7 @@ namespace ImageSharp.Processing.Processors
 
             Vector4 alphaVector = new Vector4(1, 1, 1, alpha);
 
-            using (PixelAccessor<TColor> sourcePixels = source.Lock())
+            using (PixelAccessor<TPixel> sourcePixels = source.Lock())
             {
                 Parallel.For(
                     minY,
@@ -75,7 +77,7 @@ namespace ImageSharp.Processing.Processors
                         for (int x = minX; x < maxX; x++)
                         {
                             int offsetX = x - startX;
-                            TColor packed = default(TColor);
+                            TPixel packed = default(TPixel);
                             packed.PackFromVector4(sourcePixels[offsetX, offsetY].ToVector4() * alphaVector);
                             sourcePixels[offsetX, offsetY] = packed;
                         }
diff --git a/src/ImageSharp/Processing/Processors/Effects/BackgroundColorProcessor.cs b/src/ImageSharp/Processing/Processors/Effects/BackgroundColorProcessor.cs
index d928eb1a47..21973de3e4 100644
--- a/src/ImageSharp/Processing/Processors/Effects/BackgroundColorProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Effects/BackgroundColorProcessor.cs
@@ -9,18 +9,20 @@ namespace ImageSharp.Processing.Processors
     using System.Numerics;
     using System.Threading.Tasks;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// Sets the background color of the image.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    internal class BackgroundColorProcessor<TColor> : ImageProcessor<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    internal class BackgroundColorProcessor<TPixel> : ImageProcessor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
-        /// Initializes a new instance of the <see cref="BackgroundColorProcessor{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="BackgroundColorProcessor{TPixel}"/> class.
         /// </summary>
-        /// <param name="color">The <typeparamref name="TColor"/> to set the background color to.</param>
-        public BackgroundColorProcessor(TColor color)
+        /// <param name="color">The <typeparamref name="TPixel"/> to set the background color to.</param>
+        public BackgroundColorProcessor(TPixel color)
         {
             this.Value = color;
         }
@@ -28,10 +30,10 @@ namespace ImageSharp.Processing.Processors
         /// <summary>
         /// Gets the background color value.
         /// </summary>
-        public TColor Value { get; }
+        public TPixel Value { get; }
 
         /// <inheritdoc/>
-        protected override void OnApply(ImageBase<TColor> source, Rectangle sourceRectangle)
+        protected override void OnApply(ImageBase<TPixel> source, Rectangle sourceRectangle)
         {
             int startY = sourceRectangle.Y;
             int endY = sourceRectangle.Bottom;
@@ -57,7 +59,7 @@ namespace ImageSharp.Processing.Processors
 
             Vector4 backgroundColor = this.Value.ToVector4();
 
-            using (PixelAccessor<TColor> sourcePixels = source.Lock())
+            using (PixelAccessor<TPixel> sourcePixels = source.Lock())
             {
                 Parallel.For(
                     minY,
@@ -82,7 +84,7 @@ namespace ImageSharp.Processing.Processors
                                 color = backgroundColor;
                             }
 
-                            TColor packed = default(TColor);
+                            TPixel packed = default(TPixel);
                             packed.PackFromVector4(color);
                             sourcePixels[offsetX, offsetY] = packed;
                         }
diff --git a/src/ImageSharp/Processing/Processors/Effects/BrightnessProcessor.cs b/src/ImageSharp/Processing/Processors/Effects/BrightnessProcessor.cs
index 84df5e89e8..f9f1585ea9 100644
--- a/src/ImageSharp/Processing/Processors/Effects/BrightnessProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Effects/BrightnessProcessor.cs
@@ -9,15 +9,17 @@ namespace ImageSharp.Processing.Processors
     using System.Numerics;
     using System.Threading.Tasks;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
-    /// An <see cref="IImageProcessor{TColor}"/> to change the brightness of an <see cref="Image{TColor}"/>.
+    /// An <see cref="IImageProcessor{TPixel}"/> to change the brightness of an <see cref="Image{TPixel}"/>.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    internal class BrightnessProcessor<TColor> : ImageProcessor<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    internal class BrightnessProcessor<TPixel> : ImageProcessor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
-        /// Initializes a new instance of the <see cref="BrightnessProcessor{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="BrightnessProcessor{TPixel}"/> class.
         /// </summary>
         /// <param name="brightness">The new brightness of the image. Must be between -100 and 100.</param>
         /// <exception cref="System.ArgumentException">
@@ -35,7 +37,7 @@ namespace ImageSharp.Processing.Processors
         public int Value { get; }
 
         /// <inheritdoc/>
-        protected override void OnApply(ImageBase<TColor> source, Rectangle sourceRectangle)
+        protected override void OnApply(ImageBase<TPixel> source, Rectangle sourceRectangle)
         {
             float brightness = this.Value / 100F;
 
@@ -61,7 +63,7 @@ namespace ImageSharp.Processing.Processors
                 startY = 0;
             }
 
-            using (PixelAccessor<TColor> sourcePixels = source.Lock())
+            using (PixelAccessor<TPixel> sourcePixels = source.Lock())
             {
                 Parallel.For(
                     minY,
@@ -79,7 +81,7 @@ namespace ImageSharp.Processing.Processors
                                 Vector3 transformed = new Vector3(vector.X, vector.Y, vector.Z) + new Vector3(brightness);
                                 vector = new Vector4(transformed, vector.W);
 
-                                TColor packed = default(TColor);
+                                TPixel packed = default(TPixel);
                                 packed.PackFromVector4(vector.Compress());
 
                                 sourcePixels[offsetX, offsetY] = packed;
diff --git a/src/ImageSharp/Processing/Processors/Effects/ContrastProcessor.cs b/src/ImageSharp/Processing/Processors/Effects/ContrastProcessor.cs
index 042e396996..8308c57e2b 100644
--- a/src/ImageSharp/Processing/Processors/Effects/ContrastProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Effects/ContrastProcessor.cs
@@ -9,15 +9,17 @@ namespace ImageSharp.Processing.Processors
     using System.Numerics;
     using System.Threading.Tasks;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
-    /// An <see cref="IImageProcessor{TColor}"/> to change the contrast of an <see cref="Image{TColor}"/>.
+    /// An <see cref="IImageProcessor{TPixel}"/> to change the contrast of an <see cref="Image{TPixel}"/>.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    internal class ContrastProcessor<TColor> : ImageProcessor<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    internal class ContrastProcessor<TPixel> : ImageProcessor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
-        /// Initializes a new instance of the <see cref="ContrastProcessor{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="ContrastProcessor{TPixel}"/> class.
         /// </summary>
         /// <param name="contrast">The new contrast of the image. Must be between -100 and 100.</param>
         /// <exception cref="System.ArgumentException">
@@ -35,7 +37,7 @@ namespace ImageSharp.Processing.Processors
         public int Value { get; }
 
         /// <inheritdoc/>
-        protected override void OnApply(ImageBase<TColor> source, Rectangle sourceRectangle)
+        protected override void OnApply(ImageBase<TPixel> source, Rectangle sourceRectangle)
         {
             float contrast = (100F + this.Value) / 100F;
 
@@ -63,7 +65,7 @@ namespace ImageSharp.Processing.Processors
                 startY = 0;
             }
 
-            using (PixelAccessor<TColor> sourcePixels = source.Lock())
+            using (PixelAccessor<TPixel> sourcePixels = source.Lock())
             {
                 Parallel.For(
                     minY,
@@ -80,7 +82,7 @@ namespace ImageSharp.Processing.Processors
                                 vector -= shiftVector;
                                 vector *= contrastVector;
                                 vector += shiftVector;
-                                TColor packed = default(TColor);
+                                TPixel packed = default(TPixel);
                                 packed.PackFromVector4(vector.Compress());
                                 sourcePixels[offsetX, offsetY] = packed;
                             }
diff --git a/src/ImageSharp/Processing/Processors/Effects/InvertProcessor.cs b/src/ImageSharp/Processing/Processors/Effects/InvertProcessor.cs
index 4358e89460..a0348970e7 100644
--- a/src/ImageSharp/Processing/Processors/Effects/InvertProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Effects/InvertProcessor.cs
@@ -9,15 +9,17 @@ namespace ImageSharp.Processing.Processors
     using System.Numerics;
     using System.Threading.Tasks;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
-    /// An <see cref="IImageProcessor{TColor}"/> to invert the colors of an <see cref="Image{TColor}"/>.
+    /// An <see cref="IImageProcessor{TPixel}"/> to invert the colors of an <see cref="Image{TPixel}"/>.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    internal class InvertProcessor<TColor> : ImageProcessor<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    internal class InvertProcessor<TPixel> : ImageProcessor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <inheritdoc/>
-        protected override void OnApply(ImageBase<TColor> source, Rectangle sourceRectangle)
+        protected override void OnApply(ImageBase<TPixel> source, Rectangle sourceRectangle)
         {
             int startY = sourceRectangle.Y;
             int endY = sourceRectangle.Bottom;
@@ -42,7 +44,7 @@ namespace ImageSharp.Processing.Processors
                 startY = 0;
             }
 
-            using (PixelAccessor<TColor> sourcePixels = source.Lock())
+            using (PixelAccessor<TPixel> sourcePixels = source.Lock())
             {
                 Parallel.For(
                     minY,
@@ -57,7 +59,7 @@ namespace ImageSharp.Processing.Processors
                                 Vector4 color = sourcePixels[offsetX, offsetY].ToVector4();
                                 Vector3 vector = inverseVector - new Vector3(color.X, color.Y, color.Z);
 
-                                TColor packed = default(TColor);
+                                TPixel packed = default(TPixel);
                                 packed.PackFromVector4(new Vector4(vector, color.W));
                                 sourcePixels[offsetX, offsetY] = packed;
                             }
diff --git a/src/ImageSharp/Processing/Processors/Effects/OilPaintingProcessor.cs b/src/ImageSharp/Processing/Processors/Effects/OilPaintingProcessor.cs
index 957955c6c4..73d956907f 100644
--- a/src/ImageSharp/Processing/Processors/Effects/OilPaintingProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Effects/OilPaintingProcessor.cs
@@ -9,16 +9,18 @@ namespace ImageSharp.Processing.Processors
     using System.Numerics;
     using System.Threading.Tasks;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
-    /// An <see cref="IImageProcessor{TColor}"/> to apply an oil painting effect to an <see cref="Image{TColor}"/>.
+    /// An <see cref="IImageProcessor{TPixel}"/> to apply an oil painting effect to an <see cref="Image{TPixel}"/>.
     /// </summary>
     /// <remarks>Adapted from <see href="https://softwarebydefault.com/2013/06/29/oil-painting-cartoon-filter/"/> by Dewald Esterhuizen.</remarks>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    internal class OilPaintingProcessor<TColor> : ImageProcessor<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    internal class OilPaintingProcessor<TPixel> : ImageProcessor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
-        /// Initializes a new instance of the <see cref="OilPaintingProcessor{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="OilPaintingProcessor{TPixel}"/> class.
         /// </summary>
         /// <param name="levels">
         /// The number of intensity levels. Higher values result in a broader range of color intensities forming part of the result image.
@@ -46,7 +48,7 @@ namespace ImageSharp.Processing.Processors
         public int BrushSize { get; }
 
         /// <inheritdoc/>
-        protected override void OnApply(ImageBase<TColor> source, Rectangle sourceRectangle)
+        protected override void OnApply(ImageBase<TPixel> source, Rectangle sourceRectangle)
         {
             int startY = sourceRectangle.Y;
             int endY = sourceRectangle.Bottom;
@@ -67,9 +69,9 @@ namespace ImageSharp.Processing.Processors
                 startX = 0;
             }
 
-            using (PixelAccessor<TColor> targetPixels = new PixelAccessor<TColor>(source.Width, source.Height))
+            using (PixelAccessor<TPixel> targetPixels = new PixelAccessor<TPixel>(source.Width, source.Height))
             {
-                using (PixelAccessor<TColor> sourcePixels = source.Lock())
+                using (PixelAccessor<TPixel> sourcePixels = source.Lock())
                 {
                     Parallel.For(
                         minY,
@@ -143,7 +145,7 @@ namespace ImageSharp.Processing.Processors
                                     float green = MathF.Abs(greenBin[maxIndex] / maxIntensity);
                                     float blue = MathF.Abs(blueBin[maxIndex] / maxIntensity);
 
-                                    TColor packed = default(TColor);
+                                    TPixel packed = default(TPixel);
                                     packed.PackFromVector4(new Vector4(red, green, blue, sourcePixels[x, y].ToVector4().W));
                                     targetPixels[x, y] = packed;
                                 }
diff --git a/src/ImageSharp/Processing/Processors/Effects/PixelateProcessor.cs b/src/ImageSharp/Processing/Processors/Effects/PixelateProcessor.cs
index 818b1f5137..7a57daa4eb 100644
--- a/src/ImageSharp/Processing/Processors/Effects/PixelateProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Effects/PixelateProcessor.cs
@@ -9,15 +9,17 @@ namespace ImageSharp.Processing.Processors
     using System.Collections.Generic;
     using System.Threading.Tasks;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
-    /// An <see cref="IImageProcessor{TColor}"/> to pixelate the colors of an <see cref="Image{TColor}"/>.
+    /// An <see cref="IImageProcessor{TPixel}"/> to pixelate the colors of an <see cref="Image{TPixel}"/>.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    internal class PixelateProcessor<TColor> : ImageProcessor<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    internal class PixelateProcessor<TPixel> : ImageProcessor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
-        /// Initializes a new instance of the <see cref="PixelateProcessor{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="PixelateProcessor{TPixel}"/> class.
         /// </summary>
         /// <param name="size">The size of the pixels. Must be greater than 0.</param>
         /// <exception cref="System.ArgumentException">
@@ -35,7 +37,7 @@ namespace ImageSharp.Processing.Processors
         public int Value { get; }
 
         /// <inheritdoc/>
-        protected override void OnApply(ImageBase<TColor> source, Rectangle sourceRectangle)
+        protected override void OnApply(ImageBase<TPixel> source, Rectangle sourceRectangle)
         {
             int startY = sourceRectangle.Y;
             int endY = sourceRectangle.Bottom;
@@ -64,9 +66,9 @@ namespace ImageSharp.Processing.Processors
             // Get the range on the y-plane to choose from.
             IEnumerable<int> range = EnumerableExtensions.SteppedRange(minY, i => i < maxY, size);
 
-            using (PixelAccessor<TColor> targetPixels = new PixelAccessor<TColor>(source.Width, source.Height))
+            using (PixelAccessor<TPixel> targetPixels = new PixelAccessor<TPixel>(source.Width, source.Height))
             {
-                using (PixelAccessor<TColor> sourcePixels = source.Lock())
+                using (PixelAccessor<TPixel> sourcePixels = source.Lock())
                 {
                     Parallel.ForEach(
                         range,
@@ -94,7 +96,7 @@ namespace ImageSharp.Processing.Processors
 
                                     // Get the pixel color in the centre of the soon to be pixelated area.
                                     // ReSharper disable AccessToDisposedClosure
-                                    TColor pixel = sourcePixels[offsetX + offsetPx, offsetY + offsetPy];
+                                    TPixel pixel = sourcePixels[offsetX + offsetPx, offsetY + offsetPy];
 
                                     // For each pixel in the pixelate size, set it to the centre color.
                                     for (int l = offsetY; l < offsetY + size && l < maxY; l++)
diff --git a/src/ImageSharp/Processing/Processors/Overlays/GlowProcessor.cs b/src/ImageSharp/Processing/Processors/Overlays/GlowProcessor.cs
index 6eeb7398aa..0493782560 100644
--- a/src/ImageSharp/Processing/Processors/Overlays/GlowProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Overlays/GlowProcessor.cs
@@ -9,18 +9,20 @@ namespace ImageSharp.Processing.Processors
     using System.Numerics;
     using System.Threading.Tasks;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
-    /// An <see cref="IImageProcessor{TColor}"/> that applies a radial glow effect an <see cref="Image{TColor}"/>.
+    /// An <see cref="IImageProcessor{TPixel}"/> that applies a radial glow effect an <see cref="Image{TPixel}"/>.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    internal class GlowProcessor<TColor> : ImageProcessor<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    internal class GlowProcessor<TPixel> : ImageProcessor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
-        /// Initializes a new instance of the <see cref="GlowProcessor{TColor}" /> class.
+        /// Initializes a new instance of the <see cref="GlowProcessor{TPixel}" /> class.
         /// </summary>
         /// <param name="color">The color or the glow.</param>
-        public GlowProcessor(TColor color)
+        public GlowProcessor(TPixel color)
         {
             this.GlowColor = color;
         }
@@ -28,7 +30,7 @@ namespace ImageSharp.Processing.Processors
         /// <summary>
         /// Gets or sets the glow color to apply.
         /// </summary>
-        public TColor GlowColor { get; set; }
+        public TPixel GlowColor { get; set; }
 
         /// <summary>
         /// Gets or sets the the radius.
@@ -36,13 +38,13 @@ namespace ImageSharp.Processing.Processors
         public float Radius { get; set; }
 
         /// <inheritdoc/>
-        protected override void OnApply(ImageBase<TColor> source, Rectangle sourceRectangle)
+        protected override void OnApply(ImageBase<TPixel> source, Rectangle sourceRectangle)
         {
             int startY = sourceRectangle.Y;
             int endY = sourceRectangle.Bottom;
             int startX = sourceRectangle.X;
             int endX = sourceRectangle.Right;
-            TColor glowColor = this.GlowColor;
+            TPixel glowColor = this.GlowColor;
             Vector2 centre = Rectangle.Center(sourceRectangle).ToVector2();
             float maxDistance = this.Radius > 0 ? MathF.Min(this.Radius, sourceRectangle.Width * .5F) : sourceRectangle.Width * .5F;
 
@@ -63,7 +65,7 @@ namespace ImageSharp.Processing.Processors
                 startY = 0;
             }
 
-            using (PixelAccessor<TColor> sourcePixels = source.Lock())
+            using (PixelAccessor<TPixel> sourcePixels = source.Lock())
             {
                 Parallel.For(
                     minY,
@@ -77,7 +79,7 @@ namespace ImageSharp.Processing.Processors
                                 int offsetX = x - startX;
                                 float distance = Vector2.Distance(centre, new Vector2(offsetX, offsetY));
                                 Vector4 sourceColor = sourcePixels[offsetX, offsetY].ToVector4();
-                                TColor packed = default(TColor);
+                                TPixel packed = default(TPixel);
                                 packed.PackFromVector4(Vector4BlendTransforms.PremultipliedLerp(sourceColor, glowColor.ToVector4(), 1 - (.95F * (distance / maxDistance))));
                                 sourcePixels[offsetX, offsetY] = packed;
                             }
diff --git a/src/ImageSharp/Processing/Processors/Overlays/VignetteProcessor.cs b/src/ImageSharp/Processing/Processors/Overlays/VignetteProcessor.cs
index 40d6d94ac9..31e813564b 100644
--- a/src/ImageSharp/Processing/Processors/Overlays/VignetteProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Overlays/VignetteProcessor.cs
@@ -9,18 +9,20 @@ namespace ImageSharp.Processing.Processors
     using System.Numerics;
     using System.Threading.Tasks;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
-    /// An <see cref="IImageProcessor{TColor}"/> that applies a radial vignette effect to an <see cref="Image{TColor}"/>.
+    /// An <see cref="IImageProcessor{TPixel}"/> that applies a radial vignette effect to an <see cref="Image{TPixel}"/>.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    internal class VignetteProcessor<TColor> : ImageProcessor<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    internal class VignetteProcessor<TPixel> : ImageProcessor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
-        /// Initializes a new instance of the <see cref="VignetteProcessor{TColor}" /> class.
+        /// Initializes a new instance of the <see cref="VignetteProcessor{TPixel}" /> class.
         /// </summary>
         /// <param name="color">The color of the vignette.</param>
-        public VignetteProcessor(TColor color)
+        public VignetteProcessor(TPixel color)
         {
             this.VignetteColor = color;
         }
@@ -28,7 +30,7 @@ namespace ImageSharp.Processing.Processors
         /// <summary>
         /// Gets or sets the vignette color to apply.
         /// </summary>
-        public TColor VignetteColor { get; set; }
+        public TPixel VignetteColor { get; set; }
 
         /// <summary>
         /// Gets or sets the the x-radius.
@@ -41,13 +43,13 @@ namespace ImageSharp.Processing.Processors
         public float RadiusY { get; set; }
 
         /// <inheritdoc/>
-        protected override void OnApply(ImageBase<TColor> source, Rectangle sourceRectangle)
+        protected override void OnApply(ImageBase<TPixel> source, Rectangle sourceRectangle)
         {
             int startY = sourceRectangle.Y;
             int endY = sourceRectangle.Bottom;
             int startX = sourceRectangle.X;
             int endX = sourceRectangle.Right;
-            TColor vignetteColor = this.VignetteColor;
+            TPixel vignetteColor = this.VignetteColor;
             Vector2 centre = Rectangle.Center(sourceRectangle).ToVector2();
             float rX = this.RadiusX > 0 ? MathF.Min(this.RadiusX, sourceRectangle.Width * .5F) : sourceRectangle.Width * .5F;
             float rY = this.RadiusY > 0 ? MathF.Min(this.RadiusY, sourceRectangle.Height * .5F) : sourceRectangle.Height * .5F;
@@ -70,7 +72,7 @@ namespace ImageSharp.Processing.Processors
                 startY = 0;
             }
 
-            using (PixelAccessor<TColor> sourcePixels = source.Lock())
+            using (PixelAccessor<TPixel> sourcePixels = source.Lock())
             {
                 Parallel.For(
                     minY,
@@ -84,7 +86,7 @@ namespace ImageSharp.Processing.Processors
                                 int offsetX = x - startX;
                                 float distance = Vector2.Distance(centre, new Vector2(offsetX, offsetY));
                                 Vector4 sourceColor = sourcePixels[offsetX, offsetY].ToVector4();
-                                TColor packed = default(TColor);
+                                TPixel packed = default(TPixel);
                                 packed.PackFromVector4(Vector4BlendTransforms.PremultipliedLerp(sourceColor, vignetteColor.ToVector4(), .9F * (distance / maxDistance)));
                                 sourcePixels[offsetX, offsetY] = packed;
                             }
diff --git a/src/ImageSharp/Processing/Processors/Transforms/CropProcessor.cs b/src/ImageSharp/Processing/Processors/Transforms/CropProcessor.cs
index 7d473c55ed..b67ef5bf1e 100644
--- a/src/ImageSharp/Processing/Processors/Transforms/CropProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/CropProcessor.cs
@@ -8,15 +8,17 @@ namespace ImageSharp.Processing.Processors
     using System;
     using System.Threading.Tasks;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// Provides methods to allow the cropping of an image.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    internal class CropProcessor<TColor> : ImageProcessor<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    internal class CropProcessor<TPixel> : ImageProcessor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
-        /// Initializes a new instance of the <see cref="CropProcessor{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="CropProcessor{TPixel}"/> class.
         /// </summary>
         /// <param name="cropRectangle">The target cropped rectangle.</param>
         public CropProcessor(Rectangle cropRectangle)
@@ -30,7 +32,7 @@ namespace ImageSharp.Processing.Processors
         public Rectangle CropRectangle { get; }
 
         /// <inheritdoc/>
-        protected override void OnApply(ImageBase<TColor> source, Rectangle sourceRectangle)
+        protected override void OnApply(ImageBase<TPixel> source, Rectangle sourceRectangle)
         {
             if (this.CropRectangle == sourceRectangle)
             {
@@ -42,9 +44,9 @@ namespace ImageSharp.Processing.Processors
             int minX = Math.Max(this.CropRectangle.X, sourceRectangle.X);
             int maxX = Math.Min(this.CropRectangle.Right, sourceRectangle.Right);
 
-            using (PixelAccessor<TColor> targetPixels = new PixelAccessor<TColor>(this.CropRectangle.Width, this.CropRectangle.Height))
+            using (PixelAccessor<TPixel> targetPixels = new PixelAccessor<TPixel>(this.CropRectangle.Width, this.CropRectangle.Height))
             {
-                using (PixelAccessor<TColor> sourcePixels = source.Lock())
+                using (PixelAccessor<TPixel> sourcePixels = source.Lock())
                 {
                     Parallel.For(
                         minY,
diff --git a/src/ImageSharp/Processing/Processors/Transforms/EntropyCropProcessor.cs b/src/ImageSharp/Processing/Processors/Transforms/EntropyCropProcessor.cs
index 049fbf2de0..571c40939e 100644
--- a/src/ImageSharp/Processing/Processors/Transforms/EntropyCropProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/EntropyCropProcessor.cs
@@ -7,16 +7,18 @@ namespace ImageSharp.Processing.Processors
 {
     using System;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// Provides methods to allow the cropping of an image to preserve areas of highest
     /// entropy.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    internal class EntropyCropProcessor<TColor> : ImageProcessor<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    internal class EntropyCropProcessor<TPixel> : ImageProcessor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
-        /// Initializes a new instance of the <see cref="EntropyCropProcessor{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="EntropyCropProcessor{TPixel}"/> class.
         /// </summary>
         /// <param name="threshold">The threshold to split the image. Must be between 0 and 1.</param>
         /// <exception cref="System.ArgumentException">
@@ -34,15 +36,15 @@ namespace ImageSharp.Processing.Processors
         public float Value { get; }
 
         /// <inheritdoc/>
-        protected override void OnApply(ImageBase<TColor> source, Rectangle sourceRectangle)
+        protected override void OnApply(ImageBase<TPixel> source, Rectangle sourceRectangle)
         {
-            using (ImageBase<TColor> temp = new Image<TColor>(source))
+            using (ImageBase<TPixel> temp = new Image<TPixel>(source))
             {
                 // Detect the edges.
-                new SobelProcessor<TColor>().Apply(temp, sourceRectangle);
+                new SobelProcessor<TPixel>().Apply(temp, sourceRectangle);
 
                 // Apply threshold binarization filter.
-                new BinaryThresholdProcessor<TColor>(this.Value).Apply(temp, sourceRectangle);
+                new BinaryThresholdProcessor<TPixel>(this.Value).Apply(temp, sourceRectangle);
 
                 // Search for the first white pixels
                 Rectangle rectangle = ImageMaths.GetFilteredBoundingRectangle(temp, 0);
@@ -52,7 +54,7 @@ namespace ImageSharp.Processing.Processors
                     return;
                 }
 
-                new CropProcessor<TColor>(rectangle).Apply(source, sourceRectangle);
+                new CropProcessor<TPixel>(rectangle).Apply(source, sourceRectangle);
             }
         }
     }
diff --git a/src/ImageSharp/Processing/Processors/Transforms/FlipProcessor.cs b/src/ImageSharp/Processing/Processors/Transforms/FlipProcessor.cs
index 290d81799a..2faf779053 100644
--- a/src/ImageSharp/Processing/Processors/Transforms/FlipProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/FlipProcessor.cs
@@ -8,15 +8,17 @@ namespace ImageSharp.Processing.Processors
     using System;
     using System.Threading.Tasks;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// Provides methods that allow the flipping of an image around its center point.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    internal class FlipProcessor<TColor> : ImageProcessor<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    internal class FlipProcessor<TPixel> : ImageProcessor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
-        /// Initializes a new instance of the <see cref="FlipProcessor{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="FlipProcessor{TPixel}"/> class.
         /// </summary>
         /// <param name="flipType">The <see cref="FlipType"/> used to perform flipping.</param>
         public FlipProcessor(FlipType flipType)
@@ -30,7 +32,7 @@ namespace ImageSharp.Processing.Processors
         public FlipType FlipType { get; }
 
         /// <inheritdoc/>
-        protected override void OnApply(ImageBase<TColor> source, Rectangle sourceRectangle)
+        protected override void OnApply(ImageBase<TPixel> source, Rectangle sourceRectangle)
         {
             switch (this.FlipType)
             {
@@ -49,15 +51,15 @@ namespace ImageSharp.Processing.Processors
         /// at half the height of the image.
         /// </summary>
         /// <param name="source">The source image to apply the process to.</param>
-        private void FlipX(ImageBase<TColor> source)
+        private void FlipX(ImageBase<TPixel> source)
         {
             int width = source.Width;
             int height = source.Height;
             int halfHeight = (int)Math.Ceiling(source.Height * .5F);
 
-            using (PixelAccessor<TColor> targetPixels = new PixelAccessor<TColor>(width, height))
+            using (PixelAccessor<TPixel> targetPixels = new PixelAccessor<TPixel>(width, height))
             {
-                using (PixelAccessor<TColor> sourcePixels = source.Lock())
+                using (PixelAccessor<TPixel> sourcePixels = source.Lock())
                 {
                     Parallel.For(
                         0,
@@ -83,15 +85,15 @@ namespace ImageSharp.Processing.Processors
         /// at half of the width of the image.
         /// </summary>
         /// <param name="source">The source image to apply the process to.</param>
-        private void FlipY(ImageBase<TColor> source)
+        private void FlipY(ImageBase<TPixel> source)
         {
             int width = source.Width;
             int height = source.Height;
             int halfWidth = (int)Math.Ceiling(width * .5F);
 
-            using (PixelAccessor<TColor> targetPixels = new PixelAccessor<TColor>(width, height))
+            using (PixelAccessor<TPixel> targetPixels = new PixelAccessor<TPixel>(width, height))
             {
-                using (PixelAccessor<TColor> sourcePixels = source.Lock())
+                using (PixelAccessor<TPixel> sourcePixels = source.Lock())
                 {
                     Parallel.For(
                         0,
diff --git a/src/ImageSharp/Processing/Processors/Transforms/Matrix3x2Processor.cs b/src/ImageSharp/Processing/Processors/Transforms/Matrix3x2Processor.cs
index 0c290a9b62..3135551f8a 100644
--- a/src/ImageSharp/Processing/Processors/Transforms/Matrix3x2Processor.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/Matrix3x2Processor.cs
@@ -8,12 +8,14 @@ namespace ImageSharp.Processing.Processors
     using System;
     using System.Numerics;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// Provides methods to transform an image using a <see cref="Matrix3x2"/>.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    internal abstract class Matrix3x2Processor<TColor> : ImageProcessor<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    internal abstract class Matrix3x2Processor<TPixel> : ImageProcessor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
         /// Gets the rectangle designating the target canvas.
@@ -41,7 +43,7 @@ namespace ImageSharp.Processing.Processors
         /// <returns>
         /// The <see cref="Matrix3x2"/>.
         /// </returns>
-        protected Matrix3x2 GetCenteredMatrix(ImageBase<TColor> source, Matrix3x2 matrix)
+        protected Matrix3x2 GetCenteredMatrix(ImageBase<TPixel> source, Matrix3x2 matrix)
         {
             Matrix3x2 translationToTargetCenter = Matrix3x2.CreateTranslation(-this.CanvasRectangle.Width * .5F, -this.CanvasRectangle.Height * .5F);
             Matrix3x2 translateToSourceCenter = Matrix3x2.CreateTranslation(source.Width * .5F, source.Height * .5F);
diff --git a/src/ImageSharp/Processing/Processors/Transforms/ResamplingWeightedProcessor.Weights.cs b/src/ImageSharp/Processing/Processors/Transforms/ResamplingWeightedProcessor.Weights.cs
index 4c43d654d0..5d29924e11 100644
--- a/src/ImageSharp/Processing/Processors/Transforms/ResamplingWeightedProcessor.Weights.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/ResamplingWeightedProcessor.Weights.cs
@@ -7,7 +7,7 @@ namespace ImageSharp.Processing.Processors
     /// <content>
     /// Conains the definition of <see cref="WeightsWindow"/> and <see cref="WeightsBuffer"/>.
     /// </content>
-    internal abstract partial class ResamplingWeightedProcessor<TColor>
+    internal abstract partial class ResamplingWeightedProcessor<TPixel>
     {
         /// <summary>
         /// Points to a collection of of weights allocated in <see cref="WeightsBuffer"/>.
diff --git a/src/ImageSharp/Processing/Processors/Transforms/ResamplingWeightedProcessor.cs b/src/ImageSharp/Processing/Processors/Transforms/ResamplingWeightedProcessor.cs
index 50c75a3fdf..e2f77d812e 100644
--- a/src/ImageSharp/Processing/Processors/Transforms/ResamplingWeightedProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/ResamplingWeightedProcessor.cs
@@ -10,16 +10,18 @@ namespace ImageSharp.Processing.Processors
     using System.Runtime.CompilerServices;
     using System.Runtime.InteropServices;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// Provides methods that allow the resizing of images using various algorithms.
     /// Adapted from <see href="http://www.realtimerendering.com/resources/GraphicsGems/gemsiii/filter_rcg.c"/>
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    internal abstract partial class ResamplingWeightedProcessor<TColor> : ImageProcessor<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    internal abstract partial class ResamplingWeightedProcessor<TPixel> : ImageProcessor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
-        /// Initializes a new instance of the <see cref="ResamplingWeightedProcessor{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="ResamplingWeightedProcessor{TPixel}"/> class.
         /// </summary>
         /// <param name="sampler">The sampler to perform the resize operation.</param>
         /// <param name="width">The target width.</param>
@@ -139,7 +141,7 @@ namespace ImageSharp.Processing.Processors
         }
 
         /// <inheritdoc/>
-        protected override void BeforeApply(ImageBase<TColor> source, Rectangle sourceRectangle)
+        protected override void BeforeApply(ImageBase<TPixel> source, Rectangle sourceRectangle)
         {
             if (!(this.Sampler is NearestNeighborResampler))
             {
@@ -154,7 +156,7 @@ namespace ImageSharp.Processing.Processors
         }
 
         /// <inheritdoc />
-        protected override void AfterApply(ImageBase<TColor> source, Rectangle sourceRectangle)
+        protected override void AfterApply(ImageBase<TPixel> source, Rectangle sourceRectangle)
         {
             base.AfterApply(source, sourceRectangle);
             this.HorizontalWeights?.Dispose();
diff --git a/src/ImageSharp/Processing/Processors/Transforms/ResizeProcessor.cs b/src/ImageSharp/Processing/Processors/Transforms/ResizeProcessor.cs
index 08d96e283c..23166fd3ab 100644
--- a/src/ImageSharp/Processing/Processors/Transforms/ResizeProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/ResizeProcessor.cs
@@ -9,15 +9,17 @@ namespace ImageSharp.Processing.Processors
     using System.Numerics;
     using System.Threading.Tasks;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// Provides methods that allow the resizing of images using various algorithms.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    internal class ResizeProcessor<TColor> : ResamplingWeightedProcessor<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    internal class ResizeProcessor<TPixel> : ResamplingWeightedProcessor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
-        /// Initializes a new instance of the <see cref="ResizeProcessor{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="ResizeProcessor{TPixel}"/> class.
         /// </summary>
         /// <param name="sampler">The sampler to perform the resize operation.</param>
         /// <param name="width">The target width.</param>
@@ -28,7 +30,7 @@ namespace ImageSharp.Processing.Processors
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="ResizeProcessor{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="ResizeProcessor{TPixel}"/> class.
         /// </summary>
         /// <param name="sampler">The sampler to perform the resize operation.</param>
         /// <param name="width">The target width.</param>
@@ -42,7 +44,7 @@ namespace ImageSharp.Processing.Processors
         }
 
         /// <inheritdoc/>
-        protected override unsafe void OnApply(ImageBase<TColor> source, Rectangle sourceRectangle)
+        protected override unsafe void OnApply(ImageBase<TPixel> source, Rectangle sourceRectangle)
         {
             // Jump out, we'll deal with that later.
             if (source.Width == this.Width && source.Height == this.Height && sourceRectangle == this.ResizeRectangle)
@@ -70,9 +72,9 @@ namespace ImageSharp.Processing.Processors
                 float widthFactor = sourceRectangle.Width / (float)this.ResizeRectangle.Width;
                 float heightFactor = sourceRectangle.Height / (float)this.ResizeRectangle.Height;
 
-                using (PixelAccessor<TColor> targetPixels = new PixelAccessor<TColor>(width, height))
+                using (PixelAccessor<TPixel> targetPixels = new PixelAccessor<TPixel>(width, height))
                 {
-                    using (PixelAccessor<TColor> sourcePixels = source.Lock())
+                    using (PixelAccessor<TPixel> sourcePixels = source.Lock())
                     {
                         Parallel.For(
                             minY,
@@ -103,9 +105,9 @@ namespace ImageSharp.Processing.Processors
             // are the upper and lower bounds of the source rectangle.
 
             // TODO: Using a transposed variant of 'firstPassPixels' could eliminate the need for the WeightsWindow.ComputeWeightedColumnSum() method, and improve speed!
-            using (PixelAccessor<TColor> targetPixels = new PixelAccessor<TColor>(width, height))
+            using (PixelAccessor<TPixel> targetPixels = new PixelAccessor<TPixel>(width, height))
             {
-                using (PixelAccessor<TColor> sourcePixels = source.Lock())
+                using (PixelAccessor<TPixel> sourcePixels = source.Lock())
                 using (Buffer2D<Vector4> firstPassPixels = new Buffer2D<Vector4>(width, source.Height))
                 {
                     firstPassPixels.Clear();
@@ -119,9 +121,9 @@ namespace ImageSharp.Processing.Processors
                                 // TODO: Without Parallel.For() this buffer object could be reused:
                                 using (Buffer<Vector4> tempRowBuffer = new Buffer<Vector4>(sourcePixels.Width))
                                 {
-                                    BufferSpan<TColor> sourceRow = sourcePixels.GetRowSpan(y);
+                                    BufferSpan<TPixel> sourceRow = sourcePixels.GetRowSpan(y);
 
-                                    BulkPixelOperations<TColor>.Instance.ToVector4(
+                                    BulkPixelOperations<TPixel>.Instance.ToVector4(
                                         sourceRow,
                                         tempRowBuffer,
                                         sourceRow.Length);
@@ -162,7 +164,7 @@ namespace ImageSharp.Processing.Processors
                                     // Destination color components
                                     Vector4 destination = window.ComputeWeightedColumnSum(firstPassPixels, x);
                                     destination = destination.Compress();
-                                    TColor d = default(TColor);
+                                    TPixel d = default(TPixel);
                                     d.PackFromVector4(destination);
                                     targetPixels[x, y] = d;
                                 }
@@ -174,7 +176,7 @@ namespace ImageSharp.Processing.Processors
                                     // Destination color components
                                     Vector4 destination = window.ComputeWeightedColumnSum(firstPassPixels, x);
 
-                                    TColor d = default(TColor);
+                                    TPixel d = default(TPixel);
                                     d.PackFromVector4(destination);
                                     targetPixels[x, y] = d;
                                 }
diff --git a/src/ImageSharp/Processing/Processors/Transforms/RotateProcessor.cs b/src/ImageSharp/Processing/Processors/Transforms/RotateProcessor.cs
index 16e0b6635f..fc5d29b06a 100644
--- a/src/ImageSharp/Processing/Processors/Transforms/RotateProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/RotateProcessor.cs
@@ -9,12 +9,14 @@ namespace ImageSharp.Processing.Processors
     using System.Numerics;
     using System.Threading.Tasks;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// Provides methods that allow the rotating of images.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    internal class RotateProcessor<TColor> : Matrix3x2Processor<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    internal class RotateProcessor<TPixel> : Matrix3x2Processor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
         /// The transform matrix to apply.
@@ -32,7 +34,7 @@ namespace ImageSharp.Processing.Processors
         public bool Expand { get; set; } = true;
 
         /// <inheritdoc/>
-        protected override void OnApply(ImageBase<TColor> source, Rectangle sourceRectangle)
+        protected override void OnApply(ImageBase<TPixel> source, Rectangle sourceRectangle)
         {
             if (this.OptimizedApply(source))
             {
@@ -43,9 +45,9 @@ namespace ImageSharp.Processing.Processors
             int width = this.CanvasRectangle.Width;
             Matrix3x2 matrix = this.GetCenteredMatrix(source, this.processMatrix);
 
-            using (PixelAccessor<TColor> targetPixels = new PixelAccessor<TColor>(width, height))
+            using (PixelAccessor<TPixel> targetPixels = new PixelAccessor<TPixel>(width, height))
             {
-                using (PixelAccessor<TColor> sourcePixels = source.Lock())
+                using (PixelAccessor<TPixel> sourcePixels = source.Lock())
                 {
                     Parallel.For(
                         0,
@@ -69,7 +71,7 @@ namespace ImageSharp.Processing.Processors
         }
 
         /// <inheritdoc/>
-        protected override void BeforeApply(ImageBase<TColor> source, Rectangle sourceRectangle)
+        protected override void BeforeApply(ImageBase<TPixel> source, Rectangle sourceRectangle)
         {
             if (MathF.Abs(this.Angle) < Constants.Epsilon || MathF.Abs(this.Angle - 90) < Constants.Epsilon || MathF.Abs(this.Angle - 180) < Constants.Epsilon || MathF.Abs(this.Angle - 270) < Constants.Epsilon)
             {
@@ -88,7 +90,7 @@ namespace ImageSharp.Processing.Processors
         /// </summary>
         /// <param name="source">The source image.</param>
         /// <returns>The <see cref="bool"/></returns>
-        private bool OptimizedApply(ImageBase<TColor> source)
+        private bool OptimizedApply(ImageBase<TPixel> source)
         {
             if (MathF.Abs(this.Angle) < Constants.Epsilon)
             {
@@ -121,14 +123,14 @@ namespace ImageSharp.Processing.Processors
         /// Rotates the image 270 degrees clockwise at the centre point.
         /// </summary>
         /// <param name="source">The source image.</param>
-        private void Rotate270(ImageBase<TColor> source)
+        private void Rotate270(ImageBase<TPixel> source)
         {
             int width = source.Width;
             int height = source.Height;
 
-            using (PixelAccessor<TColor> targetPixels = new PixelAccessor<TColor>(height, width))
+            using (PixelAccessor<TPixel> targetPixels = new PixelAccessor<TPixel>(height, width))
             {
-                using (PixelAccessor<TColor> sourcePixels = source.Lock())
+                using (PixelAccessor<TPixel> sourcePixels = source.Lock())
                 {
                     Parallel.For(
                         0,
@@ -154,14 +156,14 @@ namespace ImageSharp.Processing.Processors
         /// Rotates the image 180 degrees clockwise at the centre point.
         /// </summary>
         /// <param name="source">The source image.</param>
-        private void Rotate180(ImageBase<TColor> source)
+        private void Rotate180(ImageBase<TPixel> source)
         {
             int width = source.Width;
             int height = source.Height;
 
-            using (PixelAccessor<TColor> targetPixels = new PixelAccessor<TColor>(width, height))
+            using (PixelAccessor<TPixel> targetPixels = new PixelAccessor<TPixel>(width, height))
             {
-                using (PixelAccessor<TColor> sourcePixels = source.Lock())
+                using (PixelAccessor<TPixel> sourcePixels = source.Lock())
                 {
                     Parallel.For(
                         0,
@@ -186,14 +188,14 @@ namespace ImageSharp.Processing.Processors
         /// Rotates the image 90 degrees clockwise at the centre point.
         /// </summary>
         /// <param name="source">The source image.</param>
-        private void Rotate90(ImageBase<TColor> source)
+        private void Rotate90(ImageBase<TPixel> source)
         {
             int width = source.Width;
             int height = source.Height;
 
-            using (PixelAccessor<TColor> targetPixels = new PixelAccessor<TColor>(height, width))
+            using (PixelAccessor<TPixel> targetPixels = new PixelAccessor<TPixel>(height, width))
             {
-                using (PixelAccessor<TColor> sourcePixels = source.Lock())
+                using (PixelAccessor<TPixel> sourcePixels = source.Lock())
                 {
                     Parallel.For(
                         0,
diff --git a/src/ImageSharp/Processing/Processors/Transforms/SkewProcessor.cs b/src/ImageSharp/Processing/Processors/Transforms/SkewProcessor.cs
index 5fe3f7d958..40ea6a94e5 100644
--- a/src/ImageSharp/Processing/Processors/Transforms/SkewProcessor.cs
+++ b/src/ImageSharp/Processing/Processors/Transforms/SkewProcessor.cs
@@ -9,12 +9,14 @@ namespace ImageSharp.Processing.Processors
     using System.Numerics;
     using System.Threading.Tasks;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// Provides methods that allow the skewing of images.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    internal class SkewProcessor<TColor> : Matrix3x2Processor<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    internal class SkewProcessor<TPixel> : Matrix3x2Processor<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
         /// The transform matrix to apply.
@@ -37,15 +39,15 @@ namespace ImageSharp.Processing.Processors
         public bool Expand { get; set; } = true;
 
         /// <inheritdoc/>
-        protected override void OnApply(ImageBase<TColor> source, Rectangle sourceRectangle)
+        protected override void OnApply(ImageBase<TPixel> source, Rectangle sourceRectangle)
         {
             int height = this.CanvasRectangle.Height;
             int width = this.CanvasRectangle.Width;
             Matrix3x2 matrix = this.GetCenteredMatrix(source, this.processMatrix);
 
-            using (PixelAccessor<TColor> targetPixels = new PixelAccessor<TColor>(width, height))
+            using (PixelAccessor<TPixel> targetPixels = new PixelAccessor<TPixel>(width, height))
             {
-                using (PixelAccessor<TColor> sourcePixels = source.Lock())
+                using (PixelAccessor<TPixel> sourcePixels = source.Lock())
                 {
                     Parallel.For(
                         0,
@@ -69,7 +71,7 @@ namespace ImageSharp.Processing.Processors
         }
 
         /// <inheritdoc/>
-        protected override void BeforeApply(ImageBase<TColor> source, Rectangle sourceRectangle)
+        protected override void BeforeApply(ImageBase<TPixel> source, Rectangle sourceRectangle)
         {
             this.processMatrix = Point.CreateSkew(new Point(0, 0), -this.AngleX, -this.AngleY);
             if (this.Expand)
diff --git a/src/ImageSharp/Processing/Transforms/AutoOrient.cs b/src/ImageSharp/Processing/Transforms/AutoOrient.cs
index 8c5e22b995..de736092da 100644
--- a/src/ImageSharp/Processing/Transforms/AutoOrient.cs
+++ b/src/ImageSharp/Processing/Transforms/AutoOrient.cs
@@ -6,22 +6,25 @@
 namespace ImageSharp
 {
     using System;
+
+    using ImageSharp.PixelFormats;
+
     using Processing;
     using Processing.Processors;
 
     /// <summary>
-    /// Extension methods for the <see cref="Image{TColor}"/> type.
+    /// Extension methods for the <see cref="Image{TPixel}"/> type.
     /// </summary>
     public static partial class ImageExtensions
     {
         /// <summary>
         /// Adjusts an image so that its orientation is suitable for viewing. Adjustments are based on EXIF metadata embedded in the image.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image to auto rotate.</param>
         /// <returns>The <see cref="Image"/></returns>
-        public static Image<TColor> AutoOrient<TColor>(this Image<TColor> source)
-            where TColor : struct, IPixel<TColor>
+        public static Image<TPixel> AutoOrient<TPixel>(this Image<TPixel> source)
+            where TPixel : struct, IPixel<TPixel>
         {
             Orientation orientation = GetExifOrientation(source);
 
@@ -60,11 +63,11 @@ namespace ImageSharp
         /// <summary>
         /// Returns the current EXIF orientation
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image to auto rotate.</param>
         /// <returns>The <see cref="Orientation"/></returns>
-        private static Orientation GetExifOrientation<TColor>(Image<TColor> source)
-            where TColor : struct, IPixel<TColor>
+        private static Orientation GetExifOrientation<TPixel>(Image<TPixel> source)
+            where TPixel : struct, IPixel<TPixel>
         {
             if (source.MetaData.ExifProfile == null)
             {
diff --git a/src/ImageSharp/Processing/Transforms/Crop.cs b/src/ImageSharp/Processing/Transforms/Crop.cs
index 92773aaeac..073e8136da 100644
--- a/src/ImageSharp/Processing/Transforms/Crop.cs
+++ b/src/ImageSharp/Processing/Transforms/Crop.cs
@@ -7,23 +7,25 @@ namespace ImageSharp
 {
     using System;
 
+    using ImageSharp.PixelFormats;
+
     using Processing.Processors;
 
     /// <summary>
-    /// Extension methods for the <see cref="Image{TColor}"/> type.
+    /// Extension methods for the <see cref="Image{TPixel}"/> type.
     /// </summary>
     public static partial class ImageExtensions
     {
         /// <summary>
         /// Crops an image to the given width and height.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image to resize.</param>
         /// <param name="width">The target image width.</param>
         /// <param name="height">The target image height.</param>
-        /// <returns>The <see cref="Image{TColor}"/></returns>
-        public static Image<TColor> Crop<TColor>(this Image<TColor> source, int width, int height)
-            where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/></returns>
+        public static Image<TPixel> Crop<TPixel>(this Image<TPixel> source, int width, int height)
+            where TPixel : struct, IPixel<TPixel>
         {
             return Crop(source, new Rectangle(0, 0, width, height));
         }
@@ -31,16 +33,16 @@ namespace ImageSharp
         /// <summary>
         /// Crops an image to the given rectangle.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image to crop.</param>
         /// <param name="cropRectangle">
         /// The <see cref="Rectangle"/> structure that specifies the portion of the image object to retain.
         /// </param>
         /// <returns>The <see cref="Image"/></returns>
-        public static Image<TColor> Crop<TColor>(this Image<TColor> source, Rectangle cropRectangle)
-            where TColor : struct, IPixel<TColor>
+        public static Image<TPixel> Crop<TPixel>(this Image<TPixel> source, Rectangle cropRectangle)
+            where TPixel : struct, IPixel<TPixel>
         {
-            CropProcessor<TColor> processor = new CropProcessor<TColor>(cropRectangle);
+            CropProcessor<TPixel> processor = new CropProcessor<TPixel>(cropRectangle);
 
             source.ApplyProcessor(processor, source.Bounds);
             return source;
diff --git a/src/ImageSharp/Processing/Transforms/EntropyCrop.cs b/src/ImageSharp/Processing/Transforms/EntropyCrop.cs
index ad2ce89e3d..aaafd396f2 100644
--- a/src/ImageSharp/Processing/Transforms/EntropyCrop.cs
+++ b/src/ImageSharp/Processing/Transforms/EntropyCrop.cs
@@ -7,24 +7,26 @@ namespace ImageSharp
 {
     using System;
 
+    using ImageSharp.PixelFormats;
+
     using Processing.Processors;
 
     /// <summary>
-    /// Extension methods for the <see cref="Image{TColor}"/> type.
+    /// Extension methods for the <see cref="Image{TPixel}"/> type.
     /// </summary>
     public static partial class ImageExtensions
     {
         /// <summary>
         /// Crops an image to the area of greatest entropy.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image to crop.</param>
         /// <param name="threshold">The threshold for entropic density.</param>
         /// <returns>The <see cref="Image"/></returns>
-        public static Image<TColor> EntropyCrop<TColor>(this Image<TColor> source, float threshold = .5f)
-            where TColor : struct, IPixel<TColor>
+        public static Image<TPixel> EntropyCrop<TPixel>(this Image<TPixel> source, float threshold = .5f)
+            where TPixel : struct, IPixel<TPixel>
         {
-            EntropyCropProcessor<TColor> processor = new EntropyCropProcessor<TColor>(threshold);
+            EntropyCropProcessor<TPixel> processor = new EntropyCropProcessor<TPixel>(threshold);
 
             source.ApplyProcessor(processor, source.Bounds);
             return source;
diff --git a/src/ImageSharp/Processing/Transforms/Flip.cs b/src/ImageSharp/Processing/Transforms/Flip.cs
index ed096eb750..41f2e5616b 100644
--- a/src/ImageSharp/Processing/Transforms/Flip.cs
+++ b/src/ImageSharp/Processing/Transforms/Flip.cs
@@ -7,25 +7,27 @@ namespace ImageSharp
 {
     using System;
 
+    using ImageSharp.PixelFormats;
+
     using Processing;
     using Processing.Processors;
 
     /// <summary>
-    /// Extension methods for the <see cref="Image{TColor}"/> type.
+    /// Extension methods for the <see cref="Image{TPixel}"/> type.
     /// </summary>
     public static partial class ImageExtensions
     {
         /// <summary>
         /// Flips an image by the given instructions.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image to rotate, flip, or both.</param>
         /// <param name="flipType">The <see cref="FlipType"/> to perform the flip.</param>
         /// <returns>The <see cref="Image"/></returns>
-        public static Image<TColor> Flip<TColor>(this Image<TColor> source, FlipType flipType)
-            where TColor : struct, IPixel<TColor>
+        public static Image<TPixel> Flip<TPixel>(this Image<TPixel> source, FlipType flipType)
+            where TPixel : struct, IPixel<TPixel>
         {
-            FlipProcessor<TColor> processor = new FlipProcessor<TColor>(flipType);
+            FlipProcessor<TPixel> processor = new FlipProcessor<TPixel>(flipType);
 
             source.ApplyProcessor(processor, source.Bounds);
             return source;
diff --git a/src/ImageSharp/Processing/Transforms/Options/ResizeHelper.cs b/src/ImageSharp/Processing/Transforms/Options/ResizeHelper.cs
index 4be938c399..c876882662 100644
--- a/src/ImageSharp/Processing/Transforms/Options/ResizeHelper.cs
+++ b/src/ImageSharp/Processing/Transforms/Options/ResizeHelper.cs
@@ -8,6 +8,8 @@ namespace ImageSharp.Processing
     using System;
     using System.Linq;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// Provides methods to help calculate the target rectangle when resizing using the
     /// <see cref="ResizeMode"/> enumeration.
@@ -17,14 +19,14 @@ namespace ImageSharp.Processing
         /// <summary>
         /// Calculates the target location and bounds to perform the resize operation against.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The source image.</param>
         /// <param name="options">The resize options.</param>
         /// <returns>
         /// The <see cref="Rectangle"/>.
         /// </returns>
-        public static Rectangle CalculateTargetLocationAndBounds<TColor>(ImageBase<TColor> source, ResizeOptions options)
-            where TColor : struct, IPixel<TColor>
+        public static Rectangle CalculateTargetLocationAndBounds<TPixel>(ImageBase<TPixel> source, ResizeOptions options)
+            where TPixel : struct, IPixel<TPixel>
         {
             switch (options.Mode)
             {
@@ -48,14 +50,14 @@ namespace ImageSharp.Processing
         /// <summary>
         /// Calculates the target rectangle for crop mode.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The source image.</param>
         /// <param name="options">The resize options.</param>
         /// <returns>
         /// The <see cref="Rectangle"/>.
         /// </returns>
-        private static Rectangle CalculateCropRectangle<TColor>(ImageBase<TColor> source, ResizeOptions options)
-            where TColor : struct, IPixel<TColor>
+        private static Rectangle CalculateCropRectangle<TPixel>(ImageBase<TPixel> source, ResizeOptions options)
+            where TPixel : struct, IPixel<TPixel>
         {
             int width = options.Size.Width;
             int height = options.Size.Height;
@@ -167,14 +169,14 @@ namespace ImageSharp.Processing
         /// <summary>
         /// Calculates the target rectangle for pad mode.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The source image.</param>
         /// <param name="options">The resize options.</param>
         /// <returns>
         /// The <see cref="Rectangle"/>.
         /// </returns>
-        private static Rectangle CalculatePadRectangle<TColor>(ImageBase<TColor> source, ResizeOptions options)
-            where TColor : struct, IPixel<TColor>
+        private static Rectangle CalculatePadRectangle<TPixel>(ImageBase<TPixel> source, ResizeOptions options)
+            where TPixel : struct, IPixel<TPixel>
         {
             int width = options.Size.Width;
             int height = options.Size.Height;
@@ -248,14 +250,14 @@ namespace ImageSharp.Processing
         /// <summary>
         /// Calculates the target rectangle for box pad mode.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The source image.</param>
         /// <param name="options">The resize options.</param>
         /// <returns>
         /// The <see cref="Rectangle"/>.
         /// </returns>
-        private static Rectangle CalculateBoxPadRectangle<TColor>(ImageBase<TColor> source, ResizeOptions options)
-            where TColor : struct, IPixel<TColor>
+        private static Rectangle CalculateBoxPadRectangle<TPixel>(ImageBase<TPixel> source, ResizeOptions options)
+            where TPixel : struct, IPixel<TPixel>
         {
             int width = options.Size.Width;
             int height = options.Size.Height;
@@ -335,14 +337,14 @@ namespace ImageSharp.Processing
         /// <summary>
         /// Calculates the target rectangle for max mode.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The source image.</param>
         /// <param name="options">The resize options.</param>
         /// <returns>
         /// The <see cref="Rectangle"/>.
         /// </returns>
-        private static Rectangle CalculateMaxRectangle<TColor>(ImageBase<TColor> source, ResizeOptions options)
-            where TColor : struct, IPixel<TColor>
+        private static Rectangle CalculateMaxRectangle<TPixel>(ImageBase<TPixel> source, ResizeOptions options)
+            where TPixel : struct, IPixel<TPixel>
         {
             int width = options.Size.Width;
             int height = options.Size.Height;
@@ -376,14 +378,14 @@ namespace ImageSharp.Processing
         /// <summary>
         /// Calculates the target rectangle for min mode.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The source image.</param>
         /// <param name="options">The resize options.</param>
         /// <returns>
         /// The <see cref="Rectangle"/>.
         /// </returns>
-        private static Rectangle CalculateMinRectangle<TColor>(ImageBase<TColor> source, ResizeOptions options)
-            where TColor : struct, IPixel<TColor>
+        private static Rectangle CalculateMinRectangle<TPixel>(ImageBase<TPixel> source, ResizeOptions options)
+            where TPixel : struct, IPixel<TPixel>
         {
             int width = options.Size.Width;
             int height = options.Size.Height;
diff --git a/src/ImageSharp/Processing/Transforms/Pad.cs b/src/ImageSharp/Processing/Transforms/Pad.cs
index bd530ecd82..42851e205d 100644
--- a/src/ImageSharp/Processing/Transforms/Pad.cs
+++ b/src/ImageSharp/Processing/Transforms/Pad.cs
@@ -7,24 +7,26 @@ namespace ImageSharp
 {
     using System;
 
+    using ImageSharp.PixelFormats;
+
     using Processing;
     using Processing.Processors;
 
     /// <summary>
-    /// Extension methods for the <see cref="Image{TColor}"/> type.
+    /// Extension methods for the <see cref="Image{TPixel}"/> type.
     /// </summary>
     public static partial class ImageExtensions
     {
         /// <summary>
         /// Evenly pads an image to fit the new dimensions.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The source image to pad.</param>
         /// <param name="width">The new width.</param>
         /// <param name="height">The new height.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Pad<TColor>(this Image<TColor> source, int width, int height)
-            where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Pad<TPixel>(this Image<TPixel> source, int width, int height)
+            where TPixel : struct, IPixel<TPixel>
         {
             ResizeOptions options = new ResizeOptions
             {
diff --git a/src/ImageSharp/Processing/Transforms/Resize.cs b/src/ImageSharp/Processing/Transforms/Resize.cs
index 1952aa1a7a..543b982976 100644
--- a/src/ImageSharp/Processing/Transforms/Resize.cs
+++ b/src/ImageSharp/Processing/Transforms/Resize.cs
@@ -7,24 +7,26 @@ namespace ImageSharp
 {
     using System;
 
+    using ImageSharp.PixelFormats;
+
     using Processing;
     using Processing.Processors;
 
     /// <summary>
-    /// Extension methods for the <see cref="Image{TColor}"/> type.
+    /// Extension methods for the <see cref="Image{TPixel}"/> type.
     /// </summary>
     public static partial class ImageExtensions
     {
         /// <summary>
         /// Resizes an image in accordance with the given <see cref="ResizeOptions"/>.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image to resize.</param>
         /// <param name="options">The resize options.</param>
-        /// <returns>The <see cref="Image{TColor}"/></returns>
+        /// <returns>The <see cref="Image{TPixel}"/></returns>
         /// <remarks>Passing zero for one of height or width within the resize options will automatically preserve the aspect ratio of the original image</remarks>
-        public static Image<TColor> Resize<TColor>(this Image<TColor> source, ResizeOptions options)
-            where TColor : struct, IPixel<TColor>
+        public static Image<TPixel> Resize<TPixel>(this Image<TPixel> source, ResizeOptions options)
+            where TPixel : struct, IPixel<TPixel>
         {
             // Ensure size is populated across both dimensions.
             if (options.Size.Width == 0 && options.Size.Height > 0)
@@ -45,13 +47,13 @@ namespace ImageSharp
         /// <summary>
         /// Resizes an image to the given <see cref="Size"/>.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image to resize.</param>
         /// <param name="size">The target image size.</param>
-        /// <returns>The <see cref="Image{TColor}"/></returns>
+        /// <returns>The <see cref="Image{TPixel}"/></returns>
         /// <remarks>Passing zero for one of height or width will automatically preserve the aspect ratio of the original image</remarks>
-        public static Image<TColor> Resize<TColor>(this Image<TColor> source, Size size)
-            where TColor : struct, IPixel<TColor>
+        public static Image<TPixel> Resize<TPixel>(this Image<TPixel> source, Size size)
+            where TPixel : struct, IPixel<TPixel>
         {
             return Resize(source, size.Width, size.Height, new BicubicResampler(), false);
         }
@@ -59,14 +61,14 @@ namespace ImageSharp
         /// <summary>
         /// Resizes an image to the given width and height.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image to resize.</param>
         /// <param name="width">The target image width.</param>
         /// <param name="height">The target image height.</param>
-        /// <returns>The <see cref="Image{TColor}"/></returns>
+        /// <returns>The <see cref="Image{TPixel}"/></returns>
         /// <remarks>Passing zero for one of height or width will automatically preserve the aspect ratio of the original image</remarks>
-        public static Image<TColor> Resize<TColor>(this Image<TColor> source, int width, int height)
-            where TColor : struct, IPixel<TColor>
+        public static Image<TPixel> Resize<TPixel>(this Image<TPixel> source, int width, int height)
+            where TPixel : struct, IPixel<TPixel>
         {
             return Resize(source, width, height, new BicubicResampler(), false);
         }
@@ -74,15 +76,15 @@ namespace ImageSharp
         /// <summary>
         /// Resizes an image to the given width and height.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image to resize.</param>
         /// <param name="width">The target image width.</param>
         /// <param name="height">The target image height.</param>
         /// <param name="compand">Whether to compress and expand the image color-space to gamma correct the image during processing.</param>
-        /// <returns>The <see cref="Image{TColor}"/></returns>
+        /// <returns>The <see cref="Image{TPixel}"/></returns>
         /// <remarks>Passing zero for one of height or width will automatically preserve the aspect ratio of the original image</remarks>
-        public static Image<TColor> Resize<TColor>(this Image<TColor> source, int width, int height, bool compand)
-            where TColor : struct, IPixel<TColor>
+        public static Image<TPixel> Resize<TPixel>(this Image<TPixel> source, int width, int height, bool compand)
+            where TPixel : struct, IPixel<TPixel>
         {
             return Resize(source, width, height, new BicubicResampler(), compand);
         }
@@ -90,15 +92,15 @@ namespace ImageSharp
         /// <summary>
         /// Resizes an image to the given width and height with the given sampler.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image to resize.</param>
         /// <param name="width">The target image width.</param>
         /// <param name="height">The target image height.</param>
         /// <param name="sampler">The <see cref="IResampler"/> to perform the resampling.</param>
-        /// <returns>The <see cref="Image{TColor}"/></returns>
+        /// <returns>The <see cref="Image{TPixel}"/></returns>
         /// <remarks>Passing zero for one of height or width will automatically preserve the aspect ratio of the original image</remarks>
-        public static Image<TColor> Resize<TColor>(this Image<TColor> source, int width, int height, IResampler sampler)
-            where TColor : struct, IPixel<TColor>
+        public static Image<TPixel> Resize<TPixel>(this Image<TPixel> source, int width, int height, IResampler sampler)
+            where TPixel : struct, IPixel<TPixel>
         {
             return Resize(source, width, height, sampler, false);
         }
@@ -106,16 +108,16 @@ namespace ImageSharp
         /// <summary>
         /// Resizes an image to the given width and height with the given sampler.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image to resize.</param>
         /// <param name="width">The target image width.</param>
         /// <param name="height">The target image height.</param>
         /// <param name="sampler">The <see cref="IResampler"/> to perform the resampling.</param>
         /// <param name="compand">Whether to compress and expand the image color-space to gamma correct the image during processing.</param>
-        /// <returns>The <see cref="Image{TColor}"/></returns>
+        /// <returns>The <see cref="Image{TPixel}"/></returns>
         /// <remarks>Passing zero for one of height or width will automatically preserve the aspect ratio of the original image</remarks>
-        public static Image<TColor> Resize<TColor>(this Image<TColor> source, int width, int height, IResampler sampler, bool compand)
-            where TColor : struct, IPixel<TColor>
+        public static Image<TPixel> Resize<TPixel>(this Image<TPixel> source, int width, int height, IResampler sampler, bool compand)
+            where TPixel : struct, IPixel<TPixel>
         {
             return Resize(source, width, height, sampler, source.Bounds, new Rectangle(0, 0, width, height), compand);
         }
@@ -124,7 +126,7 @@ namespace ImageSharp
         /// Resizes an image to the given width and height with the given sampler and
         /// source rectangle.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image to resize.</param>
         /// <param name="width">The target image width.</param>
         /// <param name="height">The target image height.</param>
@@ -136,10 +138,10 @@ namespace ImageSharp
         /// The <see cref="Rectangle"/> structure that specifies the portion of the target image object to draw to.
         /// </param>
         /// <param name="compand">Whether to compress and expand the image color-space to gamma correct the image during processing.</param>
-        /// <returns>The <see cref="Image{TColor}"/></returns>
+        /// <returns>The <see cref="Image{TPixel}"/></returns>
         /// <remarks>Passing zero for one of height or width will automatically preserve the aspect ratio of the original image</remarks>
-        public static Image<TColor> Resize<TColor>(this Image<TColor> source, int width, int height, IResampler sampler, Rectangle sourceRectangle, Rectangle targetRectangle, bool compand = false)
-            where TColor : struct, IPixel<TColor>
+        public static Image<TPixel> Resize<TPixel>(this Image<TPixel> source, int width, int height, IResampler sampler, Rectangle sourceRectangle, Rectangle targetRectangle, bool compand = false)
+            where TPixel : struct, IPixel<TPixel>
         {
             if (width == 0 && height > 0)
             {
@@ -156,8 +158,8 @@ namespace ImageSharp
             Guard.MustBeGreaterThan(width, 0, nameof(width));
             Guard.MustBeGreaterThan(height, 0, nameof(height));
 
-            ResizeProcessor<TColor> processor =
-                new ResizeProcessor<TColor>(sampler, width, height, targetRectangle) { Compand = compand };
+            ResizeProcessor<TPixel> processor =
+                new ResizeProcessor<TPixel>(sampler, width, height, targetRectangle) { Compand = compand };
 
             source.ApplyProcessor(processor, sourceRectangle);
             return source;
diff --git a/src/ImageSharp/Processing/Transforms/Rotate.cs b/src/ImageSharp/Processing/Transforms/Rotate.cs
index 76311ef252..b335a3c769 100644
--- a/src/ImageSharp/Processing/Transforms/Rotate.cs
+++ b/src/ImageSharp/Processing/Transforms/Rotate.cs
@@ -7,23 +7,25 @@ namespace ImageSharp
 {
     using System;
 
+    using ImageSharp.PixelFormats;
+
     using Processing;
     using Processing.Processors;
 
     /// <summary>
-    /// Extension methods for the <see cref="Image{TColor}"/> type.
+    /// Extension methods for the <see cref="Image{TPixel}"/> type.
     /// </summary>
     public static partial class ImageExtensions
     {
         /// <summary>
         /// Rotates an image by the given angle in degrees, expanding the image to fit the rotated result.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image to rotate.</param>
         /// <param name="degrees">The angle in degrees to perform the rotation.</param>
         /// <returns>The <see cref="Image"/></returns>
-        public static Image<TColor> Rotate<TColor>(this Image<TColor> source, float degrees)
-            where TColor : struct, IPixel<TColor>
+        public static Image<TPixel> Rotate<TPixel>(this Image<TPixel> source, float degrees)
+            where TPixel : struct, IPixel<TPixel>
         {
             return Rotate(source, degrees, true);
         }
@@ -31,12 +33,12 @@ namespace ImageSharp
         /// <summary>
         /// Rotates and flips an image by the given instructions.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image to rotate.</param>
         /// <param name="rotateType">The <see cref="RotateType"/> to perform the rotation.</param>
         /// <returns>The <see cref="Image"/></returns>
-        public static Image<TColor> Rotate<TColor>(this Image<TColor> source, RotateType rotateType)
-            where TColor : struct, IPixel<TColor>
+        public static Image<TPixel> Rotate<TPixel>(this Image<TPixel> source, RotateType rotateType)
+            where TPixel : struct, IPixel<TPixel>
         {
             return Rotate(source, (float)rotateType, false);
         }
@@ -44,15 +46,15 @@ namespace ImageSharp
         /// <summary>
         /// Rotates an image by the given angle in degrees.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image to rotate.</param>
         /// <param name="degrees">The angle in degrees to perform the rotation.</param>
         /// <param name="expand">Whether to expand the image to fit the rotated result.</param>
         /// <returns>The <see cref="Image"/></returns>
-        public static Image<TColor> Rotate<TColor>(this Image<TColor> source, float degrees, bool expand)
-            where TColor : struct, IPixel<TColor>
+        public static Image<TPixel> Rotate<TPixel>(this Image<TPixel> source, float degrees, bool expand)
+            where TPixel : struct, IPixel<TPixel>
         {
-            RotateProcessor<TColor> processor = new RotateProcessor<TColor> { Angle = degrees, Expand = expand };
+            RotateProcessor<TPixel> processor = new RotateProcessor<TPixel> { Angle = degrees, Expand = expand };
 
             source.ApplyProcessor(processor, source.Bounds);
             return source;
diff --git a/src/ImageSharp/Processing/Transforms/RotateFlip.cs b/src/ImageSharp/Processing/Transforms/RotateFlip.cs
index d6050db3f3..3965903594 100644
--- a/src/ImageSharp/Processing/Transforms/RotateFlip.cs
+++ b/src/ImageSharp/Processing/Transforms/RotateFlip.cs
@@ -6,23 +6,26 @@
 namespace ImageSharp
 {
     using System;
+
+    using ImageSharp.PixelFormats;
+
     using Processing;
 
     /// <summary>
-    /// Extension methods for the <see cref="Image{TColor}"/> type.
+    /// Extension methods for the <see cref="Image{TPixel}"/> type.
     /// </summary>
     public static partial class ImageExtensions
     {
         /// <summary>
         /// Rotates and flips an image by the given instructions.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image to rotate, flip, or both.</param>
         /// <param name="rotateType">The <see cref="RotateType"/> to perform the rotation.</param>
         /// <param name="flipType">The <see cref="FlipType"/> to perform the flip.</param>
         /// <returns>The <see cref="Image"/></returns>
-        public static Image<TColor> RotateFlip<TColor>(this Image<TColor> source, RotateType rotateType, FlipType flipType)
-            where TColor : struct, IPixel<TColor>
+        public static Image<TPixel> RotateFlip<TPixel>(this Image<TPixel> source, RotateType rotateType, FlipType flipType)
+            where TPixel : struct, IPixel<TPixel>
         {
             return source.Rotate(rotateType).Flip(flipType);
         }
diff --git a/src/ImageSharp/Processing/Transforms/Skew.cs b/src/ImageSharp/Processing/Transforms/Skew.cs
index 03fdbcceb4..0c9cfbc8e0 100644
--- a/src/ImageSharp/Processing/Transforms/Skew.cs
+++ b/src/ImageSharp/Processing/Transforms/Skew.cs
@@ -7,23 +7,25 @@ namespace ImageSharp
 {
     using System;
 
+    using ImageSharp.PixelFormats;
+
     using Processing.Processors;
 
     /// <summary>
-    /// Extension methods for the <see cref="Image{TColor}"/> type.
+    /// Extension methods for the <see cref="Image{TPixel}"/> type.
     /// </summary>
     public static partial class ImageExtensions
     {
         /// <summary>
         /// Skews an image by the given angles in degrees, expanding the image to fit the skewed result.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image to skew.</param>
         /// <param name="degreesX">The angle in degrees to perform the rotation along the x-axis.</param>
         /// <param name="degreesY">The angle in degrees to perform the rotation along the y-axis.</param>
         /// <returns>The <see cref="Image"/></returns>
-        public static Image<TColor> Skew<TColor>(this Image<TColor> source, float degreesX, float degreesY)
-            where TColor : struct, IPixel<TColor>
+        public static Image<TPixel> Skew<TPixel>(this Image<TPixel> source, float degreesX, float degreesY)
+            where TPixel : struct, IPixel<TPixel>
         {
             return Skew(source, degreesX, degreesY, true);
         }
@@ -31,16 +33,16 @@ namespace ImageSharp
         /// <summary>
         /// Skews an image by the given angles in degrees.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image to skew.</param>
         /// <param name="degreesX">The angle in degrees to perform the rotation along the x-axis.</param>
         /// <param name="degreesY">The angle in degrees to perform the rotation along the y-axis.</param>
         /// <param name="expand">Whether to expand the image to fit the skewed result.</param>
         /// <returns>The <see cref="Image"/></returns>
-        public static Image<TColor> Skew<TColor>(this Image<TColor> source, float degreesX, float degreesY, bool expand)
-            where TColor : struct, IPixel<TColor>
+        public static Image<TPixel> Skew<TPixel>(this Image<TPixel> source, float degreesX, float degreesY, bool expand)
+            where TPixel : struct, IPixel<TPixel>
         {
-            SkewProcessor<TColor> processor = new SkewProcessor<TColor> { AngleX = degreesX, AngleY = degreesY, Expand = expand };
+            SkewProcessor<TPixel> processor = new SkewProcessor<TPixel> { AngleX = degreesX, AngleY = degreesY, Expand = expand };
 
             source.ApplyProcessor(processor, source.Bounds);
             return source;
diff --git a/src/ImageSharp/Quantizers/IQuantizer.cs b/src/ImageSharp/Quantizers/IQuantizer{TPixel}.cs
similarity index 72%
rename from src/ImageSharp/Quantizers/IQuantizer.cs
rename to src/ImageSharp/Quantizers/IQuantizer{TPixel}.cs
index 88f273e9b6..f3bf9b56d6 100644
--- a/src/ImageSharp/Quantizers/IQuantizer.cs
+++ b/src/ImageSharp/Quantizers/IQuantizer{TPixel}.cs
@@ -1,4 +1,4 @@
-// <copyright file="IQuantizer.cs" company="James Jackson-South">
+// <copyright file="IQuantizer{TPixel}.cs" company="James Jackson-South">
 // Copyright (c) James Jackson-South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
@@ -6,13 +6,14 @@
 namespace ImageSharp.Quantizers
 {
     using ImageSharp.Dithering;
+    using ImageSharp.PixelFormats;
 
     /// <summary>
     /// Provides methods for allowing quantization of images pixels.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    public interface IQuantizer<TColor> : IQuantizer
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    public interface IQuantizer<TPixel> : IQuantizer
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
         /// Quantize an image and return the resulting output pixels.
@@ -22,15 +23,15 @@ namespace ImageSharp.Quantizers
         /// <returns>
         /// A <see cref="T:QuantizedImage"/> representing a quantized version of the image pixels.
         /// </returns>
-        QuantizedImage<TColor> Quantize(ImageBase<TColor> image, int maxColors);
+        QuantizedImage<TPixel> Quantize(ImageBase<TPixel> image, int maxColors);
     }
 
     /// <summary>
     /// Provides methods for allowing dithering of quantized image pixels.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    public interface IDitheredQuantizer<TColor> : IQuantizer<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    public interface IDitheredQuantizer<TPixel> : IQuantizer<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
         /// Gets or sets a value indicating whether to apply dithering to the output image.
diff --git a/src/ImageSharp/Quantizers/OctreeQuantizer.cs b/src/ImageSharp/Quantizers/OctreeQuantizer{TPixel}.cs
similarity index 91%
rename from src/ImageSharp/Quantizers/OctreeQuantizer.cs
rename to src/ImageSharp/Quantizers/OctreeQuantizer{TPixel}.cs
index df52ee7f9d..d57d297fc8 100644
--- a/src/ImageSharp/Quantizers/OctreeQuantizer.cs
+++ b/src/ImageSharp/Quantizers/OctreeQuantizer{TPixel}.cs
@@ -1,4 +1,4 @@
-// <copyright file="OctreeQuantizer.cs" company="James Jackson-South">
+// <copyright file="OctreeQuantizer{TPixel}.cs" company="James Jackson-South">
 // Copyright (c) James Jackson-South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
@@ -8,19 +8,20 @@ namespace ImageSharp.Quantizers
     using System;
     using System.Collections.Generic;
     using System.Runtime.CompilerServices;
+    using ImageSharp.PixelFormats;
 
     /// <summary>
     /// Encapsulates methods to calculate the color palette if an image using an Octree pattern.
     /// <see href="http://msdn.microsoft.com/en-us/library/aa479306.aspx"/>
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    public sealed class OctreeQuantizer<TColor> : Quantizer<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    public sealed class OctreeQuantizer<TPixel> : Quantizer<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
         /// A lookup table for colors
         /// </summary>
-        private readonly Dictionary<TColor, byte> colorMap = new Dictionary<TColor, byte>();
+        private readonly Dictionary<TPixel, byte> colorMap = new Dictionary<TPixel, byte>();
 
         /// <summary>
         /// The pixel buffer, used to reduce allocations.
@@ -40,10 +41,10 @@ namespace ImageSharp.Quantizers
         /// <summary>
         /// The reduced image palette
         /// </summary>
-        private TColor[] palette;
+        private TPixel[] palette;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="OctreeQuantizer{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="OctreeQuantizer{TPixel}"/> class.
         /// </summary>
         /// <remarks>
         /// The Octree quantizer is a two pass algorithm. The initial pass sets up the Octree,
@@ -55,7 +56,7 @@ namespace ImageSharp.Quantizers
         }
 
         /// <inheritdoc/>
-        public override QuantizedImage<TColor> Quantize(ImageBase<TColor> image, int maxColors)
+        public override QuantizedImage<TPixel> Quantize(ImageBase<TPixel> image, int maxColors)
         {
             this.colors = maxColors.Clamp(1, 255);
             this.octree = new Octree(this.GetBitsNeededForColorDepth(this.colors));
@@ -64,15 +65,15 @@ namespace ImageSharp.Quantizers
         }
 
         /// <inheritdoc/>
-        protected override void SecondPass(PixelAccessor<TColor> source, byte[] output, int width, int height)
+        protected override void SecondPass(PixelAccessor<TPixel> source, byte[] output, int width, int height)
         {
             // Load up the values for the first pixel. We can use these to speed up the second
             // pass of the algorithm by avoiding transforming rows of identical color.
-            TColor sourcePixel = source[0, 0];
-            TColor previousPixel = sourcePixel;
+            TPixel sourcePixel = source[0, 0];
+            TPixel previousPixel = sourcePixel;
             byte pixelValue = this.QuantizePixel(sourcePixel);
-            TColor[] colorPalette = this.GetPalette();
-            TColor transformedPixel = colorPalette[pixelValue];
+            TPixel[] colorPalette = this.GetPalette();
+            TPixel transformedPixel = colorPalette[pixelValue];
 
             for (int y = 0; y < height; y++)
             {
@@ -110,14 +111,14 @@ namespace ImageSharp.Quantizers
         }
 
         /// <inheritdoc/>
-        protected override void InitialQuantizePixel(TColor pixel)
+        protected override void InitialQuantizePixel(TPixel pixel)
         {
             // Add the color to the Octree
             this.octree.AddColor(pixel, this.pixelBuffer);
         }
 
         /// <inheritdoc/>
-        protected override TColor[] GetPalette()
+        protected override TPixel[] GetPalette()
         {
             return this.palette ?? (this.palette = this.octree.Palletize(Math.Max(this.colors, 1)));
         }
@@ -130,13 +131,13 @@ namespace ImageSharp.Quantizers
         /// The quantized value
         /// </returns>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private byte QuantizePixel(TColor pixel)
+        private byte QuantizePixel(TPixel pixel)
         {
             if (this.Dither)
             {
                 // The colors have changed so we need to use Euclidean distance caclulation to find the closest value.
                 // This palette can never be null here.
-                return this.GetClosestColor(pixel, this.palette, this.colorMap);
+                return this.GetClosesTPixel(pixel, this.palette, this.colorMap);
             }
 
             return (byte)this.octree.GetPaletteIndex(pixel, this.pixelBuffer);
@@ -190,7 +191,7 @@ namespace ImageSharp.Quantizers
             /// <summary>
             /// Cache the previous color quantized
             /// </summary>
-            private TColor previousColor;
+            private TPixel previousColor;
 
             /// <summary>
             /// Initializes a new instance of the <see cref="Octree"/> class.
@@ -204,7 +205,7 @@ namespace ImageSharp.Quantizers
                 this.Leaves = 0;
                 this.reducibleNodes = new OctreeNode[9];
                 this.root = new OctreeNode(0, this.maxColorBits, this);
-                this.previousColor = default(TColor);
+                this.previousColor = default(TPixel);
                 this.previousNode = null;
             }
 
@@ -223,7 +224,7 @@ namespace ImageSharp.Quantizers
             /// </summary>
             /// <param name="pixel">The pixel data.</param>
             /// <param name="buffer">The buffer array.</param>
-            public void AddColor(TColor pixel, byte[] buffer)
+            public void AddColor(TPixel pixel, byte[] buffer)
             {
                 // Check if this request is for the same color as the last
                 if (this.previousColor.Equals(pixel))
@@ -253,9 +254,9 @@ namespace ImageSharp.Quantizers
             /// </summary>
             /// <param name="colorCount">The maximum number of colors</param>
             /// <returns>
-            /// An <see cref="List{TColor}"/> with the palletized colors
+            /// An <see cref="List{TPixel}"/> with the palletized colors
             /// </returns>
-            public TColor[] Palletize(int colorCount)
+            public TPixel[] Palletize(int colorCount)
             {
                 while (this.Leaves > colorCount)
                 {
@@ -263,7 +264,7 @@ namespace ImageSharp.Quantizers
                 }
 
                 // Now palletize the nodes
-                TColor[] palette = new TColor[colorCount + 1];
+                TPixel[] palette = new TPixel[colorCount + 1];
 
                 int paletteIndex = 0;
                 this.root.ConstructPalette(palette, ref paletteIndex);
@@ -280,7 +281,7 @@ namespace ImageSharp.Quantizers
             /// <returns>
             /// The <see cref="int"/>.
             /// </returns>
-            public int GetPaletteIndex(TColor pixel, byte[] buffer)
+            public int GetPaletteIndex(TPixel pixel, byte[] buffer)
             {
                 return this.root.GetPaletteIndex(pixel, 0, buffer);
             }
@@ -409,7 +410,7 @@ namespace ImageSharp.Quantizers
                 /// <param name="level">The level in the tree</param>
                 /// <param name="octree">The tree to which this node belongs</param>
                 /// <param name="buffer">The buffer array.</param>
-                public void AddColor(TColor pixel, int colorBits, int level, Octree octree, byte[] buffer)
+                public void AddColor(TPixel pixel, int colorBits, int level, Octree octree, byte[] buffer)
                 {
                     // Update the color information if this is a leaf
                     if (this.leaf)
@@ -478,7 +479,7 @@ namespace ImageSharp.Quantizers
                 /// </summary>
                 /// <param name="palette">The palette</param>
                 /// <param name="index">The current palette index</param>
-                public void ConstructPalette(TColor[] palette, ref int index)
+                public void ConstructPalette(TPixel[] palette, ref int index)
                 {
                     if (this.leaf)
                     {
@@ -488,7 +489,7 @@ namespace ImageSharp.Quantizers
                         byte b = (this.blue / this.pixelCount).ToByte();
 
                         // And set the color of the palette entry
-                        TColor pixel = default(TColor);
+                        TPixel pixel = default(TPixel);
                         pixel.PackFromBytes(r, g, b, 255);
                         palette[index] = pixel;
 
@@ -517,7 +518,7 @@ namespace ImageSharp.Quantizers
                 /// <returns>
                 /// The <see cref="int"/> representing the index of the pixel in the palette.
                 /// </returns>
-                public int GetPaletteIndex(TColor pixel, int level, byte[] buffer)
+                public int GetPaletteIndex(TPixel pixel, int level, byte[] buffer)
                 {
                     int index = this.paletteIndex;
 
@@ -548,7 +549,7 @@ namespace ImageSharp.Quantizers
                 /// </summary>
                 /// <param name="pixel">The pixel to add.</param>
                 /// <param name="buffer">The buffer array.</param>
-                public void Increment(TColor pixel, byte[] buffer)
+                public void Increment(TPixel pixel, byte[] buffer)
                 {
                     pixel.ToXyzwBytes(buffer, 0);
                     this.pixelCount++;
diff --git a/src/ImageSharp/Quantizers/PaletteQuantizer.cs b/src/ImageSharp/Quantizers/PaletteQuantizer{TPixel}.cs
similarity index 76%
rename from src/ImageSharp/Quantizers/PaletteQuantizer.cs
rename to src/ImageSharp/Quantizers/PaletteQuantizer{TPixel}.cs
index f039fe0c57..b5e5ccb25e 100644
--- a/src/ImageSharp/Quantizers/PaletteQuantizer.cs
+++ b/src/ImageSharp/Quantizers/PaletteQuantizer{TPixel}.cs
@@ -1,4 +1,4 @@
-// <copyright file="PaletteQuantizer.cs" company="James Jackson-South">
+// <copyright file="PaletteQuantizer{TPixel}.cs" company="James Jackson-South">
 // Copyright (c) James Jackson-South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
@@ -8,14 +8,15 @@ namespace ImageSharp.Quantizers
     using System;
     using System.Collections.Generic;
     using System.Runtime.CompilerServices;
+    using ImageSharp.PixelFormats;
 
     /// <summary>
     /// Encapsulates methods to create a quantized image based upon the given palette.
     /// <see href="http://msdn.microsoft.com/en-us/library/aa479306.aspx"/>
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    public sealed class PaletteQuantizer<TColor> : Quantizer<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    public sealed class PaletteQuantizer<TPixel> : Quantizer<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
         /// The pixel buffer, used to reduce allocations.
@@ -25,32 +26,32 @@ namespace ImageSharp.Quantizers
         /// <summary>
         /// A lookup table for colors
         /// </summary>
-        private readonly Dictionary<TColor, byte> colorMap = new Dictionary<TColor, byte>();
+        private readonly Dictionary<TPixel, byte> colorMap = new Dictionary<TPixel, byte>();
 
         /// <summary>
         /// List of all colors in the palette
         /// </summary>
-        private TColor[] colors;
+        private TPixel[] colors;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="PaletteQuantizer{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="PaletteQuantizer{TPixel}"/> class.
         /// </summary>
         /// <param name="palette">
         /// The color palette. If none is given this will default to the web safe colors defined
         /// in the CSS Color Module Level 4.
         /// </param>
-        public PaletteQuantizer(TColor[] palette = null)
+        public PaletteQuantizer(TPixel[] palette = null)
             : base(true)
         {
             if (palette == null)
             {
-                Color[] constants = ColorConstants.WebSafeColors;
-                TColor[] safe = new TColor[constants.Length + 1];
+                Rgba32[] constants = ColorConstants.WebSafeColors;
+                TPixel[] safe = new TPixel[constants.Length + 1];
 
                 for (int i = 0; i < constants.Length; i++)
                 {
                     constants[i].ToXyzwBytes(this.pixelBuffer, 0);
-                    TColor packed = default(TColor);
+                    TPixel packed = default(TPixel);
                     packed.PackFromBytes(this.pixelBuffer[0], this.pixelBuffer[1], this.pixelBuffer[2], this.pixelBuffer[3]);
                     safe[i] = packed;
                 }
@@ -64,22 +65,22 @@ namespace ImageSharp.Quantizers
         }
 
         /// <inheritdoc/>
-        public override QuantizedImage<TColor> Quantize(ImageBase<TColor> image, int maxColors)
+        public override QuantizedImage<TPixel> Quantize(ImageBase<TPixel> image, int maxColors)
         {
             Array.Resize(ref this.colors, maxColors.Clamp(1, 255));
             return base.Quantize(image, maxColors);
         }
 
         /// <inheritdoc/>
-        protected override void SecondPass(PixelAccessor<TColor> source, byte[] output, int width, int height)
+        protected override void SecondPass(PixelAccessor<TPixel> source, byte[] output, int width, int height)
         {
             // Load up the values for the first pixel. We can use these to speed up the second
             // pass of the algorithm by avoiding transforming rows of identical color.
-            TColor sourcePixel = source[0, 0];
-            TColor previousPixel = sourcePixel;
+            TPixel sourcePixel = source[0, 0];
+            TPixel previousPixel = sourcePixel;
             byte pixelValue = this.QuantizePixel(sourcePixel);
-            TColor[] colorPalette = this.GetPalette();
-            TColor transformedPixel = colorPalette[pixelValue];
+            TPixel[] colorPalette = this.GetPalette();
+            TPixel transformedPixel = colorPalette[pixelValue];
 
             for (int y = 0; y < height; y++)
             {
@@ -117,7 +118,7 @@ namespace ImageSharp.Quantizers
         }
 
         /// <inheritdoc/>
-        protected override TColor[] GetPalette()
+        protected override TPixel[] GetPalette()
         {
             return this.colors;
         }
@@ -130,9 +131,9 @@ namespace ImageSharp.Quantizers
         /// The quantized value
         /// </returns>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private byte QuantizePixel(TColor pixel)
+        private byte QuantizePixel(TPixel pixel)
         {
-            return this.GetClosestColor(pixel, this.GetPalette(), this.colorMap);
+            return this.GetClosesTPixel(pixel, this.GetPalette(), this.colorMap);
         }
     }
 }
\ No newline at end of file
diff --git a/src/ImageSharp/Quantizers/Quantize.cs b/src/ImageSharp/Quantizers/Quantize.cs
index f45cd3f799..a235092787 100644
--- a/src/ImageSharp/Quantizers/Quantize.cs
+++ b/src/ImageSharp/Quantizers/Quantize.cs
@@ -8,37 +8,38 @@ namespace ImageSharp
     using System;
     using System.Threading.Tasks;
 
+    using ImageSharp.PixelFormats;
     using ImageSharp.Quantizers;
 
     /// <summary>
-    /// Extension methods for the <see cref="Image{TColor}"/> type.
+    /// Extension methods for the <see cref="Image{TPixel}"/> type.
     /// </summary>
     public static partial class ImageExtensions
     {
         /// <summary>
         /// Applies quantization to the image.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="mode">The quantization mode to apply to perform the operation.</param>
         /// <param name="maxColors">The maximum number of colors to return. Defaults to 256.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Quantize<TColor>(this Image<TColor> source, Quantization mode = Quantization.Octree, int maxColors = 256)
-            where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Quantize<TPixel>(this Image<TPixel> source, Quantization mode = Quantization.Octree, int maxColors = 256)
+            where TPixel : struct, IPixel<TPixel>
         {
-            IQuantizer<TColor> quantizer;
+            IQuantizer<TPixel> quantizer;
             switch (mode)
             {
                 case Quantization.Wu:
-                    quantizer = new WuQuantizer<TColor>();
+                    quantizer = new WuQuantizer<TPixel>();
                     break;
 
                 case Quantization.Palette:
-                    quantizer = new PaletteQuantizer<TColor>();
+                    quantizer = new PaletteQuantizer<TPixel>();
                     break;
 
                 default:
-                    quantizer = new OctreeQuantizer<TColor>();
+                    quantizer = new OctreeQuantizer<TPixel>();
                     break;
             }
 
@@ -48,18 +49,18 @@ namespace ImageSharp
         /// <summary>
         /// Applies quantization to the image.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format.</typeparam>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
         /// <param name="source">The image this method extends.</param>
         /// <param name="quantizer">The quantizer to apply to perform the operation.</param>
         /// <param name="maxColors">The maximum number of colors to return.</param>
-        /// <returns>The <see cref="Image{TColor}"/>.</returns>
-        public static Image<TColor> Quantize<TColor>(this Image<TColor> source, IQuantizer<TColor> quantizer, int maxColors)
-            where TColor : struct, IPixel<TColor>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static Image<TPixel> Quantize<TPixel>(this Image<TPixel> source, IQuantizer<TPixel> quantizer, int maxColors)
+            where TPixel : struct, IPixel<TPixel>
         {
-            QuantizedImage<TColor> quantized = quantizer.Quantize(source, maxColors);
+            QuantizedImage<TPixel> quantized = quantizer.Quantize(source, maxColors);
             int palleteCount = quantized.Palette.Length - 1;
 
-            using (PixelAccessor<TColor> pixels = new PixelAccessor<TColor>(quantized.Width, quantized.Height))
+            using (PixelAccessor<TPixel> pixels = new PixelAccessor<TPixel>(quantized.Width, quantized.Height))
             {
                 Parallel.For(
                     0,
@@ -70,7 +71,7 @@ namespace ImageSharp
                         for (int x = 0; x < pixels.Width; x++)
                         {
                             int i = x + (y * pixels.Width);
-                            TColor color = quantized.Palette[Math.Min(palleteCount, quantized.Pixels[i])];
+                            TPixel color = quantized.Palette[Math.Min(palleteCount, quantized.Pixels[i])];
                             pixels[x, y] = color;
                         }
                     });
diff --git a/src/ImageSharp/Quantizers/QuantizedImage.cs b/src/ImageSharp/Quantizers/QuantizedImage{TPixel}.cs
similarity index 82%
rename from src/ImageSharp/Quantizers/QuantizedImage.cs
rename to src/ImageSharp/Quantizers/QuantizedImage{TPixel}.cs
index 471abbae75..c8b2c7df60 100644
--- a/src/ImageSharp/Quantizers/QuantizedImage.cs
+++ b/src/ImageSharp/Quantizers/QuantizedImage{TPixel}.cs
@@ -1,4 +1,4 @@
-// <copyright file="QuantizedImage.cs" company="James Jackson-South">
+// <copyright file="QuantizedImage{TPixel}.cs" company="James Jackson-South">
 // Copyright (c) James Jackson-South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
@@ -6,22 +6,23 @@
 namespace ImageSharp.Quantizers
 {
     using System;
+    using ImageSharp.PixelFormats;
 
     /// <summary>
     /// Represents a quantized image where the pixels indexed by a color palette.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    public class QuantizedImage<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    public class QuantizedImage<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
-        /// Initializes a new instance of the <see cref="QuantizedImage{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="QuantizedImage{TPixel}"/> class.
         /// </summary>
         /// <param name="width">The image width.</param>
         /// <param name="height">The image height.</param>
         /// <param name="palette">The color palette.</param>
         /// <param name="pixels">The quantized pixels.</param>
-        public QuantizedImage(int width, int height, TColor[] palette, byte[] pixels)
+        public QuantizedImage(int width, int height, TPixel[] palette, byte[] pixels)
         {
             Guard.MustBeGreaterThan(width, 0, nameof(width));
             Guard.MustBeGreaterThan(height, 0, nameof(height));
@@ -52,7 +53,7 @@ namespace ImageSharp.Quantizers
         /// <summary>
         /// Gets the color palette of this <see cref="T:QuantizedImage"/>.
         /// </summary>
-        public TColor[] Palette { get; }
+        public TPixel[] Palette { get; }
 
         /// <summary>
         /// Gets the pixels of this <see cref="T:QuantizedImage"/>.
diff --git a/src/ImageSharp/Quantizers/Quantizer.cs b/src/ImageSharp/Quantizers/Quantizer{TPixel}.cs
similarity index 84%
rename from src/ImageSharp/Quantizers/Quantizer.cs
rename to src/ImageSharp/Quantizers/Quantizer{TPixel}.cs
index 492ec5f2bc..02447062ef 100644
--- a/src/ImageSharp/Quantizers/Quantizer.cs
+++ b/src/ImageSharp/Quantizers/Quantizer{TPixel}.cs
@@ -1,22 +1,22 @@
-// <copyright file="Quantizer.cs" company="James Jackson-South">
+// <copyright file="Quantizer{TPixel}.cs" company="James Jackson-South">
 // Copyright (c) James Jackson-South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
 namespace ImageSharp.Quantizers
 {
-    using System;
     using System.Collections.Generic;
     using System.Numerics;
     using System.Runtime.CompilerServices;
     using ImageSharp.Dithering;
+    using ImageSharp.PixelFormats;
 
     /// <summary>
     /// Encapsulates methods to calculate the color palette of an image.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    public abstract class Quantizer<TColor> : IDitheredQuantizer<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    public abstract class Quantizer<TPixel> : IDitheredQuantizer<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
         /// Flag used to indicate whether a single pass or two passes are needed for quantization.
@@ -24,7 +24,7 @@ namespace ImageSharp.Quantizers
         private readonly bool singlePass;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="Quantizer{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="Quantizer{TPixel}"/> class.
         /// </summary>
         /// <param name="singlePass">
         /// If true, the quantization only needs to loop through the source pixels once
@@ -46,7 +46,7 @@ namespace ImageSharp.Quantizers
         public IErrorDiffuser DitherType { get; set; } = new SierraLite();
 
         /// <inheritdoc/>
-        public virtual QuantizedImage<TColor> Quantize(ImageBase<TColor> image, int maxColors)
+        public virtual QuantizedImage<TPixel> Quantize(ImageBase<TPixel> image, int maxColors)
         {
             Guard.NotNull(image, nameof(image));
 
@@ -54,9 +54,9 @@ namespace ImageSharp.Quantizers
             int height = image.Height;
             int width = image.Width;
             byte[] quantizedPixels = new byte[width * height];
-            TColor[] colorPalette;
+            TPixel[] colorPalette;
 
-            using (PixelAccessor<TColor> pixels = image.Lock())
+            using (PixelAccessor<TPixel> pixels = image.Lock())
             {
                 // Call the FirstPass function if not a single pass algorithm.
                 // For something like an Octree quantizer, this will run through
@@ -72,8 +72,8 @@ namespace ImageSharp.Quantizers
                 if (this.Dither)
                 {
                     // We clone the image as we don't want to alter the original.
-                    using (Image<TColor> clone = new Image<TColor>(image))
-                    using (PixelAccessor<TColor> clonedPixels = clone.Lock())
+                    using (Image<TPixel> clone = new Image<TPixel>(image))
+                    using (PixelAccessor<TPixel> clonedPixels = clone.Lock())
                     {
                         this.SecondPass(clonedPixels, quantizedPixels, width, height);
                     }
@@ -84,7 +84,7 @@ namespace ImageSharp.Quantizers
                 }
             }
 
-            return new QuantizedImage<TColor>(width, height, colorPalette, quantizedPixels);
+            return new QuantizedImage<TPixel>(width, height, colorPalette, quantizedPixels);
         }
 
         /// <summary>
@@ -93,7 +93,7 @@ namespace ImageSharp.Quantizers
         /// <param name="source">The source data</param>
         /// <param name="width">The width in pixels of the image.</param>
         /// <param name="height">The height in pixels of the image.</param>
-        protected virtual void FirstPass(PixelAccessor<TColor> source, int width, int height)
+        protected virtual void FirstPass(PixelAccessor<TPixel> source, int width, int height)
         {
             // Loop through each row
             for (int y = 0; y < height; y++)
@@ -114,7 +114,7 @@ namespace ImageSharp.Quantizers
         /// <param name="output">The output pixel array</param>
         /// <param name="width">The width in pixels of the image</param>
         /// <param name="height">The height in pixels of the image</param>
-        protected abstract void SecondPass(PixelAccessor<TColor> source, byte[] output, int width, int height);
+        protected abstract void SecondPass(PixelAccessor<TPixel> source, byte[] output, int width, int height);
 
         /// <summary>
         /// Override this to process the pixel in the first pass of the algorithm
@@ -124,7 +124,7 @@ namespace ImageSharp.Quantizers
         /// This function need only be overridden if your quantize algorithm needs two passes,
         /// such as an Octree quantizer.
         /// </remarks>
-        protected virtual void InitialQuantizePixel(TColor pixel)
+        protected virtual void InitialQuantizePixel(TPixel pixel)
         {
         }
 
@@ -132,9 +132,9 @@ namespace ImageSharp.Quantizers
         /// Retrieve the palette for the quantized image. Can be called more than once so make sure calls are cached.
         /// </summary>
         /// <returns>
-        /// <see cref="T:TColor[]"/>
+        /// <see cref="T:TPixel[]"/>
         /// </returns>
-        protected abstract TColor[] GetPalette();
+        protected abstract TPixel[] GetPalette();
 
         /// <summary>
         /// Returns the closest color from the palette to the given color by calculating the Euclidean distance.
@@ -144,7 +144,7 @@ namespace ImageSharp.Quantizers
         /// <param name="cache">The cache to store the result in.</param>
         /// <returns>The <see cref="byte"/></returns>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        protected byte GetClosestColor(TColor pixel, TColor[] colorPalette, Dictionary<TColor, byte> cache)
+        protected byte GetClosesTPixel(TPixel pixel, TPixel[] colorPalette, Dictionary<TPixel, byte> cache)
         {
             // Check if the color is in the lookup table
             if (cache.ContainsKey(pixel))
diff --git a/src/ImageSharp/Quantizers/WuArrayPool.cs b/src/ImageSharp/Quantizers/WuArrayPool.cs
index 5e4956f011..bd8ee9d6b9 100644
--- a/src/ImageSharp/Quantizers/WuArrayPool.cs
+++ b/src/ImageSharp/Quantizers/WuArrayPool.cs
@@ -8,7 +8,7 @@ namespace ImageSharp.Quantizers
     using System.Buffers;
 
     /// <summary>
-    /// Provides array pooling for the <see cref="WuQuantizer{TColor}"/>.
+    /// Provides array pooling for the <see cref="WuQuantizer{TPixel}"/>.
     /// This is a separate class so that the pools can be shared accross multiple generic quantizer instaces.
     /// </summary>
     internal static class WuArrayPool
@@ -29,7 +29,7 @@ namespace ImageSharp.Quantizers
         public static readonly ArrayPool<byte> BytePool = ArrayPool<byte>.Create(TableLength, 5);
 
         /// <summary>
-        /// The table length. Matches the calculated value in <see cref="WuQuantizer{TColor}"/>
+        /// The table length. Matches the calculated value in <see cref="WuQuantizer{TPixel}"/>
         /// </summary>
         private const int TableLength = 2471625;
     }
diff --git a/src/ImageSharp/Quantizers/WuQuantizer.cs b/src/ImageSharp/Quantizers/WuQuantizer{TPixel}.cs
similarity index 96%
rename from src/ImageSharp/Quantizers/WuQuantizer.cs
rename to src/ImageSharp/Quantizers/WuQuantizer{TPixel}.cs
index 46af6fab93..482481c710 100644
--- a/src/ImageSharp/Quantizers/WuQuantizer.cs
+++ b/src/ImageSharp/Quantizers/WuQuantizer{TPixel}.cs
@@ -1,4 +1,4 @@
-// <copyright file="WuQuantizer.cs" company="James Jackson-South">
+// <copyright file="WuQuantizer{TPixel}.cs" company="James Jackson-South">
 // Copyright (c) James Jackson-South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
@@ -10,6 +10,7 @@ namespace ImageSharp.Quantizers
     using System.Collections.Generic;
     using System.Numerics;
     using System.Runtime.CompilerServices;
+    using ImageSharp.PixelFormats;
 
     /// <summary>
     /// An implementation of Wu's color quantizer with alpha channel.
@@ -30,9 +31,9 @@ namespace ImageSharp.Quantizers
     /// but more expensive versions.
     /// </para>
     /// </remarks>
-    /// <typeparam name="TColor">The pixel format.</typeparam>
-    public class WuQuantizer<TColor> : Quantizer<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    public class WuQuantizer<TPixel> : Quantizer<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
         /// The index bits.
@@ -67,7 +68,7 @@ namespace ImageSharp.Quantizers
         /// <summary>
         /// A lookup table for colors
         /// </summary>
-        private readonly Dictionary<TColor, byte> colorMap = new Dictionary<TColor, byte>();
+        private readonly Dictionary<TPixel, byte> colorMap = new Dictionary<TPixel, byte>();
 
         /// <summary>
         /// Moment of <c>P(c)</c>.
@@ -112,7 +113,7 @@ namespace ImageSharp.Quantizers
         /// <summary>
         /// The reduced image palette
         /// </summary>
-        private TColor[] palette;
+        private TPixel[] palette;
 
         /// <summary>
         /// The color cube representing the image palette
@@ -120,7 +121,7 @@ namespace ImageSharp.Quantizers
         private Box[] colorCube;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="WuQuantizer{TColor}"/> class.
+        /// Initializes a new instance of the <see cref="WuQuantizer{TPixel}"/> class.
         /// </summary>
         /// <remarks>
         /// The Wu quantizer is a two pass algorithm. The initial pass sets up the 3-D color histogram,
@@ -132,7 +133,7 @@ namespace ImageSharp.Quantizers
         }
 
         /// <inheritdoc/>
-        public override QuantizedImage<TColor> Quantize(ImageBase<TColor> image, int maxColors)
+        public override QuantizedImage<TPixel> Quantize(ImageBase<TPixel> image, int maxColors)
         {
             Guard.NotNull(image, nameof(image));
 
@@ -163,11 +164,11 @@ namespace ImageSharp.Quantizers
         }
 
         /// <inheritdoc/>
-        protected override TColor[] GetPalette()
+        protected override TPixel[] GetPalette()
         {
             if (this.palette == null)
             {
-                this.palette = new TColor[this.colors];
+                this.palette = new TPixel[this.colors];
                 for (int k = 0; k < this.colors; k++)
                 {
                     this.Mark(this.colorCube[k], (byte)k);
@@ -181,7 +182,7 @@ namespace ImageSharp.Quantizers
                         float b = Volume(this.colorCube[k], this.vmb) / weight;
                         float a = Volume(this.colorCube[k], this.vma) / weight;
 
-                        TColor color = default(TColor);
+                        TPixel color = default(TPixel);
                         color.PackFromVector4(new Vector4(r, g, b, a) / 255F);
                         this.palette[k] = color;
                     }
@@ -192,7 +193,7 @@ namespace ImageSharp.Quantizers
         }
 
         /// <inheritdoc/>
-        protected override void InitialQuantizePixel(TColor pixel)
+        protected override void InitialQuantizePixel(TPixel pixel)
         {
             // Add the color to a 3-D color histogram.
             // Colors are expected in r->g->b->a format
@@ -219,7 +220,7 @@ namespace ImageSharp.Quantizers
         }
 
         /// <inheritdoc/>
-        protected override void FirstPass(PixelAccessor<TColor> source, int width, int height)
+        protected override void FirstPass(PixelAccessor<TPixel> source, int width, int height)
         {
             // Build up the 3-D color histogram
             // Loop through each row
@@ -238,15 +239,15 @@ namespace ImageSharp.Quantizers
         }
 
         /// <inheritdoc/>
-        protected override void SecondPass(PixelAccessor<TColor> source, byte[] output, int width, int height)
+        protected override void SecondPass(PixelAccessor<TPixel> source, byte[] output, int width, int height)
         {
             // Load up the values for the first pixel. We can use these to speed up the second
             // pass of the algorithm by avoiding transforming rows of identical color.
-            TColor sourcePixel = source[0, 0];
-            TColor previousPixel = sourcePixel;
+            TPixel sourcePixel = source[0, 0];
+            TPixel previousPixel = sourcePixel;
             byte pixelValue = this.QuantizePixel(sourcePixel);
-            TColor[] colorPalette = this.GetPalette();
-            TColor transformedPixel = colorPalette[pixelValue];
+            TPixel[] colorPalette = this.GetPalette();
+            TPixel transformedPixel = colorPalette[pixelValue];
 
             for (int y = 0; y < height; y++)
             {
@@ -825,13 +826,13 @@ namespace ImageSharp.Quantizers
         /// The quantized value
         /// </returns>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private byte QuantizePixel(TColor pixel)
+        private byte QuantizePixel(TPixel pixel)
         {
             if (this.Dither)
             {
                 // The colors have changed so we need to use Euclidean distance caclulation to find the closest value.
                 // This palette can never be null here.
-                return this.GetClosestColor(pixel, this.palette, this.colorMap);
+                return this.GetClosesTPixel(pixel, this.palette, this.colorMap);
             }
 
             // Expected order r->g->b->a
diff --git a/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromVector4ReferenceVsPointer.cs b/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromVector4ReferenceVsPointer.cs
index befff61d5c..65c4a235d5 100644
--- a/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromVector4ReferenceVsPointer.cs
+++ b/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromVector4ReferenceVsPointer.cs
@@ -6,6 +6,7 @@
     using BenchmarkDotNet.Attributes;
 
     using ImageSharp;
+    using ImageSharp.PixelFormats;
 
     /// <summary>
     /// Compares two implementation candidates for general BulkPixelOperations.ToVector4():
@@ -14,7 +15,7 @@
     /// </summary>
     public unsafe class PackFromVector4ReferenceVsPointer
     {
-        private Buffer<ImageSharp.Color> destination;
+        private Buffer<Rgba32> destination;
 
         private Buffer<Vector4> source;
 
@@ -24,7 +25,7 @@
         [Setup]
         public void Setup()
         {
-            this.destination = new Buffer<ImageSharp.Color>(this.Count);
+            this.destination = new Buffer<Rgba32>(this.Count);
             this.source = new Buffer<Vector4>(this.Count * 4);
             this.source.Pin();
             this.destination.Pin();
@@ -43,12 +44,12 @@
             Vector4* sp = (Vector4*)this.source.Pin();
             byte* dp = (byte*)this.destination.Pin();
             int count = this.Count;
-            int size = sizeof(ImageSharp.Color);
+            int size = sizeof(Rgba32);
 
             for (int i = 0; i < count; i++)
             {
                 Vector4 v = Unsafe.Read<Vector4>(sp);
-                ImageSharp.Color c = default(ImageSharp.Color);
+                Rgba32 c = default(Rgba32);
                 c.PackFromVector4(v);
                 Unsafe.Write(dp, c);
 
@@ -61,7 +62,7 @@
         public void PackUsingReferences()
         {
             ref Vector4 sp = ref this.source.Array[0];
-            ref ImageSharp.Color dp = ref this.destination.Array[0];
+            ref Rgba32 dp = ref this.destination.Array[0];
             int count = this.Count;
 
             for (int i = 0; i < count; i++)
diff --git a/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromXyzw.cs b/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromXyzw.cs
index 33969b8fba..2a370bc002 100644
--- a/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromXyzw.cs
+++ b/tests/ImageSharp.Benchmarks/Color/Bulk/PackFromXyzw.cs
@@ -3,12 +3,12 @@ namespace ImageSharp.Benchmarks.Color.Bulk
 {
     using BenchmarkDotNet.Attributes;
 
-    using Color = ImageSharp.Color;
+    using ImageSharp.PixelFormats;
 
-    public abstract class PackFromXyzw<TColor>
-        where TColor : struct, IPixel<TColor>
+    public abstract class PackFromXyzw<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
-        private Buffer<TColor> destination;
+        private Buffer<TPixel> destination;
 
         private Buffer<byte> source;
 
@@ -18,7 +18,7 @@ namespace ImageSharp.Benchmarks.Color.Bulk
         [Setup]
         public void Setup()
         {
-            this.destination = new Buffer<TColor>(this.Count);
+            this.destination = new Buffer<TPixel>(this.Count);
             this.source = new Buffer<byte>(this.Count * 4);
         }
 
@@ -33,12 +33,12 @@ namespace ImageSharp.Benchmarks.Color.Bulk
         public void PerElement()
         {
             byte[] s = this.source.Array;
-            TColor[] d = this.destination.Array;
+            TPixel[] d = this.destination.Array;
             
             for (int i = 0; i < this.Count; i++)
             {
                 int i4 = i * 4;
-                TColor c = default(TColor);
+                TPixel c = default(TPixel);
                 c.PackFromBytes(s[i4], s[i4 + 1], s[i4 + 2], s[i4 + 3]);
                 d[i] = c;
             }
@@ -47,17 +47,17 @@ namespace ImageSharp.Benchmarks.Color.Bulk
         [Benchmark]
         public void CommonBulk()
         {
-            new BulkPixelOperations<TColor>().PackFromXyzwBytes(this.source, this.destination, this.Count);
+            new BulkPixelOperations<TPixel>().PackFromXyzwBytes(this.source, this.destination, this.Count);
         }
 
         [Benchmark]
         public void OptimizedBulk()
         {
-            BulkPixelOperations<TColor>.Instance.PackFromXyzwBytes(this.source, this.destination, this.Count);
+            BulkPixelOperations<TPixel>.Instance.PackFromXyzwBytes(this.source, this.destination, this.Count);
         }
     }
 
-    public class PackFromXyzw_Color : PackFromXyzw<Color>
+    public class PackFromXyzw_Color : PackFromXyzw<Rgba32>
     {
     }
 }
\ No newline at end of file
diff --git a/tests/ImageSharp.Benchmarks/Color/Bulk/ToVector4.cs b/tests/ImageSharp.Benchmarks/Color/Bulk/ToVector4.cs
index 4cabfc01f4..1234a99460 100644
--- a/tests/ImageSharp.Benchmarks/Color/Bulk/ToVector4.cs
+++ b/tests/ImageSharp.Benchmarks/Color/Bulk/ToVector4.cs
@@ -5,10 +5,12 @@ namespace ImageSharp.Benchmarks.Color.Bulk
 
     using BenchmarkDotNet.Attributes;
 
-    public abstract class ToVector4<TColor>
-        where TColor : struct, IPixel<TColor>
+    using ImageSharp.PixelFormats;
+
+    public abstract class ToVector4<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
-        private Buffer<TColor> source;
+        private Buffer<TPixel> source;
 
         private Buffer<Vector4> destination;
 
@@ -18,7 +20,7 @@ namespace ImageSharp.Benchmarks.Color.Bulk
         [Setup]
         public void Setup()
         {
-            this.source = new Buffer<TColor>(this.Count);
+            this.source = new Buffer<TPixel>(this.Count);
             this.destination = new Buffer<Vector4>(this.Count);
         }
 
@@ -32,12 +34,12 @@ namespace ImageSharp.Benchmarks.Color.Bulk
         [Benchmark(Baseline = true)]
         public void PerElement()
         {
-            TColor[] s = this.source.Array;
+            TPixel[] s = this.source.Array;
             Vector4[] d = this.destination.Array;
 
             for (int i = 0; i < this.Count; i++)
             {
-                TColor c = s[i];
+                TPixel c = s[i];
                 d[i] = c.ToVector4();
             }
         }
@@ -45,17 +47,17 @@ namespace ImageSharp.Benchmarks.Color.Bulk
         [Benchmark]
         public void CommonBulk()
         {
-            new BulkPixelOperations<TColor>().ToVector4(this.source, this.destination, this.Count);
+            new BulkPixelOperations<TPixel>().ToVector4(this.source, this.destination, this.Count);
         }
 
         [Benchmark]
         public void OptimizedBulk()
         {
-            BulkPixelOperations<TColor>.Instance.ToVector4(this.source, this.destination, this.Count);
+            BulkPixelOperations<TPixel>.Instance.ToVector4(this.source, this.destination, this.Count);
         }
     }
 
-    public class ToVector4_Color : ToVector4<ImageSharp.Color>
+    public class ToVector4_Color : ToVector4<Rgba32>
     {
     }
 }
\ No newline at end of file
diff --git a/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyz.cs b/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyz.cs
index f6ae4256db..fe201549bc 100644
--- a/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyz.cs
+++ b/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyz.cs
@@ -3,12 +3,12 @@ namespace ImageSharp.Benchmarks.Color.Bulk
 {
     using BenchmarkDotNet.Attributes;
 
-    using Color = ImageSharp.Color;
+    using ImageSharp.PixelFormats;
 
-    public abstract class ToXyz<TColor>
-        where TColor : struct, IPixel<TColor>
+    public abstract class ToXyz<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
-        private Buffer<TColor> source;
+        private Buffer<TPixel> source;
 
         private Buffer<byte> destination;
 
@@ -18,7 +18,7 @@ namespace ImageSharp.Benchmarks.Color.Bulk
         [Setup]
         public void Setup()
         {
-            this.source = new Buffer<TColor>(this.Count);
+            this.source = new Buffer<TPixel>(this.Count);
             this.destination = new Buffer<byte>(this.Count * 3);
         }
 
@@ -32,12 +32,12 @@ namespace ImageSharp.Benchmarks.Color.Bulk
         [Benchmark(Baseline = true)]
         public void PerElement()
         {
-            TColor[] s = this.source.Array;
+            TPixel[] s = this.source.Array;
             byte[] d = this.destination.Array;
 
             for (int i = 0; i < this.Count; i++)
             {
-                TColor c = s[i];
+                TPixel c = s[i];
                 c.ToXyzBytes(d, i * 4);
             }
         }
@@ -45,17 +45,17 @@ namespace ImageSharp.Benchmarks.Color.Bulk
         [Benchmark]
         public void CommonBulk()
         {
-            new BulkPixelOperations<TColor>().ToXyzBytes(this.source, this.destination, this.Count);
+            new BulkPixelOperations<TPixel>().ToXyzBytes(this.source, this.destination, this.Count);
         }
 
         [Benchmark]
         public void OptimizedBulk()
         {
-            BulkPixelOperations<TColor>.Instance.ToXyzBytes(this.source, this.destination, this.Count);
+            BulkPixelOperations<TPixel>.Instance.ToXyzBytes(this.source, this.destination, this.Count);
         }
     }
 
-    public class ToXyz_Color : ToXyz<Color>
+    public class ToXyz_Color : ToXyz<Rgba32>
     {
     }
 }
\ No newline at end of file
diff --git a/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyzw.cs b/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyzw.cs
index f23ca3e5cf..f7406d0f61 100644
--- a/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyzw.cs
+++ b/tests/ImageSharp.Benchmarks/Color/Bulk/ToXyzw.cs
@@ -7,13 +7,12 @@ using System.Threading.Tasks;
 namespace ImageSharp.Benchmarks.Color.Bulk
 {
     using BenchmarkDotNet.Attributes;
+    using ImageSharp.PixelFormats;
 
-    using Color = ImageSharp.Color;
-
-    public abstract class ToXyzw<TColor>
-        where TColor : struct, IPixel<TColor>
+    public abstract class ToXyzw<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
-        private Buffer<TColor> source;
+        private Buffer<TPixel> source;
 
         private Buffer<byte> destination;
 
@@ -23,7 +22,7 @@ namespace ImageSharp.Benchmarks.Color.Bulk
         [Setup]
         public void Setup()
         {
-            this.source = new Buffer<TColor>(this.Count);
+            this.source = new Buffer<TPixel>(this.Count);
             this.destination = new Buffer<byte>(this.Count * 4);
         }
 
@@ -37,12 +36,12 @@ namespace ImageSharp.Benchmarks.Color.Bulk
         [Benchmark(Baseline = true)]
         public void PerElement()
         {
-            TColor[] s = this.source.Array;
+            TPixel[] s = this.source.Array;
             byte[] d = this.destination.Array;
 
             for (int i = 0; i < this.Count; i++)
             {
-                TColor c = s[i];
+                TPixel c = s[i];
                 c.ToXyzwBytes(d, i * 4);
             }
         }
@@ -50,17 +49,17 @@ namespace ImageSharp.Benchmarks.Color.Bulk
         [Benchmark]
         public void CommonBulk()
         {
-            new BulkPixelOperations<TColor>().ToXyzwBytes(this.source, this.destination, this.Count);
+            new BulkPixelOperations<TPixel>().ToXyzwBytes(this.source, this.destination, this.Count);
         }
 
         [Benchmark]
         public void OptimizedBulk()
         {
-            BulkPixelOperations<TColor>.Instance.ToXyzwBytes(this.source, this.destination, this.Count);
+            BulkPixelOperations<TPixel>.Instance.ToXyzwBytes(this.source, this.destination, this.Count);
         }
     }
     
-    public class ToXyzw_Color : ToXyzw<Color>
+    public class ToXyzw_Color : ToXyzw<Rgba32>
     {
     }
 
diff --git a/tests/ImageSharp.Benchmarks/Color/ColorEquality.cs b/tests/ImageSharp.Benchmarks/Color/ColorEquality.cs
index 3ee28d06b4..a641baafe5 100644
--- a/tests/ImageSharp.Benchmarks/Color/ColorEquality.cs
+++ b/tests/ImageSharp.Benchmarks/Color/ColorEquality.cs
@@ -7,7 +7,8 @@ namespace ImageSharp.Benchmarks
 {
     using BenchmarkDotNet.Attributes;
 
-    using CoreColor = ImageSharp.Color;
+    using ImageSharp.PixelFormats;
+
     using SystemColor = System.Drawing.Color;
 
     public class ColorEquality
@@ -21,7 +22,7 @@ namespace ImageSharp.Benchmarks
         [Benchmark(Description = "ImageSharp Color Equals")]
         public bool ColorEqual()
         {
-            return new CoreColor(128, 128, 128, 128).Equals(new CoreColor(128, 128, 128, 128));
+            return new Rgba32(128, 128, 128, 128).Equals(new Rgba32(128, 128, 128, 128));
         }
     }
 }
diff --git a/tests/ImageSharp.Benchmarks/Drawing/DrawBeziers.cs b/tests/ImageSharp.Benchmarks/Drawing/DrawBeziers.cs
index 3e60cae4dc..d0bd9f208f 100644
--- a/tests/ImageSharp.Benchmarks/Drawing/DrawBeziers.cs
+++ b/tests/ImageSharp.Benchmarks/Drawing/DrawBeziers.cs
@@ -12,7 +12,8 @@ namespace ImageSharp.Benchmarks
 
     using BenchmarkDotNet.Attributes;
 
-    using CoreColor = ImageSharp.Color;
+    using ImageSharp.PixelFormats;
+
     using CoreImage = ImageSharp.Image;
     using CorePoint = ImageSharp.Point;
 
@@ -50,7 +51,7 @@ namespace ImageSharp.Benchmarks
             using (CoreImage image = new CoreImage(800, 800))
             {
                 image.DrawBeziers(
-                    CoreColor.HotPink,
+                    Rgba32.HotPink,
                     10,
                     new[] {
                         new Vector2(10, 500),
diff --git a/tests/ImageSharp.Benchmarks/Drawing/DrawLines.cs b/tests/ImageSharp.Benchmarks/Drawing/DrawLines.cs
index ee97866e24..2bd3f4a6a9 100644
--- a/tests/ImageSharp.Benchmarks/Drawing/DrawLines.cs
+++ b/tests/ImageSharp.Benchmarks/Drawing/DrawLines.cs
@@ -12,7 +12,8 @@ namespace ImageSharp.Benchmarks
 
     using BenchmarkDotNet.Attributes;
 
-    using CoreColor = ImageSharp.Color;
+    using ImageSharp.PixelFormats;
+
     using CoreImage = ImageSharp.Image;
     using CorePoint = ImageSharp.Point;
 
@@ -49,7 +50,7 @@ namespace ImageSharp.Benchmarks
             using (CoreImage image = new CoreImage(800, 800))
             {
                 image.DrawLines(
-                    CoreColor.HotPink,
+                    Rgba32.HotPink,
                     10,
                     new[] {
                         new Vector2(10, 10),
diff --git a/tests/ImageSharp.Benchmarks/Drawing/DrawPolygon.cs b/tests/ImageSharp.Benchmarks/Drawing/DrawPolygon.cs
index 047cacb421..a0f8b21d85 100644
--- a/tests/ImageSharp.Benchmarks/Drawing/DrawPolygon.cs
+++ b/tests/ImageSharp.Benchmarks/Drawing/DrawPolygon.cs
@@ -11,10 +11,11 @@ namespace ImageSharp.Benchmarks
     using BenchmarkDotNet.Attributes;
     using CoreImage = ImageSharp.Image;
     using CorePoint = ImageSharp.Point;
-    using CoreColor = ImageSharp.Color;
     using System.IO;
     using System.Numerics;
 
+    using ImageSharp.PixelFormats;
+
     public class DrawPolygon : BenchmarkBase
     {
         [Benchmark(Baseline = true, Description = "System.Drawing Draw Polygon")]
@@ -48,7 +49,7 @@ namespace ImageSharp.Benchmarks
             using (CoreImage image = new CoreImage(800, 800))
             {
                 image.DrawPolygon(
-                    CoreColor.HotPink,
+                    Rgba32.HotPink,
                     10,
                     new[] {
                         new Vector2(10, 10),
diff --git a/tests/ImageSharp.Benchmarks/Drawing/FillPolygon.cs b/tests/ImageSharp.Benchmarks/Drawing/FillPolygon.cs
index 782306deb7..ac10826971 100644
--- a/tests/ImageSharp.Benchmarks/Drawing/FillPolygon.cs
+++ b/tests/ImageSharp.Benchmarks/Drawing/FillPolygon.cs
@@ -13,7 +13,8 @@ namespace ImageSharp.Benchmarks
 
     using BenchmarkDotNet.Attributes;
 
-    using CoreColor = ImageSharp.Color;
+    using ImageSharp.PixelFormats;
+
     using CoreImage = ImageSharp.Image;
 
     public class FillPolygon : BenchmarkBase
@@ -57,7 +58,7 @@ namespace ImageSharp.Benchmarks
             using (CoreImage image = new CoreImage(800, 800))
             {
                 image.FillPolygon(
-                    CoreColor.HotPink,
+                    Rgba32.HotPink,
                     new[] {
                         new Vector2(10, 10),
                         new Vector2(550, 50),
@@ -77,7 +78,7 @@ namespace ImageSharp.Benchmarks
             using (CoreImage image = new CoreImage(800, 800))
             {
                 image.Fill(
-                    CoreColor.HotPink,
+                    Rgba32.HotPink,
                     this.shape);
 
                 using (MemoryStream ms = new MemoryStream())
diff --git a/tests/ImageSharp.Benchmarks/Drawing/FillRectangle.cs b/tests/ImageSharp.Benchmarks/Drawing/FillRectangle.cs
index 691955e8ed..7b21dbdc61 100644
--- a/tests/ImageSharp.Benchmarks/Drawing/FillRectangle.cs
+++ b/tests/ImageSharp.Benchmarks/Drawing/FillRectangle.cs
@@ -11,11 +11,12 @@ namespace ImageSharp.Benchmarks
     using BenchmarkDotNet.Attributes;
     using CoreImage = ImageSharp.Image;
     using CoreRectangle = ImageSharp.Rectangle;
-    using CoreColor = ImageSharp.Color;
     using CoreSize = ImageSharp.Size;
 
     using System.Numerics;
 
+    using ImageSharp.PixelFormats;
+
     public class FillRectangle : BenchmarkBase
     {
         [Benchmark(Baseline = true, Description = "System.Drawing Fill Rectangle")]
@@ -39,7 +40,7 @@ namespace ImageSharp.Benchmarks
         {
             using (CoreImage image = new CoreImage(800, 800))
             {
-            	image.Fill(CoreColor.HotPink, new CoreRectangle(10, 10, 190, 140));
+            	image.Fill(Rgba32.HotPink, new CoreRectangle(10, 10, 190, 140));
 
                 return new CoreSize(image.Width, image.Height);
             }
@@ -51,7 +52,7 @@ namespace ImageSharp.Benchmarks
             using (CoreImage image = new CoreImage(800, 800))
             {
                 image.FillPolygon(
-                    CoreColor.HotPink,
+                    Rgba32.HotPink,
                     new[] {
 		                new Vector2(10, 10),
 		                new Vector2(200, 10),
diff --git a/tests/ImageSharp.Benchmarks/Drawing/FillWithPattern.cs b/tests/ImageSharp.Benchmarks/Drawing/FillWithPattern.cs
index dcd22d6fb4..580120abd7 100644
--- a/tests/ImageSharp.Benchmarks/Drawing/FillWithPattern.cs
+++ b/tests/ImageSharp.Benchmarks/Drawing/FillWithPattern.cs
@@ -11,8 +11,10 @@ namespace ImageSharp.Benchmarks
 
     using BenchmarkDotNet.Attributes;
 
+    using ImageSharp.PixelFormats;
+
     using CoreBrushes = ImageSharp.Drawing.Brushes.Brushes;
-    using CoreColor = ImageSharp.Color;
+
     using CoreImage = ImageSharp.Image;
 
     public class FillWithPattern
@@ -40,7 +42,7 @@ namespace ImageSharp.Benchmarks
         {
             using (CoreImage image = new CoreImage(800, 800))
             {
-                image.Fill(CoreBrushes.BackwardDiagonal(CoreColor.HotPink));
+                image.Fill(CoreBrushes.BackwardDiagonal(Rgba32.HotPink));
 
                 using (MemoryStream ms = new MemoryStream())
                 {
diff --git a/tests/ImageSharp.Benchmarks/General/ClearBuffer.cs b/tests/ImageSharp.Benchmarks/General/ClearBuffer.cs
index c7a2021deb..97deb72c57 100644
--- a/tests/ImageSharp.Benchmarks/General/ClearBuffer.cs
+++ b/tests/ImageSharp.Benchmarks/General/ClearBuffer.cs
@@ -7,11 +7,11 @@ namespace ImageSharp.Benchmarks.General
 
     using BenchmarkDotNet.Attributes;
 
-    using Color = ImageSharp.Color;
+    using ImageSharp.PixelFormats;
 
     public unsafe class ClearBuffer
     {
-        private Buffer<Color> buffer;
+        private Buffer<Rgba32> buffer;
 
         [Params(32, 128, 512)]
         public int Count { get; set; }
@@ -19,7 +19,7 @@ namespace ImageSharp.Benchmarks.General
         [Setup]
         public void Setup()
         {
-            this.buffer = new Buffer<ImageSharp.Color>(this.Count);
+            this.buffer = new Buffer<Rgba32>(this.Count);
         }
 
         [Cleanup]
diff --git a/tests/ImageSharp.Benchmarks/Image/CopyPixels.cs b/tests/ImageSharp.Benchmarks/Image/CopyPixels.cs
index 335d8247d3..aade8a8ded 100644
--- a/tests/ImageSharp.Benchmarks/Image/CopyPixels.cs
+++ b/tests/ImageSharp.Benchmarks/Image/CopyPixels.cs
@@ -9,19 +9,20 @@ namespace ImageSharp.Benchmarks.Image
 
     using BenchmarkDotNet.Attributes;
 
-    using CoreColor = ImageSharp.Color;
+    using ImageSharp.PixelFormats;
+
     using CoreImage = ImageSharp.Image;
 
     public class CopyPixels : BenchmarkBase
     {
         [Benchmark(Description = "Copy by Pixel")]
-        public CoreColor CopyByPixel()
+        public Rgba32 CopyByPixel()
         {
             using (CoreImage source = new CoreImage(1024, 768))
             using (CoreImage target = new CoreImage(1024, 768))
             {
-                using (PixelAccessor<CoreColor> sourcePixels = source.Lock())
-                using (PixelAccessor<CoreColor> targetPixels = target.Lock())
+                using (PixelAccessor<Rgba32> sourcePixels = source.Lock())
+                using (PixelAccessor<Rgba32> targetPixels = target.Lock())
                 {
                     Parallel.For(
                         0,
diff --git a/tests/ImageSharp.Benchmarks/Image/EncodeIndexedPng.cs b/tests/ImageSharp.Benchmarks/Image/EncodeIndexedPng.cs
index 1318c1674a..b27ad5fcc3 100644
--- a/tests/ImageSharp.Benchmarks/Image/EncodeIndexedPng.cs
+++ b/tests/ImageSharp.Benchmarks/Image/EncodeIndexedPng.cs
@@ -11,6 +11,7 @@ namespace ImageSharp.Benchmarks.Image
 
     using ImageSharp;
     using ImageSharp.Formats;
+    using ImageSharp.PixelFormats;
     using ImageSharp.Quantizers;
 
     /// <summary>
@@ -51,7 +52,7 @@ namespace ImageSharp.Benchmarks.Image
         {
             using (MemoryStream memoryStream = new MemoryStream())
             {
-                PngEncoderOptions options = new PngEncoderOptions() { Quantizer = new OctreeQuantizer<Color>(), Quality = 256 };
+                PngEncoderOptions options = new PngEncoderOptions() { Quantizer = new OctreeQuantizer<Rgba32>(), Quality = 256 };
 
                 this.bmpCore.SaveAsPng(memoryStream, options);
             }
@@ -62,7 +63,7 @@ namespace ImageSharp.Benchmarks.Image
         {
             using (MemoryStream memoryStream = new MemoryStream())
             {
-                PngEncoderOptions options = new PngEncoderOptions { Quantizer = new OctreeQuantizer<Color> { Dither = false }, Quality = 256 };
+                PngEncoderOptions options = new PngEncoderOptions { Quantizer = new OctreeQuantizer<Rgba32> { Dither = false }, Quality = 256 };
 
                 this.bmpCore.SaveAsPng(memoryStream, options);
             }
@@ -73,7 +74,7 @@ namespace ImageSharp.Benchmarks.Image
         {
             using (MemoryStream memoryStream = new MemoryStream())
             {
-                PngEncoderOptions options = new PngEncoderOptions { Quantizer = new PaletteQuantizer<Color>(), Quality = 256 };
+                PngEncoderOptions options = new PngEncoderOptions { Quantizer = new PaletteQuantizer<Rgba32>(), Quality = 256 };
 
                 this.bmpCore.SaveAsPng(memoryStream, options);
             }
@@ -84,7 +85,7 @@ namespace ImageSharp.Benchmarks.Image
         {
             using (MemoryStream memoryStream = new MemoryStream())
             {
-                PngEncoderOptions options = new PngEncoderOptions { Quantizer = new PaletteQuantizer<Color> { Dither = false }, Quality = 256 };
+                PngEncoderOptions options = new PngEncoderOptions { Quantizer = new PaletteQuantizer<Rgba32> { Dither = false }, Quality = 256 };
 
                 this.bmpCore.SaveAsPng(memoryStream, options);
             }
@@ -95,7 +96,7 @@ namespace ImageSharp.Benchmarks.Image
         {
             using (MemoryStream memoryStream = new MemoryStream())
             {
-                PngEncoderOptions options = new PngEncoderOptions() { Quantizer = new WuQuantizer<Color>(), Quality = 256 };
+                PngEncoderOptions options = new PngEncoderOptions() { Quantizer = new WuQuantizer<Rgba32>(), Quality = 256 };
 
                 this.bmpCore.SaveAsPng(memoryStream, options);
             }
diff --git a/tests/ImageSharp.Benchmarks/Image/EncodePng.cs b/tests/ImageSharp.Benchmarks/Image/EncodePng.cs
index 4c1feb6c2a..6158e5aac8 100644
--- a/tests/ImageSharp.Benchmarks/Image/EncodePng.cs
+++ b/tests/ImageSharp.Benchmarks/Image/EncodePng.cs
@@ -12,6 +12,7 @@ namespace ImageSharp.Benchmarks.Image
     using BenchmarkDotNet.Attributes;
 
     using ImageSharp.Formats;
+    using ImageSharp.PixelFormats;
     using ImageSharp.Quantizers;
 
     using CoreImage = ImageSharp.Image;
@@ -66,10 +67,10 @@ namespace ImageSharp.Benchmarks.Image
         {
             using (MemoryStream memoryStream = new MemoryStream())
             {
-                Quantizer<ImageSharp.Color> quantizer = this.UseOctreeQuantizer
-                                                            ? (Quantizer<ImageSharp.Color>)
-                                                            new OctreeQuantizer<ImageSharp.Color>()
-                                                            : new PaletteQuantizer<ImageSharp.Color>();
+                Quantizer<Rgba32> quantizer = this.UseOctreeQuantizer
+                ? (Quantizer<Rgba32>)
+                new OctreeQuantizer<Rgba32>()
+                : new PaletteQuantizer<Rgba32>();
 
                 PngEncoderOptions options = new PngEncoderOptions() { Quantizer = quantizer };
                 this.bmpCore.SaveAsPng(memoryStream, options);
diff --git a/tests/ImageSharp.Benchmarks/Image/GetSetPixel.cs b/tests/ImageSharp.Benchmarks/Image/GetSetPixel.cs
index 78295e27d7..21927c9154 100644
--- a/tests/ImageSharp.Benchmarks/Image/GetSetPixel.cs
+++ b/tests/ImageSharp.Benchmarks/Image/GetSetPixel.cs
@@ -9,7 +9,8 @@ namespace ImageSharp.Benchmarks.Image
 
     using BenchmarkDotNet.Attributes;
 
-    using CoreColor = ImageSharp.Color;
+    using ImageSharp.PixelFormats;
+
     using CoreImage = ImageSharp.Image;
     using SystemColor = System.Drawing.Color;
 
@@ -26,13 +27,13 @@ namespace ImageSharp.Benchmarks.Image
         }
 
         [Benchmark(Description = "ImageSharp GetSet pixel")]
-        public CoreColor ResizeCore()
+        public Rgba32 ResizeCore()
         {
             using (CoreImage image = new CoreImage(400, 400))
             {
-                using (PixelAccessor<CoreColor> imagePixels = image.Lock())
+                using (PixelAccessor<Rgba32> imagePixels = image.Lock())
                 {
-                    imagePixels[200, 200] = CoreColor.White;
+                    imagePixels[200, 200] = Rgba32.White;
                     return imagePixels[200, 200];
                 }
             }
diff --git a/tests/ImageSharp.Benchmarks/Samplers/Resize.cs b/tests/ImageSharp.Benchmarks/Samplers/Resize.cs
index 569070af2a..638a56bf31 100644
--- a/tests/ImageSharp.Benchmarks/Samplers/Resize.cs
+++ b/tests/ImageSharp.Benchmarks/Samplers/Resize.cs
@@ -9,9 +9,11 @@ namespace ImageSharp.Benchmarks
     using System.Drawing.Drawing2D;
 
     using BenchmarkDotNet.Attributes;
+
+    using ImageSharp.PixelFormats;
+
     using CoreSize = ImageSharp.Size;
     using CoreImage = ImageSharp.Image;
-    using CoreVectorImage = ImageSharp.Image<ImageSharp.ColorVector>;
 
     public class Resize : BenchmarkBase
     {
@@ -48,7 +50,7 @@ namespace ImageSharp.Benchmarks
         [Benchmark(Description = "ImageSharp Vector Resize")]
         public CoreSize ResizeCoreVector()
         {
-            using (CoreVectorImage image = new CoreVectorImage(2000, 2000))
+            using (CoreImage image = new CoreImage(2000, 2000))
             {
                 image.Resize(400, 400);
                 return new CoreSize(image.Width, image.Height);
@@ -68,7 +70,7 @@ namespace ImageSharp.Benchmarks
         [Benchmark(Description = "ImageSharp Vector Compand Resize")]
         public CoreSize ResizeCoreVectorCompand()
         {
-            using (CoreVectorImage image = new CoreVectorImage(2000, 2000))
+            using (CoreImage image = new CoreImage(2000, 2000))
             {
                 image.Resize(400, 400, true);
                 return new CoreSize(image.Width, image.Height);
diff --git a/tests/ImageSharp.Tests/Colors/BulkPixelOperationsTests.cs b/tests/ImageSharp.Tests/Colors/BulkPixelOperationsTests.cs
index d4b9f6f3a1..b498c93acc 100644
--- a/tests/ImageSharp.Tests/Colors/BulkPixelOperationsTests.cs
+++ b/tests/ImageSharp.Tests/Colors/BulkPixelOperationsTests.cs
@@ -5,12 +5,14 @@ namespace ImageSharp.Tests.Colors
     using System;
     using System.Numerics;
 
+    using ImageSharp.PixelFormats;
+
     using Xunit;
     using Xunit.Abstractions;
 
     public class BulkPixelOperationsTests
     {
-        public class Color32 : BulkPixelOperationsTests<ImageSharp.Color>
+        public class Color32 : BulkPixelOperationsTests<Rgba32>
         {
             public Color32(ITestOutputHelper output)
                 : base(output)
@@ -23,19 +25,19 @@ namespace ImageSharp.Tests.Colors
             [Fact]
             public void IsSpecialImplementation()
             {
-                Assert.IsType<ImageSharp.Color.BulkOperations>(BulkPixelOperations<ImageSharp.Color>.Instance);
+                Assert.IsType<Rgba32.BulkOperations>(BulkPixelOperations<Rgba32>.Instance);
             }
 
             [Fact]
             public void ToVector4SimdAligned()
             {
-                ImageSharp.Color[] source = CreatePixelTestData(64);
+                Rgba32[] source = CreatePixelTestData(64);
                 Vector4[] expected = CreateExpectedVector4Data(source);
 
                 TestOperation(
                     source,
                     expected,
-                    (s, d) => ImageSharp.Color.BulkOperations.ToVector4SimdAligned(s, d, 64)
+                    (s, d) => Rgba32.BulkOperations.ToVector4SimdAligned(s, d, 64)
                 );
             }
 
@@ -45,20 +47,20 @@ namespace ImageSharp.Tests.Colors
                 int times = 200000;
                 int count = 1024;
 
-                using (Buffer<ImageSharp.Color> source = new Buffer<ImageSharp.Color>(count))
+                using (Buffer<Rgba32> source = new Buffer<Rgba32>(count))
                 using (Buffer<Vector4> dest = new Buffer<Vector4>(count))
                 {
                     this.Measure(
                         times,
                         () =>
                             {
-                                BulkPixelOperations<ImageSharp.Color>.Instance.ToVector4(source, dest, count);
+                                BulkPixelOperations<Rgba32>.Instance.ToVector4(source, dest, count);
                             });
                 }
             }
         }
 
-        public class Argb : BulkPixelOperationsTests<ImageSharp.Argb32>
+        public class Argb : BulkPixelOperationsTests<Argb32>
         {
             // For 4.6 test runner MemberData does not work without redeclaring the public field in the derived test class:
             public Argb(ITestOutputHelper output)
@@ -71,15 +73,15 @@ namespace ImageSharp.Tests.Colors
 
         [Theory]
         [WithBlankImages(1, 1, PixelTypes.All)]
-        public void GetGlobalInstance<TColor>(TestImageProvider<TColor> dummy)
-            where TColor : struct, IPixel<TColor>
+        public void GetGlobalInstance<TPixel>(TestImageProvider<TPixel> dummy)
+            where TPixel : struct, IPixel<TPixel>
         {
-            Assert.NotNull(BulkPixelOperations<TColor>.Instance);
+            Assert.NotNull(BulkPixelOperations<TPixel>.Instance);
         }
     }
 
-    public abstract class BulkPixelOperationsTests<TColor> : MeasureFixture
-        where TColor : struct, IPixel<TColor>
+    public abstract class BulkPixelOperationsTests<TPixel> : MeasureFixture
+        where TPixel : struct, IPixel<TPixel>
     {
         protected BulkPixelOperationsTests(ITestOutputHelper output)
             : base(output)
@@ -88,11 +90,11 @@ namespace ImageSharp.Tests.Colors
 
         public static TheoryData<int> ArraySizesData => new TheoryData<int> { 7, 16, 1111 };
 
-        private static BulkPixelOperations<TColor> Operations => BulkPixelOperations<TColor>.Instance;
+        private static BulkPixelOperations<TPixel> Operations => BulkPixelOperations<TPixel>.Instance;
 
-        internal static TColor[] CreateExpectedPixelData(Vector4[] source)
+        internal static TPixel[] CreateExpectedPixelData(Vector4[] source)
         {
-            TColor[] expected = new TColor[source.Length];
+            TPixel[] expected = new TPixel[source.Length];
 
             for (int i = 0; i < expected.Length; i++)
             {
@@ -106,7 +108,7 @@ namespace ImageSharp.Tests.Colors
         public void PackFromVector4(int count)
         {
             Vector4[] source = CreateVector4TestData(count);
-            TColor[] expected = CreateExpectedPixelData(source);
+            TPixel[] expected = CreateExpectedPixelData(source);
 
             TestOperation(
                 source,
@@ -115,7 +117,7 @@ namespace ImageSharp.Tests.Colors
             );
         }
 
-        internal static Vector4[] CreateExpectedVector4Data(TColor[] source)
+        internal static Vector4[] CreateExpectedVector4Data(TPixel[] source)
         {
             Vector4[] expected = new Vector4[source.Length];
 
@@ -130,7 +132,7 @@ namespace ImageSharp.Tests.Colors
         [MemberData(nameof(ArraySizesData))]
         public void ToVector4(int count)
         {
-            TColor[] source = CreatePixelTestData(count);
+            TPixel[] source = CreatePixelTestData(count);
             Vector4[] expected = CreateExpectedVector4Data(source);
 
             TestOperation(
@@ -146,7 +148,7 @@ namespace ImageSharp.Tests.Colors
         public void PackFromXyzBytes(int count)
         {
             byte[] source = CreateByteTestData(count * 3);
-            TColor[] expected = new TColor[count];
+            TPixel[] expected = new TPixel[count];
 
             for (int i = 0; i < count; i++)
             {
@@ -166,7 +168,7 @@ namespace ImageSharp.Tests.Colors
         [MemberData(nameof(ArraySizesData))]
         public void ToXyzBytes(int count)
         {
-            TColor[] source = CreatePixelTestData(count);
+            TPixel[] source = CreatePixelTestData(count);
             byte[] expected = new byte[count * 3];
 
             for (int i = 0; i < count; i++)
@@ -187,7 +189,7 @@ namespace ImageSharp.Tests.Colors
         public void PackFromXyzwBytes(int count)
         {
             byte[] source = CreateByteTestData(count * 4);
-            TColor[] expected = new TColor[count];
+            TPixel[] expected = new TPixel[count];
 
             for (int i = 0; i < count; i++)
             {
@@ -207,7 +209,7 @@ namespace ImageSharp.Tests.Colors
         [MemberData(nameof(ArraySizesData))]
         public void ToXyzwBytes(int count)
         {
-            TColor[] source = CreatePixelTestData(count);
+            TPixel[] source = CreatePixelTestData(count);
             byte[] expected = new byte[count * 4];
 
             for (int i = 0; i < count; i++)
@@ -228,7 +230,7 @@ namespace ImageSharp.Tests.Colors
         public void PackFromZyxBytes(int count)
         {
             byte[] source = CreateByteTestData(count * 3);
-            TColor[] expected = new TColor[count];
+            TPixel[] expected = new TPixel[count];
 
             for (int i = 0; i < count; i++)
             {
@@ -248,7 +250,7 @@ namespace ImageSharp.Tests.Colors
         [MemberData(nameof(ArraySizesData))]
         public void ToZyxBytes(int count)
         {
-            TColor[] source = CreatePixelTestData(count);
+            TPixel[] source = CreatePixelTestData(count);
             byte[] expected = new byte[count * 3];
 
             for (int i = 0; i < count; i++)
@@ -269,7 +271,7 @@ namespace ImageSharp.Tests.Colors
         public void PackFromZyxwBytes(int count)
         {
             byte[] source = CreateByteTestData(count * 4);
-            TColor[] expected = new TColor[count];
+            TPixel[] expected = new TPixel[count];
 
             for (int i = 0; i < count; i++)
             {
@@ -289,7 +291,7 @@ namespace ImageSharp.Tests.Colors
         [MemberData(nameof(ArraySizesData))]
         public void ToZyxwBytes(int count)
         {
-            TColor[] source = CreatePixelTestData(count);
+            TPixel[] source = CreatePixelTestData(count);
             byte[] expected = new byte[count * 4];
 
             for (int i = 0; i < count; i++)
@@ -387,9 +389,9 @@ namespace ImageSharp.Tests.Colors
             return result;
         }
 
-        internal static TColor[] CreatePixelTestData(int length)
+        internal static TPixel[] CreatePixelTestData(int length)
         {
-            TColor[] result = new TColor[length];
+            TPixel[] result = new TPixel[length];
 
             Random rnd = new Random(42); // Deterministic random values
 
diff --git a/tests/ImageSharp.Tests/Colors/ColorConstructorTests.cs b/tests/ImageSharp.Tests/Colors/ColorConstructorTests.cs
index d2c5cf8454..eac0644d9a 100644
--- a/tests/ImageSharp.Tests/Colors/ColorConstructorTests.cs
+++ b/tests/ImageSharp.Tests/Colors/ColorConstructorTests.cs
@@ -7,6 +7,9 @@ namespace ImageSharp.Tests.Colors
 {
     using System.Collections.Generic;
     using System.Numerics;
+
+    using ImageSharp.PixelFormats;
+
     using Xunit;
 
     public class ColorConstructorTests
diff --git a/tests/ImageSharp.Tests/Colors/ColorConversionTests.cs b/tests/ImageSharp.Tests/Colors/ColorConversionTests.cs
index 9ed1c67a70..4b45d0ab48 100644
--- a/tests/ImageSharp.Tests/Colors/ColorConversionTests.cs
+++ b/tests/ImageSharp.Tests/Colors/ColorConversionTests.cs
@@ -8,6 +8,7 @@ namespace ImageSharp.Tests
     using System;
     using System.Diagnostics.CodeAnalysis;
     using ImageSharp.Colors.Spaces;
+    using ImageSharp.PixelFormats;
     using Xunit;
 
     /// <summary>
@@ -20,7 +21,7 @@ namespace ImageSharp.Tests
     public class ColorConversionTests
     {
         /// <summary>
-        /// Tests the implicit conversion from <see cref="Color"/> to <see cref="YCbCr"/>.
+        /// Tests the implicit conversion from <see cref="Rgba32"/> to <see cref="YCbCr"/>.
         /// </summary>
         [Fact]
         [SuppressMessage("StyleCop.CSharp.NamingRules", "SA1305:FieldNamesMustNotUseHungarianNotation",
@@ -28,7 +29,7 @@ namespace ImageSharp.Tests
         public void ColorToYCbCr()
         {
             // White
-            Color color = Color.White;
+            Rgba32 color = Rgba32.White;
             YCbCr yCbCr = color;
 
             Assert.Equal(255, yCbCr.Y);
@@ -36,14 +37,14 @@ namespace ImageSharp.Tests
             Assert.Equal(128, yCbCr.Cr);
 
             // Black
-            Color color2 = Color.Black;
+            Rgba32 color2 = Rgba32.Black;
             YCbCr yCbCr2 = color2;
             Assert.Equal(0, yCbCr2.Y);
             Assert.Equal(128, yCbCr2.Cb);
             Assert.Equal(128, yCbCr2.Cr);
 
             // Gray
-            Color color3 = Color.Gray;
+            Rgba32 color3 = Rgba32.Gray;
             YCbCr yCbCr3 = color3;
             Assert.Equal(128, yCbCr3.Y);
             Assert.Equal(128, yCbCr3.Cb);
@@ -51,7 +52,7 @@ namespace ImageSharp.Tests
         }
 
         /// <summary>
-        /// Tests the implicit conversion from <see cref="YCbCr"/> to <see cref="Color"/>.
+        /// Tests the implicit conversion from <see cref="YCbCr"/> to <see cref="Rgba32"/>.
         /// </summary>
         [Fact]
         [SuppressMessage("StyleCop.CSharp.NamingRules", "SA1305:FieldNamesMustNotUseHungarianNotation",
@@ -60,7 +61,7 @@ namespace ImageSharp.Tests
         {
             // White
             YCbCr yCbCr = new YCbCr(255, 128, 128);
-            Color color = yCbCr;
+            Rgba32 color = yCbCr;
 
             Assert.Equal(255, color.R);
             Assert.Equal(255, color.G);
@@ -69,7 +70,7 @@ namespace ImageSharp.Tests
 
             // Black
             YCbCr yCbCr2 = new YCbCr(0, 128, 128);
-            Color color2 = yCbCr2;
+            Rgba32 color2 = yCbCr2;
 
             Assert.Equal(0, color2.R);
             Assert.Equal(0, color2.G);
@@ -78,7 +79,7 @@ namespace ImageSharp.Tests
 
             // Gray
             YCbCr yCbCr3 = new YCbCr(128, 128, 128);
-            Color color3 = yCbCr3;
+            Rgba32 color3 = yCbCr3;
 
             Assert.Equal(128, color3.R);
             Assert.Equal(128, color3.G);
@@ -87,7 +88,7 @@ namespace ImageSharp.Tests
         }
 
         /// <summary>
-        /// Tests the implicit conversion from <see cref="Color"/> to <see cref="CieXyz"/>.
+        /// Tests the implicit conversion from <see cref="Rgba32"/> to <see cref="CieXyz"/>.
         /// Comparison values obtained from
         /// http://colormine.org/convert/rgb-to-xyz
         /// </summary>
@@ -95,7 +96,7 @@ namespace ImageSharp.Tests
         public void ColorToCieXyz()
         {
             // White
-            Color color = Color.White;
+            Rgba32 color = Rgba32.White;
             CieXyz ciexyz = color;
 
             Assert.Equal(95.05f, ciexyz.X, 3);
@@ -103,21 +104,21 @@ namespace ImageSharp.Tests
             Assert.Equal(108.900f, ciexyz.Z, 3);
 
             // Black
-            Color color2 = Color.Black;
+            Rgba32 color2 = Rgba32.Black;
             CieXyz ciexyz2 = color2;
             Assert.Equal(0, ciexyz2.X, 3);
             Assert.Equal(0, ciexyz2.Y, 3);
             Assert.Equal(0, ciexyz2.Z, 3);
 
             // Gray
-            Color color3 = Color.Gray;
+            Rgba32 color3 = Rgba32.Gray;
             CieXyz ciexyz3 = color3;
             Assert.Equal(20.518, ciexyz3.X, 3);
             Assert.Equal(21.586, ciexyz3.Y, 3);
             Assert.Equal(23.507, ciexyz3.Z, 3);
 
             // Cyan
-            Color color4 = Color.Cyan;
+            Rgba32 color4 = Rgba32.Cyan;
             CieXyz ciexyz4 = color4;
             Assert.Equal(53.810f, ciexyz4.X, 3);
             Assert.Equal(78.740f, ciexyz4.Y, 3);
@@ -125,7 +126,7 @@ namespace ImageSharp.Tests
         }
 
         /// <summary>
-        /// Tests the implicit conversion from <see cref="CieXyz"/> to <see cref="Color"/>.
+        /// Tests the implicit conversion from <see cref="CieXyz"/> to <see cref="Rgba32"/>.
         /// Comparison values obtained from
         /// http://colormine.org/convert/rgb-to-xyz
         /// </summary>
@@ -134,7 +135,7 @@ namespace ImageSharp.Tests
         {
             // Dark moderate pink.
             CieXyz ciexyz = new CieXyz(13.337f, 9.297f, 14.727f);
-            Color color = ciexyz;
+            Rgba32 color = ciexyz;
 
             Assert.Equal(128, color.R);
             Assert.Equal(64, color.G);
@@ -142,7 +143,7 @@ namespace ImageSharp.Tests
 
             // Ochre
             CieXyz ciexyz2 = new CieXyz(31.787f, 26.147f, 4.885f);
-            Color color2 = ciexyz2;
+            Rgba32 color2 = ciexyz2;
 
             Assert.Equal(204, color2.R);
             Assert.Equal(119, color2.G);
@@ -150,7 +151,7 @@ namespace ImageSharp.Tests
 
             // Black
             CieXyz ciexyz3 = new CieXyz(0, 0, 0);
-            Color color3 = ciexyz3;
+            Rgba32 color3 = ciexyz3;
 
             Assert.Equal(0, color3.R);
             Assert.Equal(0, color3.G);
@@ -167,7 +168,7 @@ namespace ImageSharp.Tests
         }
 
         /// <summary>
-        /// Tests the implicit conversion from <see cref="Color"/> to <see cref="Hsv"/>.
+        /// Tests the implicit conversion from <see cref="Rgba32"/> to <see cref="Hsv"/>.
         /// </summary>
         [Fact]
         [SuppressMessage("StyleCop.CSharp.NamingRules", "SA1305:FieldNamesMustNotUseHungarianNotation",
@@ -175,7 +176,7 @@ namespace ImageSharp.Tests
         public void ColorToHsv()
         {
             // Black
-            Color b = Color.Black;
+            Rgba32 b = Rgba32.Black;
             Hsv h = b;
 
             Assert.Equal(0, h.H, 1);
@@ -183,7 +184,7 @@ namespace ImageSharp.Tests
             Assert.Equal(0, h.V, 1);
 
             // White
-            Color color = Color.White;
+            Rgba32 color = Rgba32.White;
             Hsv hsv = color;
 
             Assert.Equal(0f, hsv.H, 1);
@@ -191,7 +192,7 @@ namespace ImageSharp.Tests
             Assert.Equal(1f, hsv.V, 1);
 
             // Dark moderate pink.
-            Color color2 = new Color(128, 64, 106);
+            Rgba32 color2 = new Rgba32(128, 64, 106);
             Hsv hsv2 = color2;
 
             Assert.Equal(320.6f, hsv2.H, 1);
@@ -199,7 +200,7 @@ namespace ImageSharp.Tests
             Assert.Equal(0.502f, hsv2.V, 2);
 
             // Ochre.
-            Color color3 = new Color(204, 119, 34);
+            Rgba32 color3 = new Rgba32(204, 119, 34);
             Hsv hsv3 = color3;
 
             Assert.Equal(30f, hsv3.H, 1);
@@ -208,14 +209,14 @@ namespace ImageSharp.Tests
         }
 
         /// <summary>
-        /// Tests the implicit conversion from <see cref="Hsv"/> to <see cref="Color"/>.
+        /// Tests the implicit conversion from <see cref="Hsv"/> to <see cref="Rgba32"/>.
         /// </summary>
         [Fact]
         public void HsvToColor()
         {
             // Dark moderate pink.
             Hsv hsv = new Hsv(320.6f, 0.5f, 0.502f);
-            Color color = hsv;
+            Rgba32 color = hsv;
 
             Assert.Equal(color.R, 128);
             Assert.Equal(color.G, 64);
@@ -223,7 +224,7 @@ namespace ImageSharp.Tests
 
             // Ochre
             Hsv hsv2 = new Hsv(30, 0.833f, 0.8f);
-            Color color2 = hsv2;
+            Rgba32 color2 = hsv2;
 
             Assert.Equal(color2.R, 204);
             Assert.Equal(color2.G, 119);
@@ -231,7 +232,7 @@ namespace ImageSharp.Tests
 
             // White
             Hsv hsv3 = new Hsv(0, 0, 1);
-            Color color3 = hsv3;
+            Rgba32 color3 = hsv3;
 
             Assert.Equal(color3.B, 255);
             Assert.Equal(color3.G, 255);
@@ -248,7 +249,7 @@ namespace ImageSharp.Tests
         }
 
         /// <summary>
-        /// Tests the implicit conversion from <see cref="Color"/> to <see cref="Hsl"/>.
+        /// Tests the implicit conversion from <see cref="Rgba32"/> to <see cref="Hsl"/>.
         /// </summary>
         [Fact]
         [SuppressMessage("StyleCop.CSharp.NamingRules", "SA1305:FieldNamesMustNotUseHungarianNotation",
@@ -256,7 +257,7 @@ namespace ImageSharp.Tests
         public void ColorToHsl()
         {
             // Black
-            Color b = Color.Black;
+            Rgba32 b = Rgba32.Black;
             Hsl h = b;
 
             Assert.Equal(0, h.H, 1);
@@ -264,7 +265,7 @@ namespace ImageSharp.Tests
             Assert.Equal(0, h.L, 1);
 
             // White
-            Color color = Color.White;
+            Rgba32 color = Rgba32.White;
             Hsl hsl = color;
 
             Assert.Equal(0f, hsl.H, 1);
@@ -272,7 +273,7 @@ namespace ImageSharp.Tests
             Assert.Equal(1f, hsl.L, 1);
 
             // Dark moderate pink.
-            Color color2 = new Color(128, 64, 106);
+            Rgba32 color2 = new Rgba32(128, 64, 106);
             Hsl hsl2 = color2;
 
             Assert.Equal(320.6f, hsl2.H, 1);
@@ -280,7 +281,7 @@ namespace ImageSharp.Tests
             Assert.Equal(0.376f, hsl2.L, 2);
 
             // Ochre.
-            Color color3 = new Color(204, 119, 34);
+            Rgba32 color3 = new Rgba32(204, 119, 34);
             Hsl hsl3 = color3;
 
             Assert.Equal(30f, hsl3.H, 1);
@@ -289,14 +290,14 @@ namespace ImageSharp.Tests
         }
 
         /// <summary>
-        /// Tests the implicit conversion from <see cref="Hsl"/> to <see cref="Color"/>.
+        /// Tests the implicit conversion from <see cref="Hsl"/> to <see cref="Rgba32"/>.
         /// </summary>
         [Fact]
         public void HslToColor()
         {
             // Dark moderate pink.
             Hsl hsl = new Hsl(320.6f, 0.33f, 0.376f);
-            Color color = hsl;
+            Rgba32 color = hsl;
 
             Assert.Equal(color.R, 128);
             Assert.Equal(color.G, 64);
@@ -304,7 +305,7 @@ namespace ImageSharp.Tests
 
             // Ochre
             Hsl hsl2 = new Hsl(30, 0.714f, 0.467f);
-            Color color2 = hsl2;
+            Rgba32 color2 = hsl2;
 
             Assert.Equal(color2.R, 204);
             Assert.Equal(color2.G, 119);
@@ -312,7 +313,7 @@ namespace ImageSharp.Tests
 
             // White
             Hsl hsl3 = new Hsl(0, 0, 1);
-            Color color3 = hsl3;
+            Rgba32 color3 = hsl3;
 
             Assert.Equal(color3.R, 255);
             Assert.Equal(color3.G, 255);
@@ -329,7 +330,7 @@ namespace ImageSharp.Tests
         }
 
         /// <summary>
-        /// Tests the implicit conversion from <see cref="Color"/> to <see cref="Cmyk"/>.
+        /// Tests the implicit conversion from <see cref="Rgba32"/> to <see cref="Cmyk"/>.
         /// </summary>
         [Fact]
         [SuppressMessage("StyleCop.CSharp.NamingRules", "SA1305:FieldNamesMustNotUseHungarianNotation",
@@ -337,7 +338,7 @@ namespace ImageSharp.Tests
         public void ColorToCmyk()
         {
             // White
-            Color color = Color.White;
+            Rgba32 color = Rgba32.White;
             Cmyk cmyk = color;
 
             Assert.Equal(0, cmyk.C, 1);
@@ -346,7 +347,7 @@ namespace ImageSharp.Tests
             Assert.Equal(0, cmyk.K, 1);
 
             // Black
-            Color color2 = Color.Black;
+            Rgba32 color2 = Rgba32.Black;
             Cmyk cmyk2 = color2;
             Assert.Equal(0, cmyk2.C, 1);
             Assert.Equal(0, cmyk2.M, 1);
@@ -354,7 +355,7 @@ namespace ImageSharp.Tests
             Assert.Equal(1, cmyk2.K, 1);
 
             // Gray
-            Color color3 = Color.Gray;
+            Rgba32 color3 = Rgba32.Gray;
             Cmyk cmyk3 = color3;
             Assert.Equal(0f, cmyk3.C, 1);
             Assert.Equal(0f, cmyk3.M, 1);
@@ -362,7 +363,7 @@ namespace ImageSharp.Tests
             Assert.Equal(0.498, cmyk3.K, 2); // Checked with other online converters.
 
             // Cyan
-            Color color4 = Color.Cyan;
+            Rgba32 color4 = Rgba32.Cyan;
             Cmyk cmyk4 = color4;
             Assert.Equal(1, cmyk4.C, 1);
             Assert.Equal(0f, cmyk4.M, 1);
@@ -371,14 +372,14 @@ namespace ImageSharp.Tests
         }
 
         /// <summary>
-        /// Tests the implicit conversion from <see cref="Cmyk"/> to <see cref="Color"/>.
+        /// Tests the implicit conversion from <see cref="Cmyk"/> to <see cref="Rgba32"/>.
         /// </summary>
         [Fact]
         public void CmykToColor()
         {
             // Dark moderate pink.
             Cmyk cmyk = new Cmyk(0f, .5f, .171f, .498f);
-            Color color = cmyk;
+            Rgba32 color = cmyk;
 
             Assert.Equal(color.R, 128);
             Assert.Equal(color.G, 64);
@@ -386,7 +387,7 @@ namespace ImageSharp.Tests
 
             // Ochre
             Cmyk cmyk2 = new Cmyk(0, .416f, .833f, .199f);
-            Color color2 = cmyk2;
+            Rgba32 color2 = cmyk2;
 
             Assert.Equal(color2.R, 204);
             Assert.Equal(color2.G, 119);
@@ -394,7 +395,7 @@ namespace ImageSharp.Tests
 
             // White
             Cmyk cmyk3 = new Cmyk(0, 0, 0, 0);
-            Color color3 = cmyk3;
+            Rgba32 color3 = cmyk3;
 
             Assert.Equal(color3.R, 255);
             Assert.Equal(color3.G, 255);
@@ -411,7 +412,7 @@ namespace ImageSharp.Tests
         }
 
         /// <summary>
-        /// Tests the implicit conversion from <see cref="Color"/> to <see cref="CieLab"/>.
+        /// Tests the implicit conversion from <see cref="Rgba32"/> to <see cref="CieLab"/>.
         /// Comparison values obtained from
         /// http://colormine.org/convert/rgb-to-lab
         /// </summary>
@@ -419,7 +420,7 @@ namespace ImageSharp.Tests
         public void ColorToCieLab()
         {
             // White
-            Color color = Color.White;
+            Rgba32 color = Rgba32.White;
             CieLab cielab = color;
 
             Assert.Equal(100, cielab.L, 3);
@@ -427,21 +428,21 @@ namespace ImageSharp.Tests
             Assert.Equal(-0.010, cielab.B, 3);
 
             // Black
-            Color color2 = Color.Black;
+            Rgba32 color2 = Rgba32.Black;
             CieLab cielab2 = color2;
             Assert.Equal(0, cielab2.L, 3);
             Assert.Equal(0, cielab2.A, 3);
             Assert.Equal(0, cielab2.B, 3);
 
             // Gray
-            Color color3 = Color.Gray;
+            Rgba32 color3 = Rgba32.Gray;
             CieLab cielab3 = color3;
             Assert.Equal(53.585, cielab3.L, 3);
             Assert.Equal(0.003, cielab3.A, 3);
             Assert.Equal(-0.006, cielab3.B, 3);
 
             // Cyan
-            Color color4 = Color.Cyan;
+            Rgba32 color4 = Rgba32.Cyan;
             CieLab cielab4 = color4;
             Assert.Equal(91.117, cielab4.L, 3);
             Assert.Equal(-48.080, cielab4.A, 3);
@@ -449,7 +450,7 @@ namespace ImageSharp.Tests
         }
 
         /// <summary>
-        /// Tests the implicit conversion from <see cref="CieLab"/> to <see cref="Color"/>.
+        /// Tests the implicit conversion from <see cref="CieLab"/> to <see cref="Rgba32"/>.
         /// </summary>
         /// Comparison values obtained from
         /// http://colormine.org/convert/rgb-to-lab
@@ -458,7 +459,7 @@ namespace ImageSharp.Tests
         {
             // Dark moderate pink.
             CieLab cielab = new CieLab(36.5492f, 33.3173f, -12.0615f);
-            Color color = cielab;
+            Rgba32 color = cielab;
 
             Assert.Equal(color.R, 128);
             Assert.Equal(color.G, 64);
@@ -466,7 +467,7 @@ namespace ImageSharp.Tests
 
             // Ochre
             CieLab cielab2 = new CieLab(58.1758f, 27.3399f, 56.8240f);
-            Color color2 = cielab2;
+            Rgba32 color2 = cielab2;
 
             Assert.Equal(color2.R, 204);
             Assert.Equal(color2.G, 119);
@@ -474,7 +475,7 @@ namespace ImageSharp.Tests
 
             // Black
             CieLab cielab3 = new CieLab(0, 0, 0);
-            Color color3 = cielab3;
+            Rgba32 color3 = cielab3;
 
             Assert.Equal(color3.R, 0);
             Assert.Equal(color3.G, 0);
diff --git a/tests/ImageSharp.Tests/Colors/ColorDefinitionTests.cs b/tests/ImageSharp.Tests/Colors/ColorDefinitionTests.cs
index 899ce4f77a..f2113852f3 100644
--- a/tests/ImageSharp.Tests/Colors/ColorDefinitionTests.cs
+++ b/tests/ImageSharp.Tests/Colors/ColorDefinitionTests.cs
@@ -12,17 +12,19 @@ namespace ImageSharp.Tests
     using System.Reflection;
 
     using ImageSharp.Colors.Spaces;
+    using ImageSharp.PixelFormats;
+
     using Xunit;
     public class ColorDefinitionTests
     {
-        public static IEnumerable<string[]> ColorNames => typeof(NamedColors<Color>).GetTypeInfo().GetFields().Select(x => new[] { x.Name });
+        public static IEnumerable<string[]> ColorNames => typeof(NamedColors<Rgba32>).GetTypeInfo().GetFields().Select(x => new[] { x.Name });
 
         [Theory]
         [MemberData(nameof(ColorNames))]
         public void AllColorsAreOnGenericAndBaseColor(string name)
         {
-            FieldInfo generic = typeof(NamedColors<Color>).GetTypeInfo().GetField(name);
-            FieldInfo specific = typeof(Color).GetTypeInfo().GetField(name);
+            FieldInfo generic = typeof(NamedColors<Rgba32>).GetTypeInfo().GetField(name);
+            FieldInfo specific = typeof(Rgba32).GetTypeInfo().GetField(name);
 
             Assert.NotNull(specific);
             Assert.NotNull(generic);
@@ -30,8 +32,8 @@ namespace ImageSharp.Tests
             Assert.True(specific.Attributes.HasFlag(FieldAttributes.Static), "specific must be static");
             Assert.True(generic.Attributes.HasFlag(FieldAttributes.Public), "generic must be public");
             Assert.True(generic.Attributes.HasFlag(FieldAttributes.Static), "generic must be static");
-            Color expected = (Color)generic.GetValue(null);
-            Color actual = (Color)specific.GetValue(null);
+            Rgba32 expected = (Rgba32)generic.GetValue(null);
+            Rgba32 actual = (Rgba32)specific.GetValue(null);
             Assert.Equal(expected, actual);
         }
     }
diff --git a/tests/ImageSharp.Tests/Colors/ColorEqualityTests.cs b/tests/ImageSharp.Tests/Colors/ColorEqualityTests.cs
index ffb04e8b24..efec4ea38c 100644
--- a/tests/ImageSharp.Tests/Colors/ColorEqualityTests.cs
+++ b/tests/ImageSharp.Tests/Colors/ColorEqualityTests.cs
@@ -8,6 +8,8 @@ namespace ImageSharp.Tests.Colors
     using System;
     using System.Numerics;
     using ImageSharp.Colors.Spaces;
+    using ImageSharp.PixelFormats;
+
     using Xunit;
 
     /// <summary>
@@ -33,7 +35,7 @@ namespace ImageSharp.Tests.Colors
                { new NormalizedShort4(Vector4.One), new NormalizedShort4(Vector4.One), typeof(NormalizedShort4) },
                { new Rg32(Vector2.One), new Rg32(Vector2.One), typeof(Rg32) },
                { new Rgba1010102(Vector4.One), new Rgba1010102(Vector4.One), typeof(Rgba1010102) },
-               { new Color(Vector4.One), new Color(Vector4.One), typeof(Color) },
+               { new Rgba32(Vector4.One), new Rgba32(Vector4.One), typeof(Rgba32) },
                { new Rgba64(Vector4.One), new Rgba64(Vector4.One), typeof(Rgba64) },
                { new Short2(Vector2.One * 0x7FFF), new Short2(Vector2.One * 0x7FFF), typeof(Short2) },
                { new Short4(Vector4.One * 0x7FFF), new Short4(Vector4.One * 0x7FFF), typeof(Short4) },
@@ -145,7 +147,7 @@ namespace ImageSharp.Tests.Colors
                 { new NormalizedShort4(Vector4.One), new NormalizedShort4(Vector4.Zero), typeof(NormalizedShort4) },
                 { new Rg32(Vector2.One), new Rg32(Vector2.Zero), typeof(Rg32) },
                 { new Rgba1010102(Vector4.One), new Rgba1010102(Vector4.Zero), typeof(Rgba1010102) },
-                { new Color(Vector4.One), new Color(Vector4.Zero), typeof(Color) },
+                { new Rgba32(Vector4.One), new Rgba32(Vector4.Zero), typeof(Rgba32) },
                 { new Rgba64(Vector4.One), new Rgba64(Vector4.Zero), typeof(Rgba64) },
                 { new Short2(Vector2.One * 0x7FFF), new Short2(Vector2.Zero), typeof(Short2) },
                 { new Short4(Vector4.One * 0x7FFF), new Short4(Vector4.Zero), typeof(Short4) },
diff --git a/tests/ImageSharp.Tests/Colors/ColorPackingTests.cs b/tests/ImageSharp.Tests/Colors/ColorPackingTests.cs
index 5fbb42b2a3..563b6be3c4 100644
--- a/tests/ImageSharp.Tests/Colors/ColorPackingTests.cs
+++ b/tests/ImageSharp.Tests/Colors/ColorPackingTests.cs
@@ -7,6 +7,9 @@ namespace ImageSharp.Tests.Colors
 {
     using System.Collections.Generic;
     using System.Numerics;
+
+    using ImageSharp.PixelFormats;
+
     using Xunit;
 
     public class ColorPackingTests
diff --git a/tests/ImageSharp.Tests/Colors/ColorTests.cs b/tests/ImageSharp.Tests/Colors/ColorTests.cs
index e2c62b5079..da63025c43 100644
--- a/tests/ImageSharp.Tests/Colors/ColorTests.cs
+++ b/tests/ImageSharp.Tests/Colors/ColorTests.cs
@@ -8,10 +8,12 @@ namespace ImageSharp.Tests
     using System;
     using System.Numerics;
 
+    using ImageSharp.PixelFormats;
+
     using Xunit;
 
     /// <summary>
-    /// Tests the <see cref="Color"/> struct.
+    /// Tests the <see cref="Rgba32"/> struct.
     /// </summary>
     public class ColorTests
     {
@@ -21,12 +23,12 @@ namespace ImageSharp.Tests
         [Fact]
         public void AreEqual()
         {
-            Color color1 = new Color(0, 0, 0);
-            Color color2 = new Color(0, 0, 0, 1F);
-            Color color3 = Color.FromHex("#000");
-            Color color4 = Color.FromHex("#000F");
-            Color color5 = Color.FromHex("#000000");
-            Color color6 = Color.FromHex("#000000FF");
+            Rgba32 color1 = new Rgba32(0, 0, 0);
+            Rgba32 color2 = new Rgba32(0, 0, 0, 1F);
+            Rgba32 color3 = Rgba32.FromHex("#000");
+            Rgba32 color4 = Rgba32.FromHex("#000F");
+            Rgba32 color5 = Rgba32.FromHex("#000000");
+            Rgba32 color6 = Rgba32.FromHex("#000000FF");
 
             Assert.Equal(color1, color2);
             Assert.Equal(color1, color3);
@@ -41,11 +43,11 @@ namespace ImageSharp.Tests
         [Fact]
         public void AreNotEqual()
         {
-            Color color1 = new Color(255, 0, 0, 255);
-            Color color2 = new Color(0, 0, 0, 255);
-            Color color3 = Color.FromHex("#000");
-            Color color4 = Color.FromHex("#000000");
-            Color color5 = Color.FromHex("#FF000000");
+            Rgba32 color1 = new Rgba32(255, 0, 0, 255);
+            Rgba32 color2 = new Rgba32(0, 0, 0, 255);
+            Rgba32 color3 = Rgba32.FromHex("#000");
+            Rgba32 color4 = Rgba32.FromHex("#000000");
+            Rgba32 color5 = Rgba32.FromHex("#FF000000");
 
             Assert.NotEqual(color1, color2);
             Assert.NotEqual(color1, color3);
@@ -59,25 +61,25 @@ namespace ImageSharp.Tests
         [Fact]
         public void ConstructorAssignsProperties()
         {
-            Color color1 = new Color(1, .1f, .133f, .864f);
+            Rgba32 color1 = new Rgba32(1, .1f, .133f, .864f);
             Assert.Equal(255, color1.R);
             Assert.Equal((byte)Math.Round(.1f * 255), color1.G);
             Assert.Equal((byte)Math.Round(.133f * 255), color1.B);
             Assert.Equal((byte)Math.Round(.864f * 255), color1.A);
 
-            Color color2 = new Color(1, .1f, .133f);
+            Rgba32 color2 = new Rgba32(1, .1f, .133f);
             Assert.Equal(255, color2.R);
             Assert.Equal(Math.Round(.1f * 255), color2.G);
             Assert.Equal(Math.Round(.133f * 255), color2.B);
             Assert.Equal(255, color2.A);
 
-            Color color4 = new Color(new Vector3(1, .1f, .133f));
+            Rgba32 color4 = new Rgba32(new Vector3(1, .1f, .133f));
             Assert.Equal(255, color4.R);
             Assert.Equal(Math.Round(.1f * 255), color4.G);
             Assert.Equal(Math.Round(.133f * 255), color4.B);
             Assert.Equal(255, color4.A);
 
-            Color color5 = new Color(new Vector4(1, .1f, .133f, .5f));
+            Rgba32 color5 = new Rgba32(new Vector4(1, .1f, .133f, .5f));
             Assert.Equal(255, color5.R);
             Assert.Equal(Math.Round(.1f * 255), color5.G);
             Assert.Equal(Math.Round(.133f * 255), color5.B);
@@ -90,7 +92,7 @@ namespace ImageSharp.Tests
         [Fact]
         public void FromAndToHex()
         {
-            Color color = Color.FromHex("#AABBCCDD");
+            Rgba32 color = Rgba32.FromHex("#AABBCCDD");
             Assert.Equal(170, color.R);
             Assert.Equal(187, color.G);
             Assert.Equal(204, color.B);
@@ -118,14 +120,14 @@ namespace ImageSharp.Tests
         [Fact]
         public unsafe void ByteLayout()
         {
-            Color color = new Color(1, 2, 3, 4);
+            Rgba32 color = new Rgba32(1, 2, 3, 4);
             byte* colorBase = (byte*)&color;
             Assert.Equal(1, colorBase[0]);
             Assert.Equal(2, colorBase[1]);
             Assert.Equal(3, colorBase[2]);
             Assert.Equal(4, colorBase[3]);
 
-            Assert.Equal(4, sizeof(Color));
+            Assert.Equal(4, sizeof(Rgba32));
         }
     }
 }
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests/Colors/ColorTransformTests.cs b/tests/ImageSharp.Tests/Colors/ColorTransformTests.cs
index 064bdf2d02..8d5e973b13 100644
--- a/tests/ImageSharp.Tests/Colors/ColorTransformTests.cs
+++ b/tests/ImageSharp.Tests/Colors/ColorTransformTests.cs
@@ -5,6 +5,8 @@
 
 namespace ImageSharp.Tests.Colors
 {
+    using ImageSharp.PixelFormats;
+
     using Xunit;
 
     /// <summary>
@@ -16,101 +18,101 @@ namespace ImageSharp.Tests.Colors
         /// <summary>
         /// Orange backdrop
         /// </summary>
-        private static readonly Color Backdrop = new Color(204, 102, 0);
+        private static readonly Rgba32 Backdrop = new Rgba32(204, 102, 0);
 
         /// <summary>
         /// Blue source
         /// </summary>
-        private static readonly Color Source = new Color(0, 102, 153);
+        private static readonly Rgba32 Source = new Rgba32(0, 102, 153);
 
         [Fact]
         public void Normal()
         {
-            Color normal = Color.Normal(Backdrop, Source);
+            Rgba32 normal = Rgba32.Normal(Backdrop, Source);
             Assert.True(normal == Source);
         }
 
         [Fact]
         public void Multiply()
         {
-            Assert.True(Color.Multiply(Backdrop, Color.Black) == Color.Black);
-            Assert.True(Color.Multiply(Backdrop, Color.White) == Backdrop);
+            Assert.True(Rgba32.Multiply(Backdrop, Rgba32.Black) == Rgba32.Black);
+            Assert.True(Rgba32.Multiply(Backdrop, Rgba32.White) == Backdrop);
 
-            Color multiply = Color.Multiply(Backdrop, Source);
-            Assert.True(multiply == new Color(0, 41, 0));
+            Rgba32 multiply = Rgba32.Multiply(Backdrop, Source);
+            Assert.True(multiply == new Rgba32(0, 41, 0));
         }
 
         [Fact]
         public void Screen()
         {
-            Assert.True(Color.Screen(Backdrop, Color.Black) == Backdrop);
-            Assert.True(Color.Screen(Backdrop, Color.White) == Color.White);
+            Assert.True(Rgba32.Screen(Backdrop, Rgba32.Black) == Backdrop);
+            Assert.True(Rgba32.Screen(Backdrop, Rgba32.White) == Rgba32.White);
 
-            Color screen = Color.Screen(Backdrop, Source);
-            Assert.True(screen == new Color(204, 163, 153));
+            Rgba32 screen = Rgba32.Screen(Backdrop, Source);
+            Assert.True(screen == new Rgba32(204, 163, 153));
         }
 
         [Fact]
         public void HardLight()
         {
-            Color hardLight = Color.HardLight(Backdrop, Source);
-            Assert.True(hardLight == new Color(0, 82, 51));
+            Rgba32 hardLight = Rgba32.HardLight(Backdrop, Source);
+            Assert.True(hardLight == new Rgba32(0, 82, 51));
         }
 
         [Fact]
         public void Overlay()
         {
-            Color overlay = Color.Overlay(Backdrop, Source);
-            Assert.True(overlay == new Color(153, 82, 0));
+            Rgba32 overlay = Rgba32.Overlay(Backdrop, Source);
+            Assert.True(overlay == new Rgba32(153, 82, 0));
         }
 
         [Fact]
         public void Darken()
         {
-            Color darken = Color.Darken(Backdrop, Source);
-            Assert.True(darken == new Color(0, 102, 0));
+            Rgba32 darken = Rgba32.Darken(Backdrop, Source);
+            Assert.True(darken == new Rgba32(0, 102, 0));
         }
 
         [Fact]
         public void Lighten()
         {
-            Color lighten = Color.Lighten(Backdrop, Source);
-            Assert.True(lighten == new Color(204, 102, 153));
+            Rgba32 lighten = Rgba32.Lighten(Backdrop, Source);
+            Assert.True(lighten == new Rgba32(204, 102, 153));
         }
 
         [Fact]
         public void SoftLight()
         {
-            Color softLight = Color.SoftLight(Backdrop, Source);
-            Assert.True(softLight == new Color(163, 90, 0));
+            Rgba32 softLight = Rgba32.SoftLight(Backdrop, Source);
+            Assert.True(softLight == new Rgba32(163, 90, 0));
         }
 
         [Fact]
         public void ColorDodge()
         {
-            Color colorDodge = Color.ColorDodge(Backdrop, Source);
-            Assert.True(colorDodge == new Color(204, 170, 0));
+            Rgba32 colorDodge = Rgba32.ColorDodge(Backdrop, Source);
+            Assert.True(colorDodge == new Rgba32(204, 170, 0));
         }
 
         [Fact]
         public void ColorBurn()
         {
-            Color colorBurn = Color.ColorBurn(Backdrop, Source);
-            Assert.True(colorBurn == new Color(0, 0, 0));
+            Rgba32 colorBurn = Rgba32.ColorBurn(Backdrop, Source);
+            Assert.True(colorBurn == new Rgba32(0, 0, 0));
         }
 
         [Fact]
         public void Difference()
         {
-            Color difference = Color.Difference(Backdrop, Source);
-            Assert.True(difference == new Color(204, 0, 153));
+            Rgba32 difference = Rgba32.Difference(Backdrop, Source);
+            Assert.True(difference == new Rgba32(204, 0, 153));
         }
 
         [Fact]
         public void Exclusion()
         {
-            Color exclusion = Color.Exclusion(Backdrop, Source);
-            Assert.True(exclusion == new Color(204, 122, 153));
+            Rgba32 exclusion = Rgba32.Exclusion(Backdrop, Source);
+            Assert.True(exclusion == new Rgba32(204, 122, 153));
         }
     }
 }
diff --git a/tests/ImageSharp.Tests/Colors/ColorVectorTests.cs b/tests/ImageSharp.Tests/Colors/ColorVectorTests.cs
index 4300b1b387..492817015a 100644
--- a/tests/ImageSharp.Tests/Colors/ColorVectorTests.cs
+++ b/tests/ImageSharp.Tests/Colors/ColorVectorTests.cs
@@ -8,10 +8,12 @@ namespace ImageSharp.Tests
     using System.Numerics;
     using System.Runtime.CompilerServices;
 
+    using ImageSharp.PixelFormats;
+
     using Xunit;
 
     /// <summary>
-    /// Tests the <see cref="ColorVector"/> struct.
+    /// Tests the <see cref="RgbaVector"/> struct.
     /// </summary>
     public class ColorVectorTests
     {
@@ -21,12 +23,12 @@ namespace ImageSharp.Tests
         [Fact]
         public void AreEqual()
         {
-            ColorVector color1 = new ColorVector(0, 0, 0F);
-            ColorVector color2 = new ColorVector(0, 0, 0, 1F);
-            ColorVector color3 = ColorVector.FromHex("#000");
-            ColorVector color4 = ColorVector.FromHex("#000F");
-            ColorVector color5 = ColorVector.FromHex("#000000");
-            ColorVector color6 = ColorVector.FromHex("#000000FF");
+            RgbaVector color1 = new RgbaVector(0, 0, 0F);
+            RgbaVector color2 = new RgbaVector(0, 0, 0, 1F);
+            RgbaVector color3 = RgbaVector.FromHex("#000");
+            RgbaVector color4 = RgbaVector.FromHex("#000F");
+            RgbaVector color5 = RgbaVector.FromHex("#000000");
+            RgbaVector color6 = RgbaVector.FromHex("#000000FF");
 
             Assert.Equal(color1, color2);
             Assert.Equal(color1, color3);
@@ -41,11 +43,11 @@ namespace ImageSharp.Tests
         [Fact]
         public void AreNotEqual()
         {
-            ColorVector color1 = new ColorVector(1, 0, 0, 1);
-            ColorVector color2 = new ColorVector(0, 0, 0, 1);
-            ColorVector color3 = ColorVector.FromHex("#000");
-            ColorVector color4 = ColorVector.FromHex("#000000");
-            ColorVector color5 = ColorVector.FromHex("#FF000000");
+            RgbaVector color1 = new RgbaVector(1, 0, 0, 1);
+            RgbaVector color2 = new RgbaVector(0, 0, 0, 1);
+            RgbaVector color3 = RgbaVector.FromHex("#000");
+            RgbaVector color4 = RgbaVector.FromHex("#000000");
+            RgbaVector color5 = RgbaVector.FromHex("#FF000000");
 
             Assert.NotEqual(color1, color2);
             Assert.NotEqual(color1, color3);
@@ -59,25 +61,25 @@ namespace ImageSharp.Tests
         [Fact]
         public void ConstructorAssignsProperties()
         {
-            ColorVector color1 = new ColorVector(1, .1F, .133F, .864F);
+            RgbaVector color1 = new RgbaVector(1, .1F, .133F, .864F);
             Assert.Equal(1F, color1.R);
             Assert.Equal(.1F, color1.G);
             Assert.Equal(.133F, color1.B);
             Assert.Equal(.864F, color1.A);
 
-            ColorVector color2 = new ColorVector(1, .1f, .133f);
+            RgbaVector color2 = new RgbaVector(1, .1f, .133f);
             Assert.Equal(1F, color2.R);
             Assert.Equal(.1F, color2.G);
             Assert.Equal(.133F, color2.B);
             Assert.Equal(1F, color2.A);
 
-            ColorVector color4 = new ColorVector(new Vector3(1, .1f, .133f));
+            RgbaVector color4 = new RgbaVector(new Vector3(1, .1f, .133f));
             Assert.Equal(1F, color4.R);
             Assert.Equal(.1F, color4.G);
             Assert.Equal(.133F, color4.B);
             Assert.Equal(1F, color4.A);
 
-            ColorVector color5 = new ColorVector(new Vector4(1, .1f, .133f, .5f));
+            RgbaVector color5 = new RgbaVector(new Vector4(1, .1f, .133f, .5f));
             Assert.Equal(1F, color5.R);
             Assert.Equal(.1F, color5.G);
             Assert.Equal(.133F, color5.B);
@@ -90,7 +92,7 @@ namespace ImageSharp.Tests
         [Fact]
         public void FromAndToHex()
         {
-            ColorVector color = ColorVector.FromHex("#AABBCCDD");
+            RgbaVector color = RgbaVector.FromHex("#AABBCCDD");
             Assert.Equal(170 / 255F, color.R);
             Assert.Equal(187 / 255F, color.G);
             Assert.Equal(204 / 255F, color.B);
@@ -118,8 +120,8 @@ namespace ImageSharp.Tests
         [Fact]
         public void FloatLayout()
         {
-            ColorVector color = new ColorVector(1F, 2, 3, 4);
-            Vector4 colorBase = Unsafe.As<ColorVector, Vector4>(ref Unsafe.Add(ref color, 0));
+            RgbaVector color = new RgbaVector(1F, 2, 3, 4);
+            Vector4 colorBase = Unsafe.As<RgbaVector, Vector4>(ref Unsafe.Add(ref color, 0));
             float[] ordered = new float[4];
             colorBase.CopyTo(ordered);
 
diff --git a/tests/ImageSharp.Tests/Colors/ColorVectorTransformTests.cs b/tests/ImageSharp.Tests/Colors/ColorVectorTransformTests.cs
index c2e27d2317..e670944f56 100644
--- a/tests/ImageSharp.Tests/Colors/ColorVectorTransformTests.cs
+++ b/tests/ImageSharp.Tests/Colors/ColorVectorTransformTests.cs
@@ -5,6 +5,7 @@
 
 namespace ImageSharp.Tests.Colors
 {
+    using ImageSharp.PixelFormats;
     using Xunit;
 
     /// <summary>
@@ -18,101 +19,101 @@ namespace ImageSharp.Tests.Colors
         /// <summary>
         /// Orange backdrop
         /// </summary>
-        private static readonly ColorVector Backdrop = new ColorVector(204, 102, 0);
+        private static readonly RgbaVector Backdrop = new RgbaVector(204, 102, 0);
 
         /// <summary>
         /// Blue source
         /// </summary>
-        private static readonly ColorVector Source = new ColorVector(0, 102, 153);
+        private static readonly RgbaVector Source = new RgbaVector(0, 102, 153);
 
         [Fact]
         public void Normal()
         {
-            ColorVector normal = ColorVector.Normal(Backdrop, Source);
+            RgbaVector normal = RgbaVector.Normal(Backdrop, Source);
             Assert.True(normal == Source);
         }
 
         [Fact]
         public void Multiply()
         {
-            Assert.Equal(ColorVector.Multiply(Backdrop, ColorVector.Black).ToVector4(), Color.Black.ToVector4(), FloatComparer);
-            Assert.Equal(ColorVector.Multiply(Backdrop, ColorVector.White).ToVector4(), Backdrop.ToVector4(), FloatComparer);
+            Assert.Equal(RgbaVector.Multiply(Backdrop, RgbaVector.Black).ToVector4(), Rgba32.Black.ToVector4(), FloatComparer);
+            Assert.Equal(RgbaVector.Multiply(Backdrop, RgbaVector.White).ToVector4(), Backdrop.ToVector4(), FloatComparer);
 
-            ColorVector multiply = ColorVector.Multiply(Backdrop, Source);
-            Assert.Equal(multiply.ToVector4(), new ColorVector(0, 41, 0).ToVector4(), FloatComparer);
+            RgbaVector multiply = RgbaVector.Multiply(Backdrop, Source);
+            Assert.Equal(multiply.ToVector4(), new RgbaVector(0, 41, 0).ToVector4(), FloatComparer);
         }
 
         [Fact]
         public void Screen()
         {
-            Assert.Equal(ColorVector.Screen(Backdrop, ColorVector.Black).ToVector4(), Backdrop.ToVector4(), FloatComparer);
-            Assert.Equal(ColorVector.Screen(Backdrop, ColorVector.White).ToVector4(), ColorVector.White.ToVector4(), FloatComparer);
+            Assert.Equal(RgbaVector.Screen(Backdrop, RgbaVector.Black).ToVector4(), Backdrop.ToVector4(), FloatComparer);
+            Assert.Equal(RgbaVector.Screen(Backdrop, RgbaVector.White).ToVector4(), RgbaVector.White.ToVector4(), FloatComparer);
 
-            ColorVector screen = ColorVector.Screen(Backdrop, Source);
-            Assert.Equal(screen.ToVector4(), new ColorVector(204, 163, 153).ToVector4(), FloatComparer);
+            RgbaVector screen = RgbaVector.Screen(Backdrop, Source);
+            Assert.Equal(screen.ToVector4(), new RgbaVector(204, 163, 153).ToVector4(), FloatComparer);
         }
 
         [Fact]
         public void HardLight()
         {
-            ColorVector hardLight = ColorVector.HardLight(Backdrop, Source);
-            Assert.Equal(hardLight.ToVector4(), new ColorVector(0, 82, 51).ToVector4(), FloatComparer);
+            RgbaVector hardLight = RgbaVector.HardLight(Backdrop, Source);
+            Assert.Equal(hardLight.ToVector4(), new RgbaVector(0, 82, 51).ToVector4(), FloatComparer);
         }
 
         [Fact]
         public void Overlay()
         {
-            ColorVector overlay = ColorVector.Overlay(Backdrop, Source);
-            Assert.Equal(overlay.ToVector4(), new ColorVector(153, 82, 0).ToVector4(), FloatComparer);
+            RgbaVector overlay = RgbaVector.Overlay(Backdrop, Source);
+            Assert.Equal(overlay.ToVector4(), new RgbaVector(153, 82, 0).ToVector4(), FloatComparer);
         }
 
         [Fact]
         public void Darken()
         {
-            ColorVector darken = ColorVector.Darken(Backdrop, Source);
-            Assert.Equal(darken.ToVector4(), new ColorVector(0, 102, 0).ToVector4(), FloatComparer);
+            RgbaVector darken = RgbaVector.Darken(Backdrop, Source);
+            Assert.Equal(darken.ToVector4(), new RgbaVector(0, 102, 0).ToVector4(), FloatComparer);
         }
 
         [Fact]
         public void Lighten()
         {
-            ColorVector lighten = ColorVector.Lighten(Backdrop, Source);
-            Assert.Equal(lighten.ToVector4(), new ColorVector(204, 102, 153).ToVector4(), FloatComparer);
+            RgbaVector lighten = RgbaVector.Lighten(Backdrop, Source);
+            Assert.Equal(lighten.ToVector4(), new RgbaVector(204, 102, 153).ToVector4(), FloatComparer);
         }
 
         [Fact]
         public void SoftLight()
         {
-            ColorVector softLight = ColorVector.SoftLight(Backdrop, Source);
-            Assert.Equal(softLight.ToVector4(), new ColorVector(163, 90, 0).ToVector4(), FloatComparer);
+            RgbaVector softLight = RgbaVector.SoftLight(Backdrop, Source);
+            Assert.Equal(softLight.ToVector4(), new RgbaVector(163, 90, 0).ToVector4(), FloatComparer);
         }
 
         [Fact]
         public void ColorDodge()
         {
-            ColorVector colorDodge = ColorVector.ColorDodge(Backdrop, Source);
-            Assert.Equal(colorDodge.ToVector4(), new ColorVector(204, 170, 0).ToVector4(), FloatComparer);
+            RgbaVector colorDodge = RgbaVector.ColorDodge(Backdrop, Source);
+            Assert.Equal(colorDodge.ToVector4(), new RgbaVector(204, 170, 0).ToVector4(), FloatComparer);
         }
 
         [Fact]
         public void ColorBurn()
         {
-            ColorVector colorBurn = ColorVector.ColorBurn(Backdrop, Source);
-            Assert.Equal(colorBurn.ToVector4(), new ColorVector(0, 0, 0).ToVector4(), FloatComparer);
+            RgbaVector colorBurn = RgbaVector.ColorBurn(Backdrop, Source);
+            Assert.Equal(colorBurn.ToVector4(), new RgbaVector(0, 0, 0).ToVector4(), FloatComparer);
         }
 
         [Fact]
         public void Difference()
         {
-            ColorVector difference = ColorVector.Difference(Backdrop, Source);
-            Assert.Equal(difference.ToVector4(), new ColorVector(204, 0, 153).ToVector4(), FloatComparer);
+            RgbaVector difference = RgbaVector.Difference(Backdrop, Source);
+            Assert.Equal(difference.ToVector4(), new RgbaVector(204, 0, 153).ToVector4(), FloatComparer);
         }
 
         [Fact]
         public void Exclusion()
         {
-            ColorVector exclusion = ColorVector.Exclusion(Backdrop, Source);
-            Assert.Equal(exclusion.ToVector4(), new ColorVector(204, 122, 153).ToVector4(), FloatComparer);
+            RgbaVector exclusion = RgbaVector.Exclusion(Backdrop, Source);
+            Assert.Equal(exclusion.ToVector4(), new RgbaVector(204, 122, 153).ToVector4(), FloatComparer);
         }
     }
 }
diff --git a/tests/ImageSharp.Tests/Colors/PackedPixelTests.cs b/tests/ImageSharp.Tests/Colors/PackedPixelTests.cs
index 52ca86cae6..5ec7c21bbf 100644
--- a/tests/ImageSharp.Tests/Colors/PackedPixelTests.cs
+++ b/tests/ImageSharp.Tests/Colors/PackedPixelTests.cs
@@ -9,6 +9,8 @@ namespace ImageSharp.Tests.Colors
     using System.Diagnostics;
     using System.Numerics;
 
+    using ImageSharp.PixelFormats;
+
     using Xunit;
 
     /// <summary>
@@ -715,26 +717,26 @@ namespace ImageSharp.Tests.Colors
         public void Color()
         {
             // Test the limits.
-            Assert.Equal((uint)0x0, new Color(Vector4.Zero).PackedValue);
-            Assert.Equal(0xFFFFFFFF, new Color(Vector4.One).PackedValue);
+            Assert.Equal((uint)0x0, new Rgba32(Vector4.Zero).PackedValue);
+            Assert.Equal(0xFFFFFFFF, new Rgba32(Vector4.One).PackedValue);
 
             // Test ToVector4.
-            Assert.True(Equal(Vector4.One, new Color(Vector4.One).ToVector4()));
-            Assert.True(Equal(Vector4.Zero, new Color(Vector4.Zero).ToVector4()));
-            Assert.True(Equal(Vector4.UnitX, new Color(Vector4.UnitX).ToVector4()));
-            Assert.True(Equal(Vector4.UnitY, new Color(Vector4.UnitY).ToVector4()));
-            Assert.True(Equal(Vector4.UnitZ, new Color(Vector4.UnitZ).ToVector4()));
-            Assert.True(Equal(Vector4.UnitW, new Color(Vector4.UnitW).ToVector4()));
+            Assert.True(Equal(Vector4.One, new Rgba32(Vector4.One).ToVector4()));
+            Assert.True(Equal(Vector4.Zero, new Rgba32(Vector4.Zero).ToVector4()));
+            Assert.True(Equal(Vector4.UnitX, new Rgba32(Vector4.UnitX).ToVector4()));
+            Assert.True(Equal(Vector4.UnitY, new Rgba32(Vector4.UnitY).ToVector4()));
+            Assert.True(Equal(Vector4.UnitZ, new Rgba32(Vector4.UnitZ).ToVector4()));
+            Assert.True(Equal(Vector4.UnitW, new Rgba32(Vector4.UnitW).ToVector4()));
 
             // Test clamping.
-            Assert.True(Equal(Vector4.Zero, new Color(Vector4.One * -1234.0f).ToVector4()));
-            Assert.True(Equal(Vector4.One, new Color(Vector4.One * +1234.0f).ToVector4()));
+            Assert.True(Equal(Vector4.Zero, new Rgba32(Vector4.One * -1234.0f).ToVector4()));
+            Assert.True(Equal(Vector4.One, new Rgba32(Vector4.One * +1234.0f).ToVector4()));
 
             float x = +0.1f;
             float y = -0.3f;
             float z = +0.5f;
             float w = -0.7f;
-            Color rgba32 = new Color(x, y, z, w);
+            Rgba32 rgba32 = new Rgba32(x, y, z, w);
             Assert.Equal(0x80001Au, rgba32.PackedValue);
 
             // Test ordering
diff --git a/tests/ImageSharp.Tests/Colors/UnPackedPixelTests.cs b/tests/ImageSharp.Tests/Colors/UnPackedPixelTests.cs
index 4fb189ca81..25a61453b2 100644
--- a/tests/ImageSharp.Tests/Colors/UnPackedPixelTests.cs
+++ b/tests/ImageSharp.Tests/Colors/UnPackedPixelTests.cs
@@ -2,6 +2,8 @@
 {
     using System.Numerics;
 
+    using ImageSharp.PixelFormats;
+
     using Xunit;
 
     public class UnPackedPixelTests
@@ -9,8 +11,8 @@
         [Fact]
         public void Color_Types_From_Bytes_Produce_Equal_Scaled_Component_OutPut()
         {
-            Color color = new Color(24, 48, 96, 192);
-            ColorVector colorVector = new ColorVector(24, 48, 96, 192);
+            Rgba32 color = new Rgba32(24, 48, 96, 192);
+            RgbaVector colorVector = new RgbaVector(24, 48, 96, 192);
 
             Assert.Equal(color.R, (byte)(colorVector.R * 255));
             Assert.Equal(color.G, (byte)(colorVector.G * 255));
@@ -21,8 +23,8 @@
         [Fact]
         public void Color_Types_From_Floats_Produce_Equal_Scaled_Component_OutPut()
         {
-            Color color = new Color(24 / 255F, 48 / 255F, 96 / 255F, 192 / 255F);
-            ColorVector colorVector = new ColorVector(24 / 255F, 48 / 255F, 96 / 255F, 192 / 255F);
+            Rgba32 color = new Rgba32(24 / 255F, 48 / 255F, 96 / 255F, 192 / 255F);
+            RgbaVector colorVector = new RgbaVector(24 / 255F, 48 / 255F, 96 / 255F, 192 / 255F);
 
             Assert.Equal(color.R, (byte)(colorVector.R * 255));
             Assert.Equal(color.G, (byte)(colorVector.G * 255));
@@ -33,8 +35,8 @@
         [Fact]
         public void Color_Types_From_Vector4_Produce_Equal_Scaled_Component_OutPut()
         {
-            Color color = new Color(new Vector4(24 / 255F, 48 / 255F, 96 / 255F, 192 / 255F));
-            ColorVector colorVector = new ColorVector(new Vector4(24 / 255F, 48 / 255F, 96 / 255F, 192 / 255F));
+            Rgba32 color = new Rgba32(new Vector4(24 / 255F, 48 / 255F, 96 / 255F, 192 / 255F));
+            RgbaVector colorVector = new RgbaVector(new Vector4(24 / 255F, 48 / 255F, 96 / 255F, 192 / 255F));
 
             Assert.Equal(color.R, (byte)(colorVector.R * 255));
             Assert.Equal(color.G, (byte)(colorVector.G * 255));
@@ -45,8 +47,8 @@
         [Fact]
         public void Color_Types_From_Vector3_Produce_Equal_Scaled_Component_OutPut()
         {
-            Color color = new Color(new Vector3(24 / 255F, 48 / 255F, 96 / 255F));
-            ColorVector colorVector = new ColorVector(new Vector3(24 / 255F, 48 / 255F, 96 / 255F));
+            Rgba32 color = new Rgba32(new Vector3(24 / 255F, 48 / 255F, 96 / 255F));
+            RgbaVector colorVector = new RgbaVector(new Vector3(24 / 255F, 48 / 255F, 96 / 255F));
 
             Assert.Equal(color.R, (byte)(colorVector.R * 255));
             Assert.Equal(color.G, (byte)(colorVector.G * 255));
@@ -57,8 +59,8 @@
         [Fact]
         public void Color_Types_From_Hex_Produce_Equal_Scaled_Component_OutPut()
         {
-            Color color = Color.FromHex("183060C0");
-            ColorVector colorVector = ColorVector.FromHex("183060C0");
+            Rgba32 color = Rgba32.FromHex("183060C0");
+            RgbaVector colorVector = RgbaVector.FromHex("183060C0");
 
             Assert.Equal(color.R, (byte)(colorVector.R * 255));
             Assert.Equal(color.G, (byte)(colorVector.G * 255));
@@ -69,8 +71,8 @@
         [Fact]
         public void Color_Types_To_Vector4_Produce_Equal_OutPut()
         {
-            Color color = new Color(24, 48, 96, 192);
-            ColorVector colorVector = new ColorVector(24, 48, 96, 192);
+            Rgba32 color = new Rgba32(24, 48, 96, 192);
+            RgbaVector colorVector = new RgbaVector(24, 48, 96, 192);
 
             Assert.Equal(color.ToVector4(), colorVector.ToVector4());
         }
@@ -78,8 +80,8 @@
         [Fact]
         public void Color_Types_To_RgbBytes_Produce_Equal_OutPut()
         {
-            Color color = new Color(24, 48, 96, 192);
-            ColorVector colorVector = new ColorVector(24, 48, 96, 192);
+            Rgba32 color = new Rgba32(24, 48, 96, 192);
+            RgbaVector colorVector = new RgbaVector(24, 48, 96, 192);
 
             byte[] rgb = new byte[3];
             byte[] rgbVector = new byte[3];
@@ -93,8 +95,8 @@
         [Fact]
         public void Color_Types_To_RgbaBytes_Produce_Equal_OutPut()
         {
-            Color color = new Color(24, 48, 96, 192);
-            ColorVector colorVector = new ColorVector(24, 48, 96, 192);
+            Rgba32 color = new Rgba32(24, 48, 96, 192);
+            RgbaVector colorVector = new RgbaVector(24, 48, 96, 192);
 
             byte[] rgba = new byte[4];
             byte[] rgbaVector = new byte[4];
@@ -108,8 +110,8 @@
         [Fact]
         public void Color_Types_To_BgrBytes_Produce_Equal_OutPut()
         {
-            Color color = new Color(24, 48, 96, 192);
-            ColorVector colorVector = new ColorVector(24, 48, 96, 192);
+            Rgba32 color = new Rgba32(24, 48, 96, 192);
+            RgbaVector colorVector = new RgbaVector(24, 48, 96, 192);
 
             byte[] bgr = new byte[3];
             byte[] bgrVector = new byte[3];
@@ -123,8 +125,8 @@
         [Fact]
         public void Color_Types_To_BgraBytes_Produce_Equal_OutPut()
         {
-            Color color = new Color(24, 48, 96, 192);
-            ColorVector colorVector = new ColorVector(24, 48, 96, 192);
+            Rgba32 color = new Rgba32(24, 48, 96, 192);
+            RgbaVector colorVector = new RgbaVector(24, 48, 96, 192);
 
             byte[] bgra = new byte[4];
             byte[] bgraVector = new byte[4];
@@ -138,8 +140,8 @@
         [Fact]
         public void Color_Types_To_Hex_Produce_Equal_OutPut()
         {
-            Color color = new Color(24, 48, 96, 192);
-            ColorVector colorVector = new ColorVector(24, 48, 96, 192);
+            Rgba32 color = new Rgba32(24, 48, 96, 192);
+            RgbaVector colorVector = new RgbaVector(24, 48, 96, 192);
 
             // 183060C0
             Assert.Equal(color.ToHex(), colorVector.ToHex());
diff --git a/tests/ImageSharp.Tests/Common/BufferSpanTests.cs b/tests/ImageSharp.Tests/Common/BufferSpanTests.cs
index ebf3a866a6..3bc59df64a 100644
--- a/tests/ImageSharp.Tests/Common/BufferSpanTests.cs
+++ b/tests/ImageSharp.Tests/Common/BufferSpanTests.cs
@@ -6,6 +6,8 @@ namespace ImageSharp.Tests.Common
     using System;
     using System.Runtime.CompilerServices;
 
+    using ImageSharp.PixelFormats;
+
     using Xunit;
 
     using static TestStructs;
@@ -412,12 +414,12 @@ namespace ImageSharp.Tests.Common
             [Fact]
             public void Color32ToBytes()
             {
-                Color[] colors = { new Color(0, 1, 2, 3), new Color(4, 5, 6, 7), new Color(8, 9, 10, 11), };
+                Rgba32[] colors = { new Rgba32(0, 1, 2, 3), new Rgba32(4, 5, 6, 7), new Rgba32(8, 9, 10, 11), };
 
-                using (Buffer<Color> colorBuf = new Buffer<Color>(colors))
+                using (Buffer<Rgba32> colorBuf = new Buffer<Rgba32>(colors))
                 using (Buffer<byte> byteBuf = new Buffer<byte>(colors.Length * 4))
                 {
-                    BufferSpan.Copy(colorBuf.Span.AsBytes(), byteBuf, colorBuf.Length * sizeof(Color));
+                    BufferSpan.Copy(colorBuf.Span.AsBytes(), byteBuf, colorBuf.Length * sizeof(Rgba32));
 
                     byte[] a = byteBuf.Array;
 
diff --git a/tests/ImageSharp.Tests/Common/PixelDataPoolTests.cs b/tests/ImageSharp.Tests/Common/PixelDataPoolTests.cs
index 403dffba9c..e673b28f1d 100644
--- a/tests/ImageSharp.Tests/Common/PixelDataPoolTests.cs
+++ b/tests/ImageSharp.Tests/Common/PixelDataPoolTests.cs
@@ -8,6 +8,8 @@ namespace ImageSharp.Tests
 {
     using System.Linq;
 
+    using ImageSharp.PixelFormats;
+
     using Xunit;
 
     /// <summary>
@@ -18,7 +20,7 @@ namespace ImageSharp.Tests
         [Fact]
         public void PixelDataPoolRentsMinimumSize()
         {
-            Color[] pixels = PixelDataPool<Color>.Rent(1024);
+            Rgba32[] pixels = PixelDataPool<Rgba32>.Rent(1024);
 
             Assert.True(pixels.Length >= 1024);
         }
@@ -26,9 +28,9 @@ namespace ImageSharp.Tests
         [Fact]
         public void PixelDataPoolDoesNotThrowWhenReturningNonPooled()
         {
-            Color[] pixels = new Color[1024];
+            Rgba32[] pixels = new Rgba32[1024];
 
-            PixelDataPool<Color>.Return(pixels);
+            PixelDataPool<Rgba32>.Return(pixels);
 
             Assert.True(pixels.Length >= 1024);
         }
@@ -39,7 +41,7 @@ namespace ImageSharp.Tests
         public void CalculateMaxArrayLength(bool isRawData)
         {
             int max = isRawData ? PixelDataPool<int>.CalculateMaxArrayLength()
-                          : PixelDataPool<Color>.CalculateMaxArrayLength();
+                          : PixelDataPool<Rgba32>.CalculateMaxArrayLength();
 
             Assert.Equal(max < int.MaxValue, !isRawData);
         }
diff --git a/tests/ImageSharp.Tests/Drawing/BeziersTests.cs b/tests/ImageSharp.Tests/Drawing/BeziersTests.cs
index a1d4d3fd59..eb3a5de86a 100644
--- a/tests/ImageSharp.Tests/Drawing/BeziersTests.cs
+++ b/tests/ImageSharp.Tests/Drawing/BeziersTests.cs
@@ -11,6 +11,9 @@ namespace ImageSharp.Tests.Drawing
     using System.Diagnostics.CodeAnalysis;
     using System.IO;
     using System.Numerics;
+
+    using ImageSharp.PixelFormats;
+
     using Xunit;
 
     public class Beziers : FileTestBase
@@ -23,8 +26,8 @@ namespace ImageSharp.Tests.Drawing
             {
                 using (FileStream output = File.OpenWrite($"{path}/Simple.png"))
                 {
-                    image.BackgroundColor(Color.Blue)
-                        .DrawBeziers(Color.HotPink, 5,
+                    image.BackgroundColor(Rgba32.Blue)
+                        .DrawBeziers(Rgba32.HotPink, 5,
                             new[] {
                                 new Vector2(10, 400),
                                 new Vector2(30, 10),
@@ -34,21 +37,21 @@ namespace ImageSharp.Tests.Drawing
                         .Save(output);
                 }
 
-                using (PixelAccessor<Color> sourcePixels = image.Lock())
+                using (PixelAccessor<Rgba32> sourcePixels = image.Lock())
                 {
                     //top of curve
-                    Assert.Equal(Color.HotPink, sourcePixels[138, 115]);
+                    Assert.Equal(Rgba32.HotPink, sourcePixels[138, 115]);
 
                     //start points
-                    Assert.Equal(Color.HotPink, sourcePixels[10, 400]);
-                    Assert.Equal(Color.HotPink, sourcePixels[300, 400]);
+                    Assert.Equal(Rgba32.HotPink, sourcePixels[10, 400]);
+                    Assert.Equal(Rgba32.HotPink, sourcePixels[300, 400]);
 
                     //curve points should not be never be set
-                    Assert.Equal(Color.Blue, sourcePixels[30, 10]);
-                    Assert.Equal(Color.Blue, sourcePixels[240, 30]);
+                    Assert.Equal(Rgba32.Blue, sourcePixels[30, 10]);
+                    Assert.Equal(Rgba32.Blue, sourcePixels[240, 30]);
 
                     // inside shape should be empty
-                    Assert.Equal(Color.Blue, sourcePixels[200, 250]);
+                    Assert.Equal(Rgba32.Blue, sourcePixels[200, 250]);
                 }
             }
         }
@@ -59,13 +62,13 @@ namespace ImageSharp.Tests.Drawing
         {
             string path = this.CreateOutputDirectory("Drawing", "BezierLine");
 
-            Color color = new Color(Color.HotPink.R, Color.HotPink.G, Color.HotPink.B, 150);
+            Rgba32 color = new Rgba32(Rgba32.HotPink.R, Rgba32.HotPink.G, Rgba32.HotPink.B, 150);
 
             using (Image image = new Image(500, 500))
             {
                 using (FileStream output = File.OpenWrite($"{path}/Opacity.png"))
                 {
-                    image.BackgroundColor(Color.Blue)
+                    image.BackgroundColor(Rgba32.Blue)
                         .DrawBeziers(color,
                         10,
                         new[] {
@@ -78,9 +81,9 @@ namespace ImageSharp.Tests.Drawing
                 }
 
                 //shift background color towards forground color by the opacity amount
-                Color mergedColor = new Color(Vector4.Lerp(Color.Blue.ToVector4(), Color.HotPink.ToVector4(), 150f / 255f));
+                Rgba32 mergedColor = new Rgba32(Vector4.Lerp(Rgba32.Blue.ToVector4(), Rgba32.HotPink.ToVector4(), 150f / 255f));
 
-                using (PixelAccessor<Color> sourcePixels = image.Lock())
+                using (PixelAccessor<Rgba32> sourcePixels = image.Lock())
                 {
                     //top of curve
                     Assert.Equal(mergedColor, sourcePixels[138, 115]);
@@ -90,11 +93,11 @@ namespace ImageSharp.Tests.Drawing
                     Assert.Equal(mergedColor, sourcePixels[300, 400]);
 
                     //curve points should not be never be set
-                    Assert.Equal(Color.Blue, sourcePixels[30, 10]);
-                    Assert.Equal(Color.Blue, sourcePixels[240, 30]);
+                    Assert.Equal(Rgba32.Blue, sourcePixels[30, 10]);
+                    Assert.Equal(Rgba32.Blue, sourcePixels[240, 30]);
 
                     // inside shape should be empty
-                    Assert.Equal(Color.Blue, sourcePixels[200, 250]);
+                    Assert.Equal(Rgba32.Blue, sourcePixels[200, 250]);
                 }
             }
         }
diff --git a/tests/ImageSharp.Tests/Drawing/DrawPathTests.cs b/tests/ImageSharp.Tests/Drawing/DrawPathTests.cs
index fc231a89d5..674823d3a8 100644
--- a/tests/ImageSharp.Tests/Drawing/DrawPathTests.cs
+++ b/tests/ImageSharp.Tests/Drawing/DrawPathTests.cs
@@ -5,15 +5,13 @@
 
 namespace ImageSharp.Tests.Drawing
 {
-    using Drawing;
-    using ImageSharp.Drawing;
     using ShapePath = SixLabors.Shapes.Path;
     using SixLabors.Shapes;
-    using System;
-    using System.Diagnostics.CodeAnalysis;
     using System.IO;
     using System.Numerics;
 
+    using ImageSharp.PixelFormats;
+
     using Xunit;
 
     public class DrawPathTests : FileTestBase
@@ -38,18 +36,18 @@ namespace ImageSharp.Tests.Drawing
                 using (FileStream output = File.OpenWrite($"{path}/Simple.png"))
                 {
                     image
-                        .BackgroundColor(Color.Blue)
-                        .Draw(Color.HotPink, 5, p)
+                        .BackgroundColor(Rgba32.Blue)
+                        .Draw(Rgba32.HotPink, 5, p)
                         .Save(output);
                 }
 
-                using (PixelAccessor<Color> sourcePixels = image.Lock())
+                using (PixelAccessor<Rgba32> sourcePixels = image.Lock())
                 {
-                    Assert.Equal(Color.HotPink, sourcePixels[9, 9]);
+                    Assert.Equal(Rgba32.HotPink, sourcePixels[9, 9]);
 
-                    Assert.Equal(Color.HotPink, sourcePixels[199, 149]);
+                    Assert.Equal(Rgba32.HotPink, sourcePixels[199, 149]);
 
-                    Assert.Equal(Color.Blue, sourcePixels[50, 50]);
+                    Assert.Equal(Rgba32.Blue, sourcePixels[50, 50]);
                 }
             }
         }
@@ -60,7 +58,7 @@ namespace ImageSharp.Tests.Drawing
         {
             string path = this.CreateOutputDirectory("Drawing", "Path");
 
-            Color color = new Color(Color.HotPink.R, Color.HotPink.G, Color.HotPink.B, 150);
+            Rgba32 color = new Rgba32(Rgba32.HotPink.R, Rgba32.HotPink.G, Rgba32.HotPink.B, 150);
 
 
             LinearLineSegment linerSegemnt = new LinearLineSegment(
@@ -81,21 +79,21 @@ namespace ImageSharp.Tests.Drawing
                 using (FileStream output = File.OpenWrite($"{path}/Opacity.png"))
                 {
                     image
-                        .BackgroundColor(Color.Blue)
+                        .BackgroundColor(Rgba32.Blue)
                         .Draw(color, 10, p)
                         .Save(output);
                 }
 
                 //shift background color towards forground color by the opacity amount
-                Color mergedColor = new Color(Vector4.Lerp(Color.Blue.ToVector4(), Color.HotPink.ToVector4(), 150f / 255f));
+                Rgba32 mergedColor = new Rgba32(Vector4.Lerp(Rgba32.Blue.ToVector4(), Rgba32.HotPink.ToVector4(), 150f / 255f));
 
-                using (PixelAccessor<Color> sourcePixels = image.Lock())
+                using (PixelAccessor<Rgba32> sourcePixels = image.Lock())
                 {
                     Assert.Equal(mergedColor, sourcePixels[9, 9]);
 
                     Assert.Equal(mergedColor, sourcePixels[199, 149]);
 
-                    Assert.Equal(Color.Blue, sourcePixels[50, 50]);
+                    Assert.Equal(Rgba32.Blue, sourcePixels[50, 50]);
                 }
             }
         }
diff --git a/tests/ImageSharp.Tests/Drawing/FillPatternTests.cs b/tests/ImageSharp.Tests/Drawing/FillPatternTests.cs
index 8162bc5319..493bab347f 100644
--- a/tests/ImageSharp.Tests/Drawing/FillPatternTests.cs
+++ b/tests/ImageSharp.Tests/Drawing/FillPatternTests.cs
@@ -10,12 +10,12 @@ namespace ImageSharp.Tests.Drawing
 
     using ImageSharp.Drawing;
     using ImageSharp.Drawing.Brushes;
-
+    using ImageSharp.PixelFormats;
     using Xunit;
 
     public class FillPatternBrushTests : FileTestBase
     {
-        private void Test(string name, Color background, IBrush<Color> brush, Color[,] expectedPattern)
+        private void Test(string name, Rgba32 background, IBrush<Rgba32> brush, Rgba32[,] expectedPattern)
         {
             string path = this.CreateOutputDirectory("Fill", "PatternBrush");
             using (Image image = new Image(20, 20))
@@ -29,11 +29,11 @@ namespace ImageSharp.Tests.Drawing
                     image.Save(output);
                 }
 
-                using (PixelAccessor<Color> sourcePixels = image.Lock())
+                using (PixelAccessor<Rgba32> sourcePixels = image.Lock())
                 {
                     // lets pick random spots to start checking
                     Random r = new Random();
-                    Fast2DArray<Color> expectedPatternFast = new Fast2DArray<Color>(expectedPattern);
+                    Fast2DArray<Rgba32> expectedPatternFast = new Fast2DArray<Rgba32>(expectedPattern);
                     int xStride = expectedPatternFast.Width;
                     int yStride = expectedPatternFast.Height;
                     int offsetX = r.Next(image.Width / xStride) * xStride;
@@ -44,8 +44,8 @@ namespace ImageSharp.Tests.Drawing
                         {
                             int actualX = x + offsetX;
                             int actualY = y + offsetY;
-                            Color expected = expectedPatternFast[y, x]; // inverted pattern
-                            Color actual = sourcePixels[actualX, actualY];
+                            Rgba32 expected = expectedPatternFast[y, x]; // inverted pattern
+                            Rgba32 actual = sourcePixels[actualX, actualY];
                             if (expected != actual)
                             {
                                 Assert.True(false, $"Expected {expected} but found {actual} at ({actualX},{actualY})");
@@ -63,73 +63,73 @@ namespace ImageSharp.Tests.Drawing
         [Fact]
         public void ImageShouldBeFloodFilledWithPercent10()
         {
-            this.Test("Percent10", Color.Blue, Brushes.Percent10(Color.HotPink, Color.LimeGreen),
+            this.Test("Percent10", Rgba32.Blue, Brushes.Percent10(Rgba32.HotPink, Rgba32.LimeGreen),
                 new[,]
                 {
-                { Color.HotPink , Color.LimeGreen, Color.LimeGreen, Color.LimeGreen},
-                { Color.LimeGreen, Color.LimeGreen, Color.LimeGreen, Color.LimeGreen},
-                { Color.LimeGreen, Color.LimeGreen, Color.HotPink , Color.LimeGreen},
-                { Color.LimeGreen, Color.LimeGreen, Color.LimeGreen, Color.LimeGreen}
+                { Rgba32.HotPink , Rgba32.LimeGreen, Rgba32.LimeGreen, Rgba32.LimeGreen},
+                { Rgba32.LimeGreen, Rgba32.LimeGreen, Rgba32.LimeGreen, Rgba32.LimeGreen},
+                { Rgba32.LimeGreen, Rgba32.LimeGreen, Rgba32.HotPink , Rgba32.LimeGreen},
+                { Rgba32.LimeGreen, Rgba32.LimeGreen, Rgba32.LimeGreen, Rgba32.LimeGreen}
             });
         }
 
         [Fact]
         public void ImageShouldBeFloodFilledWithPercent10Transparent()
         {
-            Test("Percent10_Transparent", Color.Blue, Brushes.Percent10(Color.HotPink),
-            new Color[,] {
-                { Color.HotPink , Color.Blue, Color.Blue, Color.Blue},
-                { Color.Blue, Color.Blue, Color.Blue, Color.Blue},
-                { Color.Blue, Color.Blue, Color.HotPink , Color.Blue},
-                { Color.Blue, Color.Blue, Color.Blue, Color.Blue}
+            Test("Percent10_Transparent", Rgba32.Blue, Brushes.Percent10(Rgba32.HotPink),
+            new Rgba32[,] {
+                { Rgba32.HotPink , Rgba32.Blue, Rgba32.Blue, Rgba32.Blue},
+                { Rgba32.Blue, Rgba32.Blue, Rgba32.Blue, Rgba32.Blue},
+                { Rgba32.Blue, Rgba32.Blue, Rgba32.HotPink , Rgba32.Blue},
+                { Rgba32.Blue, Rgba32.Blue, Rgba32.Blue, Rgba32.Blue}
             });
         }
 
         [Fact]
         public void ImageShouldBeFloodFilledWithPercent20()
         {
-            Test("Percent20", Color.Blue, Brushes.Percent20(Color.HotPink, Color.LimeGreen),
-           new Color[,] {
-                { Color.HotPink , Color.LimeGreen, Color.LimeGreen, Color.LimeGreen},
-                { Color.LimeGreen, Color.LimeGreen, Color.HotPink , Color.LimeGreen},
-                { Color.HotPink , Color.LimeGreen, Color.LimeGreen, Color.LimeGreen},
-                { Color.LimeGreen, Color.LimeGreen, Color.HotPink , Color.LimeGreen}
+            Test("Percent20", Rgba32.Blue, Brushes.Percent20(Rgba32.HotPink, Rgba32.LimeGreen),
+           new Rgba32[,] {
+                { Rgba32.HotPink , Rgba32.LimeGreen, Rgba32.LimeGreen, Rgba32.LimeGreen},
+                { Rgba32.LimeGreen, Rgba32.LimeGreen, Rgba32.HotPink , Rgba32.LimeGreen},
+                { Rgba32.HotPink , Rgba32.LimeGreen, Rgba32.LimeGreen, Rgba32.LimeGreen},
+                { Rgba32.LimeGreen, Rgba32.LimeGreen, Rgba32.HotPink , Rgba32.LimeGreen}
            });
         }
 
         [Fact]
         public void ImageShouldBeFloodFilledWithPercent20_transparent()
         {
-            Test("Percent20_Transparent", Color.Blue, Brushes.Percent20(Color.HotPink),
-           new Color[,] {
-                { Color.HotPink , Color.Blue, Color.Blue, Color.Blue},
-                { Color.Blue, Color.Blue, Color.HotPink , Color.Blue},
-                { Color.HotPink , Color.Blue, Color.Blue, Color.Blue},
-                { Color.Blue, Color.Blue, Color.HotPink , Color.Blue}
+            Test("Percent20_Transparent", Rgba32.Blue, Brushes.Percent20(Rgba32.HotPink),
+           new Rgba32[,] {
+                { Rgba32.HotPink , Rgba32.Blue, Rgba32.Blue, Rgba32.Blue},
+                { Rgba32.Blue, Rgba32.Blue, Rgba32.HotPink , Rgba32.Blue},
+                { Rgba32.HotPink , Rgba32.Blue, Rgba32.Blue, Rgba32.Blue},
+                { Rgba32.Blue, Rgba32.Blue, Rgba32.HotPink , Rgba32.Blue}
            });
         }
 
         [Fact]
         public void ImageShouldBeFloodFilledWithHorizontal()
         {
-            Test("Horizontal", Color.Blue, Brushes.Horizontal(Color.HotPink, Color.LimeGreen),
-           new Color[,] {
-                { Color.LimeGreen , Color.LimeGreen, Color.LimeGreen, Color.LimeGreen},
-                { Color.HotPink, Color.HotPink, Color.HotPink , Color.HotPink},
-                { Color.LimeGreen , Color.LimeGreen, Color.LimeGreen, Color.LimeGreen},
-                { Color.LimeGreen, Color.LimeGreen, Color.LimeGreen , Color.LimeGreen}
+            Test("Horizontal", Rgba32.Blue, Brushes.Horizontal(Rgba32.HotPink, Rgba32.LimeGreen),
+           new Rgba32[,] {
+                { Rgba32.LimeGreen , Rgba32.LimeGreen, Rgba32.LimeGreen, Rgba32.LimeGreen},
+                { Rgba32.HotPink, Rgba32.HotPink, Rgba32.HotPink , Rgba32.HotPink},
+                { Rgba32.LimeGreen , Rgba32.LimeGreen, Rgba32.LimeGreen, Rgba32.LimeGreen},
+                { Rgba32.LimeGreen, Rgba32.LimeGreen, Rgba32.LimeGreen , Rgba32.LimeGreen}
            });
         }
 
         [Fact]
         public void ImageShouldBeFloodFilledWithHorizontal_transparent()
         {
-            Test("Horizontal_Transparent", Color.Blue, Brushes.Horizontal(Color.HotPink),
-           new Color[,] {
-                { Color.Blue , Color.Blue, Color.Blue, Color.Blue},
-                { Color.HotPink, Color.HotPink, Color.HotPink , Color.HotPink},
-                { Color.Blue , Color.Blue, Color.Blue, Color.Blue},
-                { Color.Blue, Color.Blue, Color.Blue , Color.Blue}
+            Test("Horizontal_Transparent", Rgba32.Blue, Brushes.Horizontal(Rgba32.HotPink),
+           new Rgba32[,] {
+                { Rgba32.Blue , Rgba32.Blue, Rgba32.Blue, Rgba32.Blue},
+                { Rgba32.HotPink, Rgba32.HotPink, Rgba32.HotPink , Rgba32.HotPink},
+                { Rgba32.Blue , Rgba32.Blue, Rgba32.Blue, Rgba32.Blue},
+                { Rgba32.Blue, Rgba32.Blue, Rgba32.Blue , Rgba32.Blue}
            });
         }
 
@@ -138,96 +138,96 @@ namespace ImageSharp.Tests.Drawing
         [Fact]
         public void ImageShouldBeFloodFilledWithMin()
         {
-            Test("Min", Color.Blue, Brushes.Min(Color.HotPink, Color.LimeGreen),
-           new Color[,] {
-                { Color.LimeGreen , Color.LimeGreen, Color.LimeGreen, Color.LimeGreen},
-                { Color.LimeGreen , Color.LimeGreen, Color.LimeGreen, Color.LimeGreen},
-                { Color.LimeGreen, Color.LimeGreen, Color.LimeGreen , Color.LimeGreen},
-                { Color.HotPink, Color.HotPink, Color.HotPink , Color.HotPink}
+            Test("Min", Rgba32.Blue, Brushes.Min(Rgba32.HotPink, Rgba32.LimeGreen),
+           new Rgba32[,] {
+                { Rgba32.LimeGreen , Rgba32.LimeGreen, Rgba32.LimeGreen, Rgba32.LimeGreen},
+                { Rgba32.LimeGreen , Rgba32.LimeGreen, Rgba32.LimeGreen, Rgba32.LimeGreen},
+                { Rgba32.LimeGreen, Rgba32.LimeGreen, Rgba32.LimeGreen , Rgba32.LimeGreen},
+                { Rgba32.HotPink, Rgba32.HotPink, Rgba32.HotPink , Rgba32.HotPink}
            });
         }
 
         [Fact]
         public void ImageShouldBeFloodFilledWithMin_transparent()
         {
-            Test("Min_Transparent", Color.Blue, Brushes.Min(Color.HotPink),
-           new Color[,] {
-                { Color.Blue , Color.Blue, Color.Blue, Color.Blue},
-                { Color.Blue , Color.Blue, Color.Blue, Color.Blue},
-                { Color.Blue, Color.Blue, Color.Blue , Color.Blue},
-                { Color.HotPink, Color.HotPink, Color.HotPink , Color.HotPink},
+            Test("Min_Transparent", Rgba32.Blue, Brushes.Min(Rgba32.HotPink),
+           new Rgba32[,] {
+                { Rgba32.Blue , Rgba32.Blue, Rgba32.Blue, Rgba32.Blue},
+                { Rgba32.Blue , Rgba32.Blue, Rgba32.Blue, Rgba32.Blue},
+                { Rgba32.Blue, Rgba32.Blue, Rgba32.Blue , Rgba32.Blue},
+                { Rgba32.HotPink, Rgba32.HotPink, Rgba32.HotPink , Rgba32.HotPink},
            });
         }
 
         [Fact]
         public void ImageShouldBeFloodFilledWithVertical()
         {
-            Test("Vertical", Color.Blue, Brushes.Vertical(Color.HotPink, Color.LimeGreen),
-           new Color[,] {
-                { Color.LimeGreen, Color.HotPink, Color.LimeGreen, Color.LimeGreen},
-                { Color.LimeGreen, Color.HotPink, Color.LimeGreen, Color.LimeGreen},
-                { Color.LimeGreen, Color.HotPink, Color.LimeGreen, Color.LimeGreen},
-                { Color.LimeGreen, Color.HotPink, Color.LimeGreen, Color.LimeGreen}
+            Test("Vertical", Rgba32.Blue, Brushes.Vertical(Rgba32.HotPink, Rgba32.LimeGreen),
+           new Rgba32[,] {
+                { Rgba32.LimeGreen, Rgba32.HotPink, Rgba32.LimeGreen, Rgba32.LimeGreen},
+                { Rgba32.LimeGreen, Rgba32.HotPink, Rgba32.LimeGreen, Rgba32.LimeGreen},
+                { Rgba32.LimeGreen, Rgba32.HotPink, Rgba32.LimeGreen, Rgba32.LimeGreen},
+                { Rgba32.LimeGreen, Rgba32.HotPink, Rgba32.LimeGreen, Rgba32.LimeGreen}
            });
         }
 
         [Fact]
         public void ImageShouldBeFloodFilledWithVertical_transparent()
         {
-            Test("Vertical_Transparent", Color.Blue, Brushes.Vertical(Color.HotPink),
-           new Color[,] {
-                { Color.Blue, Color.HotPink, Color.Blue, Color.Blue},
-                { Color.Blue, Color.HotPink, Color.Blue, Color.Blue},
-                { Color.Blue, Color.HotPink, Color.Blue, Color.Blue},
-                { Color.Blue, Color.HotPink, Color.Blue, Color.Blue}
+            Test("Vertical_Transparent", Rgba32.Blue, Brushes.Vertical(Rgba32.HotPink),
+           new Rgba32[,] {
+                { Rgba32.Blue, Rgba32.HotPink, Rgba32.Blue, Rgba32.Blue},
+                { Rgba32.Blue, Rgba32.HotPink, Rgba32.Blue, Rgba32.Blue},
+                { Rgba32.Blue, Rgba32.HotPink, Rgba32.Blue, Rgba32.Blue},
+                { Rgba32.Blue, Rgba32.HotPink, Rgba32.Blue, Rgba32.Blue}
            });
         }
 
         [Fact]
         public void ImageShouldBeFloodFilledWithForwardDiagonal()
         {
-            Test("ForwardDiagonal", Color.Blue, Brushes.ForwardDiagonal(Color.HotPink, Color.LimeGreen),
-           new Color[,] {
-                { Color.LimeGreen, Color.LimeGreen, Color.LimeGreen, Color.HotPink},
-                { Color.LimeGreen, Color.LimeGreen, Color.HotPink, Color.LimeGreen},
-                { Color.LimeGreen, Color.HotPink, Color.LimeGreen, Color.LimeGreen},
-                { Color.HotPink, Color.LimeGreen, Color.LimeGreen, Color.LimeGreen}
+            Test("ForwardDiagonal", Rgba32.Blue, Brushes.ForwardDiagonal(Rgba32.HotPink, Rgba32.LimeGreen),
+           new Rgba32[,] {
+                { Rgba32.LimeGreen, Rgba32.LimeGreen, Rgba32.LimeGreen, Rgba32.HotPink},
+                { Rgba32.LimeGreen, Rgba32.LimeGreen, Rgba32.HotPink, Rgba32.LimeGreen},
+                { Rgba32.LimeGreen, Rgba32.HotPink, Rgba32.LimeGreen, Rgba32.LimeGreen},
+                { Rgba32.HotPink, Rgba32.LimeGreen, Rgba32.LimeGreen, Rgba32.LimeGreen}
            });
         }
 
         [Fact]
         public void ImageShouldBeFloodFilledWithForwardDiagonal_transparent()
         {
-            Test("ForwardDiagonal_Transparent", Color.Blue, Brushes.ForwardDiagonal(Color.HotPink),
-           new Color[,] {
-                { Color.Blue,    Color.Blue,    Color.Blue,    Color.HotPink},
-                { Color.Blue,    Color.Blue,    Color.HotPink, Color.Blue},
-                { Color.Blue,    Color.HotPink, Color.Blue,    Color.Blue},
-                { Color.HotPink, Color.Blue,    Color.Blue,    Color.Blue}
+            Test("ForwardDiagonal_Transparent", Rgba32.Blue, Brushes.ForwardDiagonal(Rgba32.HotPink),
+           new Rgba32[,] {
+                { Rgba32.Blue,    Rgba32.Blue,    Rgba32.Blue,    Rgba32.HotPink},
+                { Rgba32.Blue,    Rgba32.Blue,    Rgba32.HotPink, Rgba32.Blue},
+                { Rgba32.Blue,    Rgba32.HotPink, Rgba32.Blue,    Rgba32.Blue},
+                { Rgba32.HotPink, Rgba32.Blue,    Rgba32.Blue,    Rgba32.Blue}
            });
         }
 
         [Fact]
         public void ImageShouldBeFloodFilledWithBackwardDiagonal()
         {
-            Test("BackwardDiagonal", Color.Blue, Brushes.BackwardDiagonal(Color.HotPink, Color.LimeGreen),
-           new Color[,] {
-                { Color.HotPink,   Color.LimeGreen, Color.LimeGreen, Color.LimeGreen},
-                { Color.LimeGreen, Color.HotPink,   Color.LimeGreen, Color.LimeGreen},
-                { Color.LimeGreen, Color.LimeGreen, Color.HotPink,   Color.LimeGreen},
-                { Color.LimeGreen, Color.LimeGreen, Color.LimeGreen, Color.HotPink}
+            Test("BackwardDiagonal", Rgba32.Blue, Brushes.BackwardDiagonal(Rgba32.HotPink, Rgba32.LimeGreen),
+           new Rgba32[,] {
+                { Rgba32.HotPink,   Rgba32.LimeGreen, Rgba32.LimeGreen, Rgba32.LimeGreen},
+                { Rgba32.LimeGreen, Rgba32.HotPink,   Rgba32.LimeGreen, Rgba32.LimeGreen},
+                { Rgba32.LimeGreen, Rgba32.LimeGreen, Rgba32.HotPink,   Rgba32.LimeGreen},
+                { Rgba32.LimeGreen, Rgba32.LimeGreen, Rgba32.LimeGreen, Rgba32.HotPink}
            });
         }
 
         [Fact]
         public void ImageShouldBeFloodFilledWithBackwardDiagonal_transparent()
         {
-            Test("BackwardDiagonal_Transparent", Color.Blue, Brushes.BackwardDiagonal(Color.HotPink),
-           new Color[,] {
-                { Color.HotPink, Color.Blue,    Color.Blue,    Color.Blue},
-                { Color.Blue,    Color.HotPink, Color.Blue,    Color.Blue},
-                { Color.Blue,    Color.Blue,    Color.HotPink, Color.Blue},
-                { Color.Blue,    Color.Blue,    Color.Blue,    Color.HotPink}
+            Test("BackwardDiagonal_Transparent", Rgba32.Blue, Brushes.BackwardDiagonal(Rgba32.HotPink),
+           new Rgba32[,] {
+                { Rgba32.HotPink, Rgba32.Blue,    Rgba32.Blue,    Rgba32.Blue},
+                { Rgba32.Blue,    Rgba32.HotPink, Rgba32.Blue,    Rgba32.Blue},
+                { Rgba32.Blue,    Rgba32.Blue,    Rgba32.HotPink, Rgba32.Blue},
+                { Rgba32.Blue,    Rgba32.Blue,    Rgba32.Blue,    Rgba32.HotPink}
            });
         }
     }
diff --git a/tests/ImageSharp.Tests/Drawing/FillRegionProcessorTests.cs b/tests/ImageSharp.Tests/Drawing/FillRegionProcessorTests.cs
index 03994bc94d..9661a41bba 100644
--- a/tests/ImageSharp.Tests/Drawing/FillRegionProcessorTests.cs
+++ b/tests/ImageSharp.Tests/Drawing/FillRegionProcessorTests.cs
@@ -1,20 +1,13 @@
 
 namespace ImageSharp.Tests.Drawing
 {
-    using System;
-    using System.IO;
     using ImageSharp;
-    using ImageSharp.Drawing.Brushes;
-    using Processing;
-    using System.Collections.Generic;
     using Xunit;
     using ImageSharp.Drawing;
-    using System.Numerics;
-    using SixLabors.Shapes;
     using ImageSharp.Drawing.Processors;
-    using ImageSharp.Drawing.Pens;
     using Moq;
-    using System.Collections.Immutable;
+
+    using ImageSharp.PixelFormats;
 
     public class FillRegionProcessorTests
     {
@@ -29,14 +22,14 @@ namespace ImageSharp.Tests.Drawing
         {
             ImageSharp.Rectangle bounds = new ImageSharp.Rectangle(0, 0, 1, 1);
 
-            Mock<IBrush<Color>> brush = new Mock<IBrush<Color>>();
+            Mock<IBrush<Rgba32>> brush = new Mock<IBrush<Rgba32>>();
             Mock<Region> region = new Mock<Region>();
             region.Setup(x => x.Bounds).Returns(bounds);
 
             GraphicsOptions options = new GraphicsOptions(antialias) {
                 AntialiasSubpixelDepth = 1
             };
-            FillRegionProcessor<Color> processor = new FillRegionProcessor<Color>(brush.Object, region.Object, options);
+            FillRegionProcessor<Rgba32> processor = new FillRegionProcessor<Rgba32>(brush.Object, region.Object, options);
             Image img = new Image(1, 1);
             processor.Apply(img, bounds);
 
diff --git a/tests/ImageSharp.Tests/Drawing/FillSolidBrushTests.cs b/tests/ImageSharp.Tests/Drawing/FillSolidBrushTests.cs
index bafc84b69f..4a3c8e3058 100644
--- a/tests/ImageSharp.Tests/Drawing/FillSolidBrushTests.cs
+++ b/tests/ImageSharp.Tests/Drawing/FillSolidBrushTests.cs
@@ -11,6 +11,9 @@ namespace ImageSharp.Tests.Drawing
     using System.Diagnostics.CodeAnalysis;
     using System.IO;
     using System.Numerics;
+
+    using ImageSharp.PixelFormats;
+
     using Xunit;
 
     public class FillSolidBrushTests: FileTestBase
@@ -24,15 +27,15 @@ namespace ImageSharp.Tests.Drawing
                 using (FileStream output = File.OpenWrite($"{path}/DefaultBack.png"))
                 {
                     image
-                        .Fill(Color.HotPink)
+                        .Fill(Rgba32.HotPink)
                         .Save(output);
                 }
 
-                using (PixelAccessor<Color> sourcePixels = image.Lock())
+                using (PixelAccessor<Rgba32> sourcePixels = image.Lock())
                 {
-                    Assert.Equal(Color.HotPink, sourcePixels[9, 9]);
+                    Assert.Equal(Rgba32.HotPink, sourcePixels[9, 9]);
 
-                    Assert.Equal(Color.HotPink, sourcePixels[199, 149]);
+                    Assert.Equal(Rgba32.HotPink, sourcePixels[199, 149]);
                 }
             }
         }
@@ -46,16 +49,16 @@ namespace ImageSharp.Tests.Drawing
                 using (FileStream output = File.OpenWrite($"{path}/Simple.png"))
                 {
                     image
-                        .BackgroundColor(Color.Blue)
-                        .Fill(Color.HotPink)
+                        .BackgroundColor(Rgba32.Blue)
+                        .Fill(Rgba32.HotPink)
                         .Save(output);
                 }
 
-                using (PixelAccessor<Color> sourcePixels = image.Lock())
+                using (PixelAccessor<Rgba32> sourcePixels = image.Lock())
                 {
-                    Assert.Equal(Color.HotPink, sourcePixels[9, 9]);
+                    Assert.Equal(Rgba32.HotPink, sourcePixels[9, 9]);
 
-                    Assert.Equal(Color.HotPink, sourcePixels[199, 149]);
+                    Assert.Equal(Rgba32.HotPink, sourcePixels[199, 149]);
                 }
             }
         }
@@ -66,20 +69,20 @@ namespace ImageSharp.Tests.Drawing
             string path = this.CreateOutputDirectory("Fill", "SolidBrush");
             using (Image image = new Image(500, 500))
             {
-                Color color = new Color(Color.HotPink.R, Color.HotPink.G, Color.HotPink.B, 150);
+                Rgba32 color = new Rgba32(Rgba32.HotPink.R, Rgba32.HotPink.G, Rgba32.HotPink.B, 150);
 
                 using (FileStream output = File.OpenWrite($"{path}/Opacity.png"))
                 {
                     image
-                        .BackgroundColor(Color.Blue)
+                        .BackgroundColor(Rgba32.Blue)
                         .Fill(color)
                         .Save(output);
                 }
                 //shift background color towards forground color by the opacity amount
-                Color mergedColor = new Color(Vector4.Lerp(Color.Blue.ToVector4(), Color.HotPink.ToVector4(), 150f / 255f));
+                Rgba32 mergedColor = new Rgba32(Vector4.Lerp(Rgba32.Blue.ToVector4(), Rgba32.HotPink.ToVector4(), 150f / 255f));
 
 
-                using (PixelAccessor<Color> sourcePixels = image.Lock())
+                using (PixelAccessor<Rgba32> sourcePixels = image.Lock())
                 {
                     Assert.Equal(mergedColor, sourcePixels[9, 9]);
                     Assert.Equal(mergedColor, sourcePixels[199, 149]);
diff --git a/tests/ImageSharp.Tests/Drawing/LineComplexPolygonTests.cs b/tests/ImageSharp.Tests/Drawing/LineComplexPolygonTests.cs
index d7a4bde957..bded40f32a 100644
--- a/tests/ImageSharp.Tests/Drawing/LineComplexPolygonTests.cs
+++ b/tests/ImageSharp.Tests/Drawing/LineComplexPolygonTests.cs
@@ -11,6 +11,7 @@ namespace ImageSharp.Tests.Drawing
     using ImageSharp.Drawing;
     using System.Numerics;
     using ImageSharp.Drawing.Pens;
+    using ImageSharp.PixelFormats;
 
     using SixLabors.Shapes;
 
@@ -36,33 +37,33 @@ namespace ImageSharp.Tests.Drawing
                 using (FileStream output = File.OpenWrite($"{path}/Simple.png"))
                 {
                     image
-                        .BackgroundColor(Color.Blue)
-                        .Draw(Color.HotPink, 5, simplePath.Clip(hole1))
+                        .BackgroundColor(Rgba32.Blue)
+                        .Draw(Rgba32.HotPink, 5, simplePath.Clip(hole1))
                         .Save(output);
                 }
 
-                using (PixelAccessor<Color> sourcePixels = image.Lock())
+                using (PixelAccessor<Rgba32> sourcePixels = image.Lock())
                 {
-                    Assert.Equal(Color.HotPink, sourcePixels[10, 10]);
+                    Assert.Equal(Rgba32.HotPink, sourcePixels[10, 10]);
 
-                    Assert.Equal(Color.HotPink, sourcePixels[200, 150]);
+                    Assert.Equal(Rgba32.HotPink, sourcePixels[200, 150]);
 
-                    Assert.Equal(Color.HotPink, sourcePixels[50, 300]);
+                    Assert.Equal(Rgba32.HotPink, sourcePixels[50, 300]);
 
 
-                    Assert.Equal(Color.HotPink, sourcePixels[37, 85]);
+                    Assert.Equal(Rgba32.HotPink, sourcePixels[37, 85]);
 
-                    Assert.Equal(Color.HotPink, sourcePixels[93, 85]);
+                    Assert.Equal(Rgba32.HotPink, sourcePixels[93, 85]);
 
-                    Assert.Equal(Color.HotPink, sourcePixels[65, 137]);
+                    Assert.Equal(Rgba32.HotPink, sourcePixels[65, 137]);
 
-                    Assert.Equal(Color.Blue, sourcePixels[2, 2]);
+                    Assert.Equal(Rgba32.Blue, sourcePixels[2, 2]);
 
                     //inside hole
-                    Assert.Equal(Color.Blue, sourcePixels[57, 99]);
+                    Assert.Equal(Rgba32.Blue, sourcePixels[57, 99]);
 
                     //inside shape
-                    Assert.Equal(Color.Blue, sourcePixels[100, 192]);
+                    Assert.Equal(Rgba32.Blue, sourcePixels[100, 192]);
                 }
             }
         }
@@ -86,18 +87,18 @@ namespace ImageSharp.Tests.Drawing
                 using (FileStream output = File.OpenWrite($"{path}/SimpleVanishHole.png"))
                 {
                     image
-                        .BackgroundColor(Color.Blue)
-                        .Draw(Color.HotPink, 5, simplePath.Clip(hole1))
+                        .BackgroundColor(Rgba32.Blue)
+                        .Draw(Rgba32.HotPink, 5, simplePath.Clip(hole1))
                         .Save(output);
                 }
 
-                using (PixelAccessor<Color> sourcePixels = image.Lock())
+                using (PixelAccessor<Rgba32> sourcePixels = image.Lock())
                 {
-                    Assert.Equal(Color.HotPink, sourcePixels[10, 10]);
+                    Assert.Equal(Rgba32.HotPink, sourcePixels[10, 10]);
 
-                    Assert.Equal(Color.HotPink, sourcePixels[200, 150]);
+                    Assert.Equal(Rgba32.HotPink, sourcePixels[200, 150]);
 
-                    Assert.Equal(Color.HotPink, sourcePixels[50, 300]);
+                    Assert.Equal(Rgba32.HotPink, sourcePixels[50, 300]);
 
 
                     //Assert.Equal(Color.HotPink, sourcePixels[37, 85]);
@@ -106,13 +107,13 @@ namespace ImageSharp.Tests.Drawing
 
                     //Assert.Equal(Color.HotPink, sourcePixels[65, 137]);
 
-                    Assert.Equal(Color.Blue, sourcePixels[2, 2]);
+                    Assert.Equal(Rgba32.Blue, sourcePixels[2, 2]);
 
                     //inside hole
-                    Assert.Equal(Color.Blue, sourcePixels[57, 99]);
+                    Assert.Equal(Rgba32.Blue, sourcePixels[57, 99]);
 
                     //inside shape
-                    Assert.Equal(Color.Blue, sourcePixels[100, 192]);
+                    Assert.Equal(Rgba32.Blue, sourcePixels[100, 192]);
                 }
             }
         }
@@ -137,28 +138,28 @@ namespace ImageSharp.Tests.Drawing
                 using (FileStream output = File.OpenWrite($"{path}/SimpleOverlapping.png"))
                 {
                     image
-                        .BackgroundColor(Color.Blue)
-                        .Draw(Color.HotPink, 5, simplePath.Clip(hole1))
+                        .BackgroundColor(Rgba32.Blue)
+                        .Draw(Rgba32.HotPink, 5, simplePath.Clip(hole1))
                         .Save(output);
                 }
 
-                using (PixelAccessor<Color> sourcePixels = image.Lock())
+                using (PixelAccessor<Rgba32> sourcePixels = image.Lock())
                 {
-                    Assert.Equal(Color.HotPink, sourcePixels[10, 10]);
+                    Assert.Equal(Rgba32.HotPink, sourcePixels[10, 10]);
 
-                    Assert.Equal(Color.HotPink, sourcePixels[200, 150]);
+                    Assert.Equal(Rgba32.HotPink, sourcePixels[200, 150]);
 
-                    Assert.Equal(Color.HotPink, sourcePixels[50, 300]);
+                    Assert.Equal(Rgba32.HotPink, sourcePixels[50, 300]);
 
-                    Assert.Equal(Color.Blue, sourcePixels[130, 41]);
+                    Assert.Equal(Rgba32.Blue, sourcePixels[130, 41]);
 
-                    Assert.Equal(Color.Blue, sourcePixels[2, 2]);
+                    Assert.Equal(Rgba32.Blue, sourcePixels[2, 2]);
 
                     //inside hole
-                    Assert.Equal(Color.Blue, sourcePixels[57, 99]);
+                    Assert.Equal(Rgba32.Blue, sourcePixels[57, 99]);
 
                     //inside shape
-                    Assert.Equal(Color.Blue, sourcePixels[100, 192]);
+                    Assert.Equal(Rgba32.Blue, sourcePixels[100, 192]);
                 }
             }
         }
@@ -183,8 +184,8 @@ namespace ImageSharp.Tests.Drawing
                 using (FileStream output = File.OpenWrite($"{path}/Dashed.png"))
                 {
                     image
-                        .BackgroundColor(Color.Blue)
-                        .Draw(Pens.Dash(Color.HotPink, 5), simplePath.Clip(hole1))
+                        .BackgroundColor(Rgba32.Blue)
+                        .Draw(Pens.Dash(Rgba32.HotPink, 5), simplePath.Clip(hole1))
                         .Save(output);
                 }
             }
@@ -204,22 +205,22 @@ namespace ImageSharp.Tests.Drawing
                             new Vector2(37, 85),
                             new Vector2(93, 85),
                             new Vector2(65, 137)));
-            Color color = new Color(Color.HotPink.R, Color.HotPink.G, Color.HotPink.B, 150);
+            Rgba32 color = new Rgba32(Rgba32.HotPink.R, Rgba32.HotPink.G, Rgba32.HotPink.B, 150);
 
             using (Image image = new Image(500, 500))
             {
                 using (FileStream output = File.OpenWrite($"{path}/Opacity.png"))
                 {
                     image
-                        .BackgroundColor(Color.Blue)
+                        .BackgroundColor(Rgba32.Blue)
                         .Draw(color, 5, simplePath.Clip(hole1))
                         .Save(output);
                 }
 
                 //shift background color towards forground color by the opacity amount
-                Color mergedColor = new Color(Vector4.Lerp(Color.Blue.ToVector4(), Color.HotPink.ToVector4(), 150f / 255f));
+                Rgba32 mergedColor = new Rgba32(Vector4.Lerp(Rgba32.Blue.ToVector4(), Rgba32.HotPink.ToVector4(), 150f / 255f));
 
-                using (PixelAccessor<Color> sourcePixels = image.Lock())
+                using (PixelAccessor<Rgba32> sourcePixels = image.Lock())
                 {
                     Assert.Equal(mergedColor, sourcePixels[10, 10]);
 
@@ -234,14 +235,14 @@ namespace ImageSharp.Tests.Drawing
 
                     Assert.Equal(mergedColor, sourcePixels[65, 137]);
 
-                    Assert.Equal(Color.Blue, sourcePixels[2, 2]);
+                    Assert.Equal(Rgba32.Blue, sourcePixels[2, 2]);
 
                     //inside hole
-                    Assert.Equal(Color.Blue, sourcePixels[57, 99]);
+                    Assert.Equal(Rgba32.Blue, sourcePixels[57, 99]);
 
 
                     //inside shape
-                    Assert.Equal(Color.Blue, sourcePixels[100, 192]);
+                    Assert.Equal(Rgba32.Blue, sourcePixels[100, 192]);
                 }
             }
         }
diff --git a/tests/ImageSharp.Tests/Drawing/LineTests.cs b/tests/ImageSharp.Tests/Drawing/LineTests.cs
index 81efd933ba..87bda30bed 100644
--- a/tests/ImageSharp.Tests/Drawing/LineTests.cs
+++ b/tests/ImageSharp.Tests/Drawing/LineTests.cs
@@ -10,6 +10,9 @@ namespace ImageSharp.Tests.Drawing
 
     using System.IO;
     using System.Numerics;
+
+    using ImageSharp.PixelFormats;
+
     using Xunit;
 
     public class LineTests : FileTestBase
@@ -23,8 +26,8 @@ namespace ImageSharp.Tests.Drawing
                 using (FileStream output = File.OpenWrite($"{path}/Simple.png"))
                 {
                     image
-                        .BackgroundColor(Color.Blue)
-                        .DrawLines(Color.HotPink, 5,
+                        .BackgroundColor(Rgba32.Blue)
+                        .DrawLines(Rgba32.HotPink, 5,
                         new[] {
                             new Vector2(10, 10),
                             new Vector2(200, 150),
@@ -33,13 +36,13 @@ namespace ImageSharp.Tests.Drawing
                         .Save(output);
                 }
 
-                using (PixelAccessor<Color> sourcePixels = image.Lock())
+                using (PixelAccessor<Rgba32> sourcePixels = image.Lock())
                 {
-                    Assert.Equal(Color.HotPink, sourcePixels[9, 9]);
+                    Assert.Equal(Rgba32.HotPink, sourcePixels[9, 9]);
 
-                    Assert.Equal(Color.HotPink, sourcePixels[199, 149]);
+                    Assert.Equal(Rgba32.HotPink, sourcePixels[199, 149]);
 
-                    Assert.Equal(Color.Blue, sourcePixels[50, 50]);
+                    Assert.Equal(Rgba32.Blue, sourcePixels[50, 50]);
                 }
             }
         }
@@ -53,8 +56,8 @@ namespace ImageSharp.Tests.Drawing
                 using (FileStream output = File.OpenWrite($"{path}/Simple_noantialias.png"))
                 {
                     image
-                        .BackgroundColor(Color.Blue)
-                        .DrawLines(Color.HotPink, 5,
+                        .BackgroundColor(Rgba32.Blue)
+                        .DrawLines(Rgba32.HotPink, 5,
                         new[] {
                             new Vector2(10, 10),
                             new Vector2(200, 150),
@@ -64,13 +67,13 @@ namespace ImageSharp.Tests.Drawing
                         .Save(output);
                 }
 
-                using (PixelAccessor<Color> sourcePixels = image.Lock())
+                using (PixelAccessor<Rgba32> sourcePixels = image.Lock())
                 {
-                    Assert.Equal(Color.HotPink, sourcePixels[9, 9]);
+                    Assert.Equal(Rgba32.HotPink, sourcePixels[9, 9]);
 
-                    Assert.Equal(Color.HotPink, sourcePixels[199, 149]);
+                    Assert.Equal(Rgba32.HotPink, sourcePixels[199, 149]);
 
-                    Assert.Equal(Color.Blue, sourcePixels[50, 50]);
+                    Assert.Equal(Rgba32.Blue, sourcePixels[50, 50]);
                 }
             }
         }
@@ -84,8 +87,8 @@ namespace ImageSharp.Tests.Drawing
                 using (FileStream output = File.OpenWrite($"{path}/Dashed.png"))
                 {
                     image
-                        .BackgroundColor(Color.Blue)
-                        .DrawLines(Pens.Dash(Color.HotPink, 5),
+                        .BackgroundColor(Rgba32.Blue)
+                        .DrawLines(Pens.Dash(Rgba32.HotPink, 5),
                         new[] {
                             new Vector2(10, 10),
                             new Vector2(200, 150),
@@ -105,8 +108,8 @@ namespace ImageSharp.Tests.Drawing
                 using (FileStream output = File.OpenWrite($"{path}/Dot.png"))
                 {
                     image
-                        .BackgroundColor(Color.Blue)
-                        .DrawLines(Pens.Dot(Color.HotPink, 5),
+                        .BackgroundColor(Rgba32.Blue)
+                        .DrawLines(Pens.Dot(Rgba32.HotPink, 5),
                         new[] {
                             new Vector2(10, 10),
                             new Vector2(200, 150),
@@ -126,8 +129,8 @@ namespace ImageSharp.Tests.Drawing
                 using (FileStream output = File.OpenWrite($"{path}/DashDot.png"))
                 {
                     image
-                        .BackgroundColor(Color.Blue)
-                        .DrawLines(Pens.DashDot(Color.HotPink, 5),
+                        .BackgroundColor(Rgba32.Blue)
+                        .DrawLines(Pens.DashDot(Rgba32.HotPink, 5),
                         new[] {
                             new Vector2(10, 10),
                             new Vector2(200, 150),
@@ -147,8 +150,8 @@ namespace ImageSharp.Tests.Drawing
             using (FileStream output = File.OpenWrite($"{path}/DashDotDot.png"))
             {
                 image
-                    .BackgroundColor(Color.Blue)
-                    .DrawLines(Pens.DashDotDot(Color.HotPink, 5), new[] {
+                    .BackgroundColor(Rgba32.Blue)
+                    .DrawLines(Pens.DashDotDot(Rgba32.HotPink, 5), new[] {
                             new Vector2(10, 10),
                             new Vector2(200, 150),
                             new Vector2(50, 300)
@@ -162,7 +165,7 @@ namespace ImageSharp.Tests.Drawing
         {
             string path = this.CreateOutputDirectory("Drawing", "Lines");
 
-            Color color = new Color(Color.HotPink.R, Color.HotPink.G, Color.HotPink.B, 150);
+            Rgba32 color = new Rgba32(Rgba32.HotPink.R, Rgba32.HotPink.G, Rgba32.HotPink.B, 150);
 
             Image image = new Image(500, 500);
 
@@ -170,7 +173,7 @@ namespace ImageSharp.Tests.Drawing
             using (FileStream output = File.OpenWrite($"{path}/Opacity.png"))
             {
                 image
-                    .BackgroundColor(Color.Blue)
+                    .BackgroundColor(Rgba32.Blue)
                     .DrawLines(color, 10, new[] {
                             new Vector2(10, 10),
                             new Vector2(200, 150),
@@ -180,15 +183,15 @@ namespace ImageSharp.Tests.Drawing
             }
 
             //shift background color towards forground color by the opacity amount
-            Color mergedColor = new Color(Vector4.Lerp(Color.Blue.ToVector4(), Color.HotPink.ToVector4(), 150f/255f));
+            Rgba32 mergedColor = new Rgba32(Vector4.Lerp(Rgba32.Blue.ToVector4(), Rgba32.HotPink.ToVector4(), 150f/255f));
 
-            using (PixelAccessor<Color> sourcePixels = image.Lock())
+            using (PixelAccessor<Rgba32> sourcePixels = image.Lock())
             {
                 Assert.Equal(mergedColor, sourcePixels[9, 9]);
 
                 Assert.Equal(mergedColor, sourcePixels[199, 149]);
 
-                Assert.Equal(Color.Blue, sourcePixels[50, 50]);
+                Assert.Equal(Rgba32.Blue, sourcePixels[50, 50]);
             }
         }
 
@@ -202,8 +205,8 @@ namespace ImageSharp.Tests.Drawing
             using (FileStream output = File.OpenWrite($"{path}/Rectangle.png"))
             {
                 image
-                    .BackgroundColor(Color.Blue)
-                    .DrawLines(Color.HotPink, 10, new[] {
+                    .BackgroundColor(Rgba32.Blue)
+                    .DrawLines(Rgba32.HotPink, 10, new[] {
                             new Vector2(10, 10),
                             new Vector2(200, 10),
                             new Vector2(200, 150),
@@ -212,15 +215,15 @@ namespace ImageSharp.Tests.Drawing
                     .Save(output);
             }
 
-            using (PixelAccessor<Color> sourcePixels = image.Lock())
+            using (PixelAccessor<Rgba32> sourcePixels = image.Lock())
             {
-                Assert.Equal(Color.HotPink, sourcePixels[8, 8]);
+                Assert.Equal(Rgba32.HotPink, sourcePixels[8, 8]);
 
-                Assert.Equal(Color.HotPink, sourcePixels[198, 10]);
+                Assert.Equal(Rgba32.HotPink, sourcePixels[198, 10]);
 
-                Assert.Equal(Color.Blue, sourcePixels[10, 50]);
+                Assert.Equal(Rgba32.Blue, sourcePixels[10, 50]);
 
-                Assert.Equal(Color.Blue, sourcePixels[50, 50]);
+                Assert.Equal(Rgba32.Blue, sourcePixels[50, 50]);
             }
         }
 
diff --git a/tests/ImageSharp.Tests/Drawing/Paths/DrawBeziersTests.cs b/tests/ImageSharp.Tests/Drawing/Paths/DrawBeziersTests.cs
index 82e2f72a2f..008df90911 100644
--- a/tests/ImageSharp.Tests/Drawing/Paths/DrawBeziersTests.cs
+++ b/tests/ImageSharp.Tests/Drawing/Paths/DrawBeziersTests.cs
@@ -2,25 +2,24 @@
 namespace ImageSharp.Tests.Drawing.Paths
 {
     using System;
-    using System.IO;
-    using ImageSharp;
+
     using ImageSharp.Drawing.Brushes;
-    using Processing;
-    using System.Collections.Generic;
+
     using Xunit;
     using ImageSharp.Drawing;
     using System.Numerics;
     using SixLabors.Shapes;
     using ImageSharp.Drawing.Processors;
     using ImageSharp.Drawing.Pens;
+    using ImageSharp.PixelFormats;
 
     public class DrawBeziersTests : IDisposable
     {
         float thickness = 7.2f;
         GraphicsOptions noneDefault = new GraphicsOptions();
-        Color color = Color.HotPink;
-        SolidBrush brush = Brushes.Solid(Color.HotPink);
-        Pen pen = new Pen(Color.Firebrick, 99.9f);
+        Rgba32 color = Rgba32.HotPink;
+        SolidBrush brush = Brushes.Solid(Rgba32.HotPink);
+        Pen pen = new Pen(Rgba32.Firebrick, 99.9f);
         Vector2[] points = new Vector2[] {
                     new Vector2(10,10),
                     new Vector2(20,10),
@@ -45,7 +44,7 @@ namespace ImageSharp.Tests.Drawing.Paths
             img.DrawBeziers(brush, thickness, points);
 
             Assert.NotEmpty(img.ProcessorApplications);
-            DrawPathProcessor<Color> processor = Assert.IsType<DrawPathProcessor<Color>>(img.ProcessorApplications[0].processor);
+            DrawPathProcessor<Rgba32> processor = Assert.IsType<DrawPathProcessor<Rgba32>>(img.ProcessorApplications[0].processor);
 
             Assert.Equal(GraphicsOptions.Default, processor.Options);
 
@@ -56,7 +55,7 @@ namespace ImageSharp.Tests.Drawing.Paths
 
             BezierLineSegment segment = Assert.IsType<BezierLineSegment>(vector.LineSegments[0]);
 
-            Pen<Color> pen = Assert.IsType<Pen<Color>>(processor.Pen);
+            Pen<Rgba32> pen = Assert.IsType<Pen<Rgba32>>(processor.Pen);
             Assert.Equal(brush, pen.Brush);
             Assert.Equal(thickness, pen.Width);
         }
@@ -67,7 +66,7 @@ namespace ImageSharp.Tests.Drawing.Paths
             img.DrawBeziers(brush, thickness, points, noneDefault);
 
             Assert.NotEmpty(img.ProcessorApplications);
-            DrawPathProcessor<Color> processor = Assert.IsType<DrawPathProcessor<Color>>(img.ProcessorApplications[0].processor);
+            DrawPathProcessor<Rgba32> processor = Assert.IsType<DrawPathProcessor<Rgba32>>(img.ProcessorApplications[0].processor);
 
             Assert.Equal(noneDefault, processor.Options);
 
@@ -76,7 +75,7 @@ namespace ImageSharp.Tests.Drawing.Paths
             SixLabors.Shapes.Path vector = Assert.IsType<SixLabors.Shapes.Path>(path.Path);
             BezierLineSegment segment = Assert.IsType<BezierLineSegment>(vector.LineSegments[0]);
 
-            Pen<Color> pen = Assert.IsType<Pen<Color>>(processor.Pen);
+            Pen<Rgba32> pen = Assert.IsType<Pen<Rgba32>>(processor.Pen);
             Assert.Equal(brush, pen.Brush);
             Assert.Equal(thickness, pen.Width);
         }
@@ -87,7 +86,7 @@ namespace ImageSharp.Tests.Drawing.Paths
             img.DrawBeziers(color, thickness, points);
 
             Assert.NotEmpty(img.ProcessorApplications);
-            DrawPathProcessor<Color> processor = Assert.IsType<DrawPathProcessor<Color>>(img.ProcessorApplications[0].processor);
+            DrawPathProcessor<Rgba32> processor = Assert.IsType<DrawPathProcessor<Rgba32>>(img.ProcessorApplications[0].processor);
 
             Assert.Equal(GraphicsOptions.Default, processor.Options);
 
@@ -96,10 +95,10 @@ namespace ImageSharp.Tests.Drawing.Paths
             SixLabors.Shapes.Path vector = Assert.IsType<SixLabors.Shapes.Path>(path.Path);
             BezierLineSegment segment = Assert.IsType<BezierLineSegment>(vector.LineSegments[0]);
 
-            Pen<Color> pen = Assert.IsType<Pen<Color>>(processor.Pen);
+            Pen<Rgba32> pen = Assert.IsType<Pen<Rgba32>>(processor.Pen);
             Assert.Equal(thickness, pen.Width);
 
-            SolidBrush<Color> brush = Assert.IsType<SolidBrush<Color>>(pen.Brush);
+            SolidBrush<Rgba32> brush = Assert.IsType<SolidBrush<Rgba32>>(pen.Brush);
             Assert.Equal(color, brush.Color);
         }
 
@@ -109,7 +108,7 @@ namespace ImageSharp.Tests.Drawing.Paths
             img.DrawBeziers(color, thickness, points, noneDefault);
 
             Assert.NotEmpty(img.ProcessorApplications);
-            DrawPathProcessor<Color> processor = Assert.IsType<DrawPathProcessor<Color>>(img.ProcessorApplications[0].processor);
+            DrawPathProcessor<Rgba32> processor = Assert.IsType<DrawPathProcessor<Rgba32>>(img.ProcessorApplications[0].processor);
 
             Assert.Equal(noneDefault, processor.Options);
 
@@ -118,10 +117,10 @@ namespace ImageSharp.Tests.Drawing.Paths
             SixLabors.Shapes.Path vector = Assert.IsType<SixLabors.Shapes.Path>(path.Path);
             BezierLineSegment segment = Assert.IsType<BezierLineSegment>(vector.LineSegments[0]);
 
-            Pen<Color> pen = Assert.IsType<Pen<Color>>(processor.Pen);
+            Pen<Rgba32> pen = Assert.IsType<Pen<Rgba32>>(processor.Pen);
             Assert.Equal(thickness, pen.Width);
 
-            SolidBrush<Color> brush = Assert.IsType<SolidBrush<Color>>(pen.Brush);
+            SolidBrush<Rgba32> brush = Assert.IsType<SolidBrush<Rgba32>>(pen.Brush);
             Assert.Equal(color, brush.Color);
         }
 
@@ -131,7 +130,7 @@ namespace ImageSharp.Tests.Drawing.Paths
             img.DrawBeziers(pen, points);
 
             Assert.NotEmpty(img.ProcessorApplications);
-            DrawPathProcessor<Color> processor = Assert.IsType<DrawPathProcessor<Color>>(img.ProcessorApplications[0].processor);
+            DrawPathProcessor<Rgba32> processor = Assert.IsType<DrawPathProcessor<Rgba32>>(img.ProcessorApplications[0].processor);
 
             Assert.Equal(GraphicsOptions.Default, processor.Options);
 
@@ -149,7 +148,7 @@ namespace ImageSharp.Tests.Drawing.Paths
             img.DrawBeziers(pen, points, noneDefault);
 
             Assert.NotEmpty(img.ProcessorApplications);
-            DrawPathProcessor<Color> processor = Assert.IsType<DrawPathProcessor<Color>>(img.ProcessorApplications[0].processor);
+            DrawPathProcessor<Rgba32> processor = Assert.IsType<DrawPathProcessor<Rgba32>>(img.ProcessorApplications[0].processor);
 
             Assert.Equal(noneDefault, processor.Options);
 
diff --git a/tests/ImageSharp.Tests/Drawing/Paths/DrawLinesTests.cs b/tests/ImageSharp.Tests/Drawing/Paths/DrawLinesTests.cs
index cc126614f6..221cf7f29a 100644
--- a/tests/ImageSharp.Tests/Drawing/Paths/DrawLinesTests.cs
+++ b/tests/ImageSharp.Tests/Drawing/Paths/DrawLinesTests.cs
@@ -2,25 +2,23 @@
 namespace ImageSharp.Tests.Drawing.Paths
 {
     using System;
-    using System.IO;
-    using ImageSharp;
+
     using ImageSharp.Drawing.Brushes;
-    using Processing;
-    using System.Collections.Generic;
     using Xunit;
     using ImageSharp.Drawing;
     using System.Numerics;
     using SixLabors.Shapes;
     using ImageSharp.Drawing.Processors;
     using ImageSharp.Drawing.Pens;
+    using ImageSharp.PixelFormats;
 
     public class DrawLinesTests : IDisposable
     {
         float thickness = 7.2f;
         GraphicsOptions noneDefault = new GraphicsOptions();
-        Color color = Color.HotPink;
-        SolidBrush brush = Brushes.Solid(Color.HotPink);
-        Pen pen = new Pen(Color.Gray, 99.9f);
+        Rgba32 color = Rgba32.HotPink;
+        SolidBrush brush = Brushes.Solid(Rgba32.HotPink);
+        Pen pen = new Pen(Rgba32.Gray, 99.9f);
         Vector2[] points = new Vector2[] {
                     new Vector2(10,10),
                     new Vector2(20,10),
@@ -45,7 +43,7 @@ namespace ImageSharp.Tests.Drawing.Paths
             img.DrawLines(brush, thickness, points);
 
             Assert.NotEmpty(img.ProcessorApplications);
-            DrawPathProcessor<Color> processor = Assert.IsType<DrawPathProcessor<Color>>(img.ProcessorApplications[0].processor);
+            DrawPathProcessor<Rgba32> processor = Assert.IsType<DrawPathProcessor<Rgba32>>(img.ProcessorApplications[0].processor);
 
             Assert.Equal(GraphicsOptions.Default, processor.Options);
 
@@ -54,7 +52,7 @@ namespace ImageSharp.Tests.Drawing.Paths
             SixLabors.Shapes.Path vector = Assert.IsType<SixLabors.Shapes.Path>(path.Path);
             LinearLineSegment segment = Assert.IsType<LinearLineSegment>(vector.LineSegments[0]);
 
-            Pen<Color> pen = Assert.IsType<Pen<Color>>(processor.Pen);
+            Pen<Rgba32> pen = Assert.IsType<Pen<Rgba32>>(processor.Pen);
             Assert.Equal(brush, pen.Brush);
             Assert.Equal(thickness, pen.Width);
         }
@@ -65,7 +63,7 @@ namespace ImageSharp.Tests.Drawing.Paths
             img.DrawLines(brush, thickness, points, noneDefault);
 
             Assert.NotEmpty(img.ProcessorApplications);
-            DrawPathProcessor<Color> processor = Assert.IsType<DrawPathProcessor<Color>>(img.ProcessorApplications[0].processor);
+            DrawPathProcessor<Rgba32> processor = Assert.IsType<DrawPathProcessor<Rgba32>>(img.ProcessorApplications[0].processor);
 
             Assert.Equal(noneDefault, processor.Options);
 
@@ -74,7 +72,7 @@ namespace ImageSharp.Tests.Drawing.Paths
             SixLabors.Shapes.Path vector = Assert.IsType<SixLabors.Shapes.Path>(path.Path);
             LinearLineSegment segment = Assert.IsType<LinearLineSegment>(vector.LineSegments[0]);
 
-            Pen<Color> pen = Assert.IsType<Pen<Color>>(processor.Pen);
+            Pen<Rgba32> pen = Assert.IsType<Pen<Rgba32>>(processor.Pen);
             Assert.Equal(brush, pen.Brush);
             Assert.Equal(thickness, pen.Width);
         }
@@ -85,7 +83,7 @@ namespace ImageSharp.Tests.Drawing.Paths
             img.DrawLines(color, thickness, points);
 
             Assert.NotEmpty(img.ProcessorApplications);
-            DrawPathProcessor<Color> processor = Assert.IsType<DrawPathProcessor<Color>>(img.ProcessorApplications[0].processor);
+            DrawPathProcessor<Rgba32> processor = Assert.IsType<DrawPathProcessor<Rgba32>>(img.ProcessorApplications[0].processor);
 
             Assert.Equal(GraphicsOptions.Default, processor.Options);
 
@@ -94,10 +92,10 @@ namespace ImageSharp.Tests.Drawing.Paths
             SixLabors.Shapes.Path vector = Assert.IsType<SixLabors.Shapes.Path>(path.Path);
             LinearLineSegment segment = Assert.IsType<LinearLineSegment>(vector.LineSegments[0]);
 
-            Pen<Color> pen = Assert.IsType<Pen<Color>>(processor.Pen);
+            Pen<Rgba32> pen = Assert.IsType<Pen<Rgba32>>(processor.Pen);
             Assert.Equal(thickness, pen.Width);
 
-            SolidBrush<Color> brush = Assert.IsType<SolidBrush<Color>>(pen.Brush);
+            SolidBrush<Rgba32> brush = Assert.IsType<SolidBrush<Rgba32>>(pen.Brush);
             Assert.Equal(color, brush.Color);
         }
 
@@ -107,7 +105,7 @@ namespace ImageSharp.Tests.Drawing.Paths
             img.DrawLines(color, thickness, points, noneDefault);
 
             Assert.NotEmpty(img.ProcessorApplications);
-            DrawPathProcessor<Color> processor = Assert.IsType<DrawPathProcessor<Color>>(img.ProcessorApplications[0].processor);
+            DrawPathProcessor<Rgba32> processor = Assert.IsType<DrawPathProcessor<Rgba32>>(img.ProcessorApplications[0].processor);
 
             Assert.Equal(noneDefault, processor.Options);
 
@@ -116,10 +114,10 @@ namespace ImageSharp.Tests.Drawing.Paths
             SixLabors.Shapes.Path vector = Assert.IsType<SixLabors.Shapes.Path>(path.Path);
             LinearLineSegment segment = Assert.IsType<LinearLineSegment>(vector.LineSegments[0]);
 
-            Pen<Color> pen = Assert.IsType<Pen<Color>>(processor.Pen);
+            Pen<Rgba32> pen = Assert.IsType<Pen<Rgba32>>(processor.Pen);
             Assert.Equal(thickness, pen.Width);
 
-            SolidBrush<Color> brush = Assert.IsType<SolidBrush<Color>>(pen.Brush);
+            SolidBrush<Rgba32> brush = Assert.IsType<SolidBrush<Rgba32>>(pen.Brush);
             Assert.Equal(color, brush.Color);
         }
 
@@ -129,7 +127,7 @@ namespace ImageSharp.Tests.Drawing.Paths
             img.DrawLines(pen, points);
 
             Assert.NotEmpty(img.ProcessorApplications);
-            DrawPathProcessor<Color> processor = Assert.IsType<DrawPathProcessor<Color>>(img.ProcessorApplications[0].processor);
+            DrawPathProcessor<Rgba32> processor = Assert.IsType<DrawPathProcessor<Rgba32>>(img.ProcessorApplications[0].processor);
 
             Assert.Equal(GraphicsOptions.Default, processor.Options);
 
@@ -147,7 +145,7 @@ namespace ImageSharp.Tests.Drawing.Paths
             img.DrawLines(pen, points, noneDefault);
 
             Assert.NotEmpty(img.ProcessorApplications);
-            DrawPathProcessor<Color> processor = Assert.IsType<DrawPathProcessor<Color>>(img.ProcessorApplications[0].processor);
+            DrawPathProcessor<Rgba32> processor = Assert.IsType<DrawPathProcessor<Rgba32>>(img.ProcessorApplications[0].processor);
 
             Assert.Equal(noneDefault, processor.Options);
 
diff --git a/tests/ImageSharp.Tests/Drawing/Paths/DrawPath.cs b/tests/ImageSharp.Tests/Drawing/Paths/DrawPath.cs
index 6c1c068135..07be85b859 100644
--- a/tests/ImageSharp.Tests/Drawing/Paths/DrawPath.cs
+++ b/tests/ImageSharp.Tests/Drawing/Paths/DrawPath.cs
@@ -2,25 +2,24 @@
 namespace ImageSharp.Tests.Drawing.Paths
 {
     using System;
-    using System.IO;
-    using ImageSharp;
+
     using ImageSharp.Drawing.Brushes;
-    using Processing;
-    using System.Collections.Generic;
+
     using Xunit;
     using ImageSharp.Drawing;
     using System.Numerics;
     using SixLabors.Shapes;
     using ImageSharp.Drawing.Processors;
     using ImageSharp.Drawing.Pens;
+    using ImageSharp.PixelFormats;
 
     public class DrawPath : IDisposable
     {
         float thickness = 7.2f;
         GraphicsOptions noneDefault = new GraphicsOptions();
-        Color color = Color.HotPink;
-        SolidBrush brush = Brushes.Solid(Color.HotPink);
-        Pen pen = new Pen(Color.Gray, 99.9f);
+        Rgba32 color = Rgba32.HotPink;
+        SolidBrush brush = Brushes.Solid(Rgba32.HotPink);
+        Pen pen = new Pen(Rgba32.Gray, 99.9f);
         IPath path = new SixLabors.Shapes.Path(new LinearLineSegment(new Vector2[] {
                     new Vector2(10,10),
                     new Vector2(20,10),
@@ -45,14 +44,14 @@ namespace ImageSharp.Tests.Drawing.Paths
             img.Draw(brush, thickness, path);
 
             Assert.NotEmpty(img.ProcessorApplications);
-            DrawPathProcessor<Color> processor = Assert.IsType<DrawPathProcessor<Color>>(img.ProcessorApplications[0].processor);
+            DrawPathProcessor<Rgba32> processor = Assert.IsType<DrawPathProcessor<Rgba32>>(img.ProcessorApplications[0].processor);
 
             Assert.Equal(GraphicsOptions.Default, processor.Options);
 
             ShapePath shapepath = Assert.IsType<ShapePath>(processor.Path);
             Assert.Equal(path, shapepath.Path);
             
-            Pen<Color> pen = Assert.IsType<Pen<Color>>(processor.Pen);
+            Pen<Rgba32> pen = Assert.IsType<Pen<Rgba32>>(processor.Pen);
             Assert.Equal(brush, pen.Brush);
             Assert.Equal(thickness, pen.Width);
         }
@@ -63,14 +62,14 @@ namespace ImageSharp.Tests.Drawing.Paths
             img.Draw(brush, thickness, path, noneDefault);
 
             Assert.NotEmpty(img.ProcessorApplications);
-            DrawPathProcessor<Color> processor = Assert.IsType<DrawPathProcessor<Color>>(img.ProcessorApplications[0].processor);
+            DrawPathProcessor<Rgba32> processor = Assert.IsType<DrawPathProcessor<Rgba32>>(img.ProcessorApplications[0].processor);
 
             Assert.Equal(noneDefault, processor.Options);
 
             ShapePath shapepath = Assert.IsType<ShapePath>(processor.Path);
             Assert.Equal(path, shapepath.Path);
 
-            Pen<Color> pen = Assert.IsType<Pen<Color>>(processor.Pen);
+            Pen<Rgba32> pen = Assert.IsType<Pen<Rgba32>>(processor.Pen);
             Assert.Equal(brush, pen.Brush);
             Assert.Equal(thickness, pen.Width);
         }
@@ -81,17 +80,17 @@ namespace ImageSharp.Tests.Drawing.Paths
             img.Draw(color, thickness, path);
 
             Assert.NotEmpty(img.ProcessorApplications);
-            DrawPathProcessor<Color> processor = Assert.IsType<DrawPathProcessor<Color>>(img.ProcessorApplications[0].processor);
+            DrawPathProcessor<Rgba32> processor = Assert.IsType<DrawPathProcessor<Rgba32>>(img.ProcessorApplications[0].processor);
 
             Assert.Equal(GraphicsOptions.Default, processor.Options);
 
             ShapePath shapepath = Assert.IsType<ShapePath>(processor.Path);
             Assert.Equal(path, shapepath.Path);
 
-            Pen<Color> pen = Assert.IsType<Pen<Color>>(processor.Pen);
+            Pen<Rgba32> pen = Assert.IsType<Pen<Rgba32>>(processor.Pen);
             Assert.Equal(thickness, pen.Width);
 
-            SolidBrush<Color> brush = Assert.IsType<SolidBrush<Color>>(pen.Brush);
+            SolidBrush<Rgba32> brush = Assert.IsType<SolidBrush<Rgba32>>(pen.Brush);
             Assert.Equal(color, brush.Color);
         }
 
@@ -101,17 +100,17 @@ namespace ImageSharp.Tests.Drawing.Paths
             img.Draw(color, thickness, path, noneDefault);
 
             Assert.NotEmpty(img.ProcessorApplications);
-            DrawPathProcessor<Color> processor = Assert.IsType<DrawPathProcessor<Color>>(img.ProcessorApplications[0].processor);
+            DrawPathProcessor<Rgba32> processor = Assert.IsType<DrawPathProcessor<Rgba32>>(img.ProcessorApplications[0].processor);
 
             Assert.Equal(noneDefault, processor.Options);
 
             ShapePath shapepath = Assert.IsType<ShapePath>(processor.Path);
             Assert.Equal(path, shapepath.Path);
 
-            Pen<Color> pen = Assert.IsType<Pen<Color>>(processor.Pen);
+            Pen<Rgba32> pen = Assert.IsType<Pen<Rgba32>>(processor.Pen);
             Assert.Equal(thickness, pen.Width);
 
-            SolidBrush<Color> brush = Assert.IsType<SolidBrush<Color>>(pen.Brush);
+            SolidBrush<Rgba32> brush = Assert.IsType<SolidBrush<Rgba32>>(pen.Brush);
             Assert.Equal(color, brush.Color);
         }
 
@@ -121,7 +120,7 @@ namespace ImageSharp.Tests.Drawing.Paths
             img.Draw(pen, path);
 
             Assert.NotEmpty(img.ProcessorApplications);
-            DrawPathProcessor<Color> processor = Assert.IsType<DrawPathProcessor<Color>>(img.ProcessorApplications[0].processor);
+            DrawPathProcessor<Rgba32> processor = Assert.IsType<DrawPathProcessor<Rgba32>>(img.ProcessorApplications[0].processor);
 
             Assert.Equal(GraphicsOptions.Default, processor.Options);
 
@@ -137,7 +136,7 @@ namespace ImageSharp.Tests.Drawing.Paths
             img.Draw(pen, path, noneDefault);
 
             Assert.NotEmpty(img.ProcessorApplications);
-            DrawPathProcessor<Color> processor = Assert.IsType<DrawPathProcessor<Color>>(img.ProcessorApplications[0].processor);
+            DrawPathProcessor<Rgba32> processor = Assert.IsType<DrawPathProcessor<Rgba32>>(img.ProcessorApplications[0].processor);
 
             Assert.Equal(noneDefault, processor.Options);
 
diff --git a/tests/ImageSharp.Tests/Drawing/Paths/DrawPolygon.cs b/tests/ImageSharp.Tests/Drawing/Paths/DrawPolygon.cs
index 9de0523313..bd90a460df 100644
--- a/tests/ImageSharp.Tests/Drawing/Paths/DrawPolygon.cs
+++ b/tests/ImageSharp.Tests/Drawing/Paths/DrawPolygon.cs
@@ -2,25 +2,24 @@
 namespace ImageSharp.Tests.Drawing.Paths
 {
     using System;
-    using System.IO;
-    using ImageSharp;
+
     using ImageSharp.Drawing.Brushes;
-    using Processing;
-    using System.Collections.Generic;
+
     using Xunit;
     using ImageSharp.Drawing;
     using System.Numerics;
     using SixLabors.Shapes;
     using ImageSharp.Drawing.Processors;
     using ImageSharp.Drawing.Pens;
+    using ImageSharp.PixelFormats;
 
     public class DrawPolygon : IDisposable
     {
         float thickness = 7.2f;
         GraphicsOptions noneDefault = new GraphicsOptions();
-        Color color = Color.HotPink;
-        SolidBrush brush = Brushes.Solid(Color.HotPink);
-        Pen pen = new Pen(Color.Gray, 99.9f);
+        Rgba32 color = Rgba32.HotPink;
+        SolidBrush brush = Brushes.Solid(Rgba32.HotPink);
+        Pen pen = new Pen(Rgba32.Gray, 99.9f);
         Vector2[] points = new Vector2[] {
                     new Vector2(10,10),
                     new Vector2(20,10),
@@ -45,7 +44,7 @@ namespace ImageSharp.Tests.Drawing.Paths
             img.DrawPolygon(brush, thickness, points);
 
             Assert.NotEmpty(img.ProcessorApplications);
-            DrawPathProcessor<Color> processor = Assert.IsType<DrawPathProcessor<Color>>(img.ProcessorApplications[0].processor);
+            DrawPathProcessor<Rgba32> processor = Assert.IsType<DrawPathProcessor<Rgba32>>(img.ProcessorApplications[0].processor);
 
             Assert.Equal(GraphicsOptions.Default, processor.Options);
 
@@ -54,7 +53,7 @@ namespace ImageSharp.Tests.Drawing.Paths
             Polygon vector = Assert.IsType<SixLabors.Shapes.Polygon>(path.Path);
             LinearLineSegment segment = Assert.IsType<LinearLineSegment>(vector.LineSegments[0]);
 
-            Pen<Color> pen = Assert.IsType<Pen<Color>>(processor.Pen);
+            Pen<Rgba32> pen = Assert.IsType<Pen<Rgba32>>(processor.Pen);
             Assert.Equal(brush, pen.Brush);
             Assert.Equal(thickness, pen.Width);
         }
@@ -65,7 +64,7 @@ namespace ImageSharp.Tests.Drawing.Paths
             img.DrawPolygon(brush, thickness, points, noneDefault);
 
             Assert.NotEmpty(img.ProcessorApplications);
-            DrawPathProcessor<Color> processor = Assert.IsType<DrawPathProcessor<Color>>(img.ProcessorApplications[0].processor);
+            DrawPathProcessor<Rgba32> processor = Assert.IsType<DrawPathProcessor<Rgba32>>(img.ProcessorApplications[0].processor);
 
             Assert.Equal(noneDefault, processor.Options);
 
@@ -74,7 +73,7 @@ namespace ImageSharp.Tests.Drawing.Paths
             Polygon vector = Assert.IsType<SixLabors.Shapes.Polygon>(path.Path);
             LinearLineSegment segment = Assert.IsType<LinearLineSegment>(vector.LineSegments[0]);
 
-            Pen<Color> pen = Assert.IsType<Pen<Color>>(processor.Pen);
+            Pen<Rgba32> pen = Assert.IsType<Pen<Rgba32>>(processor.Pen);
             Assert.Equal(brush, pen.Brush);
             Assert.Equal(thickness, pen.Width);
         }
@@ -85,7 +84,7 @@ namespace ImageSharp.Tests.Drawing.Paths
             img.DrawPolygon(color, thickness, points);
 
             Assert.NotEmpty(img.ProcessorApplications);
-            DrawPathProcessor<Color> processor = Assert.IsType<DrawPathProcessor<Color>>(img.ProcessorApplications[0].processor);
+            DrawPathProcessor<Rgba32> processor = Assert.IsType<DrawPathProcessor<Rgba32>>(img.ProcessorApplications[0].processor);
 
             Assert.Equal(GraphicsOptions.Default, processor.Options);
 
@@ -94,10 +93,10 @@ namespace ImageSharp.Tests.Drawing.Paths
             Polygon vector = Assert.IsType<SixLabors.Shapes.Polygon>(path.Path);
             LinearLineSegment segment = Assert.IsType<LinearLineSegment>(vector.LineSegments[0]);
 
-            Pen<Color> pen = Assert.IsType<Pen<Color>>(processor.Pen);
+            Pen<Rgba32> pen = Assert.IsType<Pen<Rgba32>>(processor.Pen);
             Assert.Equal(thickness, pen.Width);
 
-            SolidBrush<Color> brush = Assert.IsType<SolidBrush<Color>>(pen.Brush);
+            SolidBrush<Rgba32> brush = Assert.IsType<SolidBrush<Rgba32>>(pen.Brush);
             Assert.Equal(color, brush.Color);
         }
 
@@ -107,7 +106,7 @@ namespace ImageSharp.Tests.Drawing.Paths
             img.DrawPolygon(color, thickness, points, noneDefault);
 
             Assert.NotEmpty(img.ProcessorApplications);
-            DrawPathProcessor<Color> processor = Assert.IsType<DrawPathProcessor<Color>>(img.ProcessorApplications[0].processor);
+            DrawPathProcessor<Rgba32> processor = Assert.IsType<DrawPathProcessor<Rgba32>>(img.ProcessorApplications[0].processor);
 
             Assert.Equal(noneDefault, processor.Options);
 
@@ -116,10 +115,10 @@ namespace ImageSharp.Tests.Drawing.Paths
             Polygon vector = Assert.IsType<SixLabors.Shapes.Polygon>(path.Path);
             LinearLineSegment segment = Assert.IsType<LinearLineSegment>(vector.LineSegments[0]);
 
-            Pen<Color> pen = Assert.IsType<Pen<Color>>(processor.Pen);
+            Pen<Rgba32> pen = Assert.IsType<Pen<Rgba32>>(processor.Pen);
             Assert.Equal(thickness, pen.Width);
 
-            SolidBrush<Color> brush = Assert.IsType<SolidBrush<Color>>(pen.Brush);
+            SolidBrush<Rgba32> brush = Assert.IsType<SolidBrush<Rgba32>>(pen.Brush);
             Assert.Equal(color, brush.Color);
         }
 
@@ -129,7 +128,7 @@ namespace ImageSharp.Tests.Drawing.Paths
             img.DrawPolygon(pen, points);
 
             Assert.NotEmpty(img.ProcessorApplications);
-            DrawPathProcessor<Color> processor = Assert.IsType<DrawPathProcessor<Color>>(img.ProcessorApplications[0].processor);
+            DrawPathProcessor<Rgba32> processor = Assert.IsType<DrawPathProcessor<Rgba32>>(img.ProcessorApplications[0].processor);
 
             Assert.Equal(GraphicsOptions.Default, processor.Options);
 
@@ -147,7 +146,7 @@ namespace ImageSharp.Tests.Drawing.Paths
             img.DrawPolygon(pen, points, noneDefault);
 
             Assert.NotEmpty(img.ProcessorApplications);
-            DrawPathProcessor<Color> processor = Assert.IsType<DrawPathProcessor<Color>>(img.ProcessorApplications[0].processor);
+            DrawPathProcessor<Rgba32> processor = Assert.IsType<DrawPathProcessor<Rgba32>>(img.ProcessorApplications[0].processor);
 
             Assert.Equal(noneDefault, processor.Options);
 
diff --git a/tests/ImageSharp.Tests/Drawing/Paths/DrawRectangle.cs b/tests/ImageSharp.Tests/Drawing/Paths/DrawRectangle.cs
index 215d5a7c70..7ebc6b14f3 100644
--- a/tests/ImageSharp.Tests/Drawing/Paths/DrawRectangle.cs
+++ b/tests/ImageSharp.Tests/Drawing/Paths/DrawRectangle.cs
@@ -2,25 +2,21 @@
 namespace ImageSharp.Tests.Drawing.Paths
 {
     using System;
-    using System.IO;
     using ImageSharp;
     using ImageSharp.Drawing.Brushes;
-    using Processing;
-    using System.Collections.Generic;
     using Xunit;
     using ImageSharp.Drawing;
-    using System.Numerics;
-    using SixLabors.Shapes;
     using ImageSharp.Drawing.Processors;
     using ImageSharp.Drawing.Pens;
+    using ImageSharp.PixelFormats;
 
     public class DrawRectangle : IDisposable
     {
         float thickness = 7.2f;
         GraphicsOptions noneDefault = new GraphicsOptions();
-        Color color = Color.HotPink;
-        SolidBrush brush = Brushes.Solid(Color.HotPink);
-        Pen pen = new Pen(Color.Gray, 99.9f);
+        Rgba32 color = Rgba32.HotPink;
+        SolidBrush brush = Brushes.Solid(Rgba32.HotPink);
+        Pen pen = new Pen(Rgba32.Gray, 99.9f);
         ImageSharp.Rectangle rectangle = new ImageSharp.Rectangle(10, 10, 98, 324);
 
         private ProcessorWatchingImage img;
@@ -41,7 +37,7 @@ namespace ImageSharp.Tests.Drawing.Paths
             img.Draw(brush, thickness, rectangle);
 
             Assert.NotEmpty(img.ProcessorApplications);
-            DrawPathProcessor<Color> processor = Assert.IsType<DrawPathProcessor<Color>>(img.ProcessorApplications[0].processor);
+            DrawPathProcessor<Rgba32> processor = Assert.IsType<DrawPathProcessor<Rgba32>>(img.ProcessorApplications[0].processor);
 
             Assert.Equal(GraphicsOptions.Default, processor.Options);
 
@@ -53,7 +49,7 @@ namespace ImageSharp.Tests.Drawing.Paths
             Assert.Equal(rect.Size.Width, rectangle.Width);
             Assert.Equal(rect.Size.Height, rectangle.Height);
 
-            Pen<Color> pen = Assert.IsType<Pen<Color>>(processor.Pen);
+            Pen<Rgba32> pen = Assert.IsType<Pen<Rgba32>>(processor.Pen);
             Assert.Equal(brush, pen.Brush);
             Assert.Equal(thickness, pen.Width);
         }
@@ -64,7 +60,7 @@ namespace ImageSharp.Tests.Drawing.Paths
             img.Draw(brush, thickness, rectangle, noneDefault);
 
             Assert.NotEmpty(img.ProcessorApplications);
-            DrawPathProcessor<Color> processor = Assert.IsType<DrawPathProcessor<Color>>(img.ProcessorApplications[0].processor);
+            DrawPathProcessor<Rgba32> processor = Assert.IsType<DrawPathProcessor<Rgba32>>(img.ProcessorApplications[0].processor);
 
             Assert.Equal(noneDefault, processor.Options);
 
@@ -77,7 +73,7 @@ namespace ImageSharp.Tests.Drawing.Paths
             Assert.Equal(rect.Size.Width, rectangle.Width);
             Assert.Equal(rect.Size.Height, rectangle.Height);
 
-            Pen<Color> pen = Assert.IsType<Pen<Color>>(processor.Pen);
+            Pen<Rgba32> pen = Assert.IsType<Pen<Rgba32>>(processor.Pen);
             Assert.Equal(brush, pen.Brush);
             Assert.Equal(thickness, pen.Width);
         }
@@ -88,7 +84,7 @@ namespace ImageSharp.Tests.Drawing.Paths
             img.Draw(color, thickness, rectangle);
 
             Assert.NotEmpty(img.ProcessorApplications);
-            DrawPathProcessor<Color> processor = Assert.IsType<DrawPathProcessor<Color>>(img.ProcessorApplications[0].processor);
+            DrawPathProcessor<Rgba32> processor = Assert.IsType<DrawPathProcessor<Rgba32>>(img.ProcessorApplications[0].processor);
 
             Assert.Equal(GraphicsOptions.Default, processor.Options);
 
@@ -101,10 +97,10 @@ namespace ImageSharp.Tests.Drawing.Paths
             Assert.Equal(rect.Size.Width, rectangle.Width);
             Assert.Equal(rect.Size.Height, rectangle.Height);
 
-            Pen<Color> pen = Assert.IsType<Pen<Color>>(processor.Pen);
+            Pen<Rgba32> pen = Assert.IsType<Pen<Rgba32>>(processor.Pen);
             Assert.Equal(thickness, pen.Width);
 
-            SolidBrush<Color> brush = Assert.IsType<SolidBrush<Color>>(pen.Brush);
+            SolidBrush<Rgba32> brush = Assert.IsType<SolidBrush<Rgba32>>(pen.Brush);
             Assert.Equal(color, brush.Color);
         }
 
@@ -114,7 +110,7 @@ namespace ImageSharp.Tests.Drawing.Paths
             img.Draw(color, thickness, rectangle, noneDefault);
 
             Assert.NotEmpty(img.ProcessorApplications);
-            DrawPathProcessor<Color> processor = Assert.IsType<DrawPathProcessor<Color>>(img.ProcessorApplications[0].processor);
+            DrawPathProcessor<Rgba32> processor = Assert.IsType<DrawPathProcessor<Rgba32>>(img.ProcessorApplications[0].processor);
 
             Assert.Equal(noneDefault, processor.Options);
 
@@ -127,10 +123,10 @@ namespace ImageSharp.Tests.Drawing.Paths
             Assert.Equal(rect.Size.Width, rectangle.Width);
             Assert.Equal(rect.Size.Height, rectangle.Height);
 
-            Pen<Color> pen = Assert.IsType<Pen<Color>>(processor.Pen);
+            Pen<Rgba32> pen = Assert.IsType<Pen<Rgba32>>(processor.Pen);
             Assert.Equal(thickness, pen.Width);
 
-            SolidBrush<Color> brush = Assert.IsType<SolidBrush<Color>>(pen.Brush);
+            SolidBrush<Rgba32> brush = Assert.IsType<SolidBrush<Rgba32>>(pen.Brush);
             Assert.Equal(color, brush.Color);
         }
 
@@ -140,7 +136,7 @@ namespace ImageSharp.Tests.Drawing.Paths
             img.Draw(pen, rectangle);
 
             Assert.NotEmpty(img.ProcessorApplications);
-            DrawPathProcessor<Color> processor = Assert.IsType<DrawPathProcessor<Color>>(img.ProcessorApplications[0].processor);
+            DrawPathProcessor<Rgba32> processor = Assert.IsType<DrawPathProcessor<Rgba32>>(img.ProcessorApplications[0].processor);
 
             Assert.Equal(GraphicsOptions.Default, processor.Options);
 
@@ -162,7 +158,7 @@ namespace ImageSharp.Tests.Drawing.Paths
             img.Draw(pen, rectangle, noneDefault);
 
             Assert.NotEmpty(img.ProcessorApplications);
-            DrawPathProcessor<Color> processor = Assert.IsType<DrawPathProcessor<Color>>(img.ProcessorApplications[0].processor);
+            DrawPathProcessor<Rgba32> processor = Assert.IsType<DrawPathProcessor<Rgba32>>(img.ProcessorApplications[0].processor);
 
             Assert.Equal(noneDefault, processor.Options);
 
diff --git a/tests/ImageSharp.Tests/Drawing/Paths/FillPath.cs b/tests/ImageSharp.Tests/Drawing/Paths/FillPath.cs
index 5ba6580bd7..a639a70cf7 100644
--- a/tests/ImageSharp.Tests/Drawing/Paths/FillPath.cs
+++ b/tests/ImageSharp.Tests/Drawing/Paths/FillPath.cs
@@ -2,23 +2,20 @@
 namespace ImageSharp.Tests.Drawing.Paths
 {
     using System;
-    using System.IO;
     using ImageSharp;
     using ImageSharp.Drawing.Brushes;
-    using Processing;
-    using System.Collections.Generic;
     using Xunit;
     using ImageSharp.Drawing;
     using System.Numerics;
     using SixLabors.Shapes;
     using ImageSharp.Drawing.Processors;
-    using ImageSharp.Drawing.Pens;
+    using ImageSharp.PixelFormats;
 
     public class FillPath : IDisposable
     {
         GraphicsOptions noneDefault = new GraphicsOptions();
-        Color color = Color.HotPink;
-        SolidBrush brush = Brushes.Solid(Color.HotPink);
+        Rgba32 color = Rgba32.HotPink;
+        SolidBrush brush = Brushes.Solid(Rgba32.HotPink);
         IPath path = new SixLabors.Shapes.Path(new LinearLineSegment(new Vector2[] {
                     new Vector2(10,10),
                     new Vector2(20,10),
@@ -43,7 +40,7 @@ namespace ImageSharp.Tests.Drawing.Paths
             img.Fill(brush, path);
 
             Assert.NotEmpty(img.ProcessorApplications);
-            FillRegionProcessor<Color> processor = Assert.IsType<FillRegionProcessor<Color>>(img.ProcessorApplications[0].processor);
+            FillRegionProcessor<Rgba32> processor = Assert.IsType<FillRegionProcessor<Rgba32>>(img.ProcessorApplications[0].processor);
 
             Assert.Equal(GraphicsOptions.Default, processor.Options);
 
@@ -62,7 +59,7 @@ namespace ImageSharp.Tests.Drawing.Paths
             img.Fill(brush, path, noneDefault);
 
             Assert.NotEmpty(img.ProcessorApplications);
-            FillRegionProcessor<Color> processor = Assert.IsType<FillRegionProcessor<Color>>(img.ProcessorApplications[0].processor);
+            FillRegionProcessor<Rgba32> processor = Assert.IsType<FillRegionProcessor<Rgba32>>(img.ProcessorApplications[0].processor);
 
             Assert.Equal(noneDefault, processor.Options);
 
@@ -79,7 +76,7 @@ namespace ImageSharp.Tests.Drawing.Paths
             img.Fill(color, path);
 
             Assert.NotEmpty(img.ProcessorApplications);
-            FillRegionProcessor<Color> processor = Assert.IsType<FillRegionProcessor<Color>>(img.ProcessorApplications[0].processor);
+            FillRegionProcessor<Rgba32> processor = Assert.IsType<FillRegionProcessor<Rgba32>>(img.ProcessorApplications[0].processor);
 
             Assert.Equal(GraphicsOptions.Default, processor.Options);
 
@@ -87,7 +84,7 @@ namespace ImageSharp.Tests.Drawing.Paths
             Polygon polygon = Assert.IsType<Polygon>(region.Shape);
             LinearLineSegment segments = Assert.IsType<LinearLineSegment>(polygon.LineSegments[0]);
 
-            SolidBrush<Color> brush = Assert.IsType<SolidBrush<Color>>(processor.Brush);
+            SolidBrush<Rgba32> brush = Assert.IsType<SolidBrush<Rgba32>>(processor.Brush);
             Assert.Equal(color, brush.Color);
         }
 
@@ -97,7 +94,7 @@ namespace ImageSharp.Tests.Drawing.Paths
             img.Fill(color, path, noneDefault);
 
             Assert.NotEmpty(img.ProcessorApplications);
-            FillRegionProcessor<Color> processor = Assert.IsType<FillRegionProcessor<Color>>(img.ProcessorApplications[0].processor);
+            FillRegionProcessor<Rgba32> processor = Assert.IsType<FillRegionProcessor<Rgba32>>(img.ProcessorApplications[0].processor);
 
             Assert.Equal(noneDefault, processor.Options);
 
@@ -105,7 +102,7 @@ namespace ImageSharp.Tests.Drawing.Paths
             Polygon polygon = Assert.IsType<Polygon>(region.Shape);
             LinearLineSegment segments = Assert.IsType<LinearLineSegment>(polygon.LineSegments[0]);
 
-            SolidBrush<Color> brush = Assert.IsType<SolidBrush<Color>>(processor.Brush);
+            SolidBrush<Rgba32> brush = Assert.IsType<SolidBrush<Rgba32>>(processor.Brush);
             Assert.Equal(color, brush.Color);
         }
     }
diff --git a/tests/ImageSharp.Tests/Drawing/Paths/FillPolygon.cs b/tests/ImageSharp.Tests/Drawing/Paths/FillPolygon.cs
index ad72d4c4ee..2935c43a05 100644
--- a/tests/ImageSharp.Tests/Drawing/Paths/FillPolygon.cs
+++ b/tests/ImageSharp.Tests/Drawing/Paths/FillPolygon.cs
@@ -2,23 +2,20 @@
 namespace ImageSharp.Tests.Drawing.Paths
 {
     using System;
-    using System.IO;
     using ImageSharp;
     using ImageSharp.Drawing.Brushes;
-    using Processing;
-    using System.Collections.Generic;
     using Xunit;
     using ImageSharp.Drawing;
     using System.Numerics;
     using SixLabors.Shapes;
     using ImageSharp.Drawing.Processors;
-    using ImageSharp.Drawing.Pens;
+    using ImageSharp.PixelFormats;
 
     public class FillPolygon : IDisposable
     {
         GraphicsOptions noneDefault = new GraphicsOptions();
-        Color color = Color.HotPink;
-        SolidBrush brush = Brushes.Solid(Color.HotPink);
+        Rgba32 color = Rgba32.HotPink;
+        SolidBrush brush = Brushes.Solid(Rgba32.HotPink);
         Vector2[] path = new Vector2[] {
                     new Vector2(10,10),
                     new Vector2(20,10),
@@ -43,7 +40,7 @@ namespace ImageSharp.Tests.Drawing.Paths
             img.FillPolygon(brush, path);
 
             Assert.NotEmpty(img.ProcessorApplications);
-            FillRegionProcessor<Color> processor = Assert.IsType<FillRegionProcessor<Color>>(img.ProcessorApplications[0].processor);
+            FillRegionProcessor<Rgba32> processor = Assert.IsType<FillRegionProcessor<Rgba32>>(img.ProcessorApplications[0].processor);
 
             Assert.Equal(GraphicsOptions.Default, processor.Options);
 
@@ -60,7 +57,7 @@ namespace ImageSharp.Tests.Drawing.Paths
             img.FillPolygon(brush, path, noneDefault);
 
             Assert.NotEmpty(img.ProcessorApplications);
-            FillRegionProcessor<Color> processor = Assert.IsType<FillRegionProcessor<Color>>(img.ProcessorApplications[0].processor);
+            FillRegionProcessor<Rgba32> processor = Assert.IsType<FillRegionProcessor<Rgba32>>(img.ProcessorApplications[0].processor);
 
             Assert.Equal(noneDefault, processor.Options);
 
@@ -77,7 +74,7 @@ namespace ImageSharp.Tests.Drawing.Paths
             img.FillPolygon(color, path);
             
             Assert.NotEmpty(img.ProcessorApplications);
-            FillRegionProcessor<Color> processor = Assert.IsType<FillRegionProcessor<Color>>(img.ProcessorApplications[0].processor);
+            FillRegionProcessor<Rgba32> processor = Assert.IsType<FillRegionProcessor<Rgba32>>(img.ProcessorApplications[0].processor);
 
             Assert.Equal(GraphicsOptions.Default, processor.Options);
 
@@ -85,7 +82,7 @@ namespace ImageSharp.Tests.Drawing.Paths
             Polygon polygon = Assert.IsType<Polygon>(region.Shape);
             LinearLineSegment segemnt = Assert.IsType<LinearLineSegment>(polygon.LineSegments[0]);
 
-            SolidBrush<Color> brush = Assert.IsType<SolidBrush<Color>>(processor.Brush);
+            SolidBrush<Rgba32> brush = Assert.IsType<SolidBrush<Rgba32>>(processor.Brush);
             Assert.Equal(color, brush.Color);
         }
 
@@ -95,7 +92,7 @@ namespace ImageSharp.Tests.Drawing.Paths
             img.FillPolygon(color, path, noneDefault);
 
             Assert.NotEmpty(img.ProcessorApplications);
-            FillRegionProcessor<Color> processor = Assert.IsType<FillRegionProcessor<Color>>(img.ProcessorApplications[0].processor);
+            FillRegionProcessor<Rgba32> processor = Assert.IsType<FillRegionProcessor<Rgba32>>(img.ProcessorApplications[0].processor);
 
             Assert.Equal(noneDefault, processor.Options);
 
@@ -103,7 +100,7 @@ namespace ImageSharp.Tests.Drawing.Paths
             Polygon polygon = Assert.IsType<Polygon>(region.Shape);
             LinearLineSegment segemnt = Assert.IsType<LinearLineSegment>(polygon.LineSegments[0]);
 
-            SolidBrush<Color> brush = Assert.IsType<SolidBrush<Color>>(processor.Brush);
+            SolidBrush<Rgba32> brush = Assert.IsType<SolidBrush<Rgba32>>(processor.Brush);
             Assert.Equal(color, brush.Color);
         }
     }
diff --git a/tests/ImageSharp.Tests/Drawing/Paths/FillRectangle.cs b/tests/ImageSharp.Tests/Drawing/Paths/FillRectangle.cs
index f6b1c4adef..4657db9886 100644
--- a/tests/ImageSharp.Tests/Drawing/Paths/FillRectangle.cs
+++ b/tests/ImageSharp.Tests/Drawing/Paths/FillRectangle.cs
@@ -2,23 +2,19 @@
 namespace ImageSharp.Tests.Drawing.Paths
 {
     using System;
-    using System.IO;
-    using ImageSharp;
+
     using ImageSharp.Drawing.Brushes;
-    using Processing;
-    using System.Collections.Generic;
+
     using Xunit;
     using ImageSharp.Drawing;
-    using System.Numerics;
-    using SixLabors.Shapes;
     using ImageSharp.Drawing.Processors;
-    using ImageSharp.Drawing.Pens;
+    using ImageSharp.PixelFormats;
 
     public class FillRectangle : IDisposable
     {
         GraphicsOptions noneDefault = new GraphicsOptions();
-        Color color = Color.HotPink;
-        SolidBrush brush = Brushes.Solid(Color.HotPink);
+        Rgba32 color = Rgba32.HotPink;
+        SolidBrush brush = Brushes.Solid(Rgba32.HotPink);
         ImageSharp.Rectangle rectangle = new ImageSharp.Rectangle(10, 10, 77, 76);
 
         private ProcessorWatchingImage img;
@@ -39,7 +35,7 @@ namespace ImageSharp.Tests.Drawing.Paths
             img.Fill(brush, rectangle);
 
             Assert.NotEmpty(img.ProcessorApplications);
-            FillRegionProcessor<Color> processor = Assert.IsType<FillRegionProcessor<Color>>(img.ProcessorApplications[0].processor);
+            FillRegionProcessor<Rgba32> processor = Assert.IsType<FillRegionProcessor<Rgba32>>(img.ProcessorApplications[0].processor);
 
             Assert.Equal(GraphicsOptions.Default, processor.Options);
 
@@ -59,7 +55,7 @@ namespace ImageSharp.Tests.Drawing.Paths
             img.Fill(brush, rectangle, noneDefault);
 
             Assert.NotEmpty(img.ProcessorApplications);
-            FillRegionProcessor<Color> processor = Assert.IsType<FillRegionProcessor<Color>>(img.ProcessorApplications[0].processor);
+            FillRegionProcessor<Rgba32> processor = Assert.IsType<FillRegionProcessor<Rgba32>>(img.ProcessorApplications[0].processor);
 
             Assert.Equal(noneDefault, processor.Options);
 
@@ -79,7 +75,7 @@ namespace ImageSharp.Tests.Drawing.Paths
             img.Fill(color, rectangle);
             
             Assert.NotEmpty(img.ProcessorApplications);
-            FillRegionProcessor<Color> processor = Assert.IsType<FillRegionProcessor<Color>>(img.ProcessorApplications[0].processor);
+            FillRegionProcessor<Rgba32> processor = Assert.IsType<FillRegionProcessor<Rgba32>>(img.ProcessorApplications[0].processor);
 
             Assert.Equal(GraphicsOptions.Default, processor.Options);
 
@@ -90,7 +86,7 @@ namespace ImageSharp.Tests.Drawing.Paths
             Assert.Equal(rect.Size.Width, rectangle.Width);
             Assert.Equal(rect.Size.Height, rectangle.Height);
 
-            SolidBrush<Color> brush = Assert.IsType<SolidBrush<Color>>(processor.Brush);
+            SolidBrush<Rgba32> brush = Assert.IsType<SolidBrush<Rgba32>>(processor.Brush);
             Assert.Equal(color, brush.Color);
         }
 
@@ -100,7 +96,7 @@ namespace ImageSharp.Tests.Drawing.Paths
             img.Fill(color, rectangle, noneDefault);
 
             Assert.NotEmpty(img.ProcessorApplications);
-            FillRegionProcessor<Color> processor = Assert.IsType<FillRegionProcessor<Color>>(img.ProcessorApplications[0].processor);
+            FillRegionProcessor<Rgba32> processor = Assert.IsType<FillRegionProcessor<Rgba32>>(img.ProcessorApplications[0].processor);
 
             Assert.Equal(noneDefault, processor.Options);
 
@@ -111,7 +107,7 @@ namespace ImageSharp.Tests.Drawing.Paths
             Assert.Equal(rect.Size.Width, rectangle.Width);
             Assert.Equal(rect.Size.Height, rectangle.Height);
 
-            SolidBrush<Color> brush = Assert.IsType<SolidBrush<Color>>(processor.Brush);
+            SolidBrush<Rgba32> brush = Assert.IsType<SolidBrush<Rgba32>>(processor.Brush);
             Assert.Equal(color, brush.Color);
         }
     }
diff --git a/tests/ImageSharp.Tests/Drawing/Paths/ProcessorWatchingImage.cs b/tests/ImageSharp.Tests/Drawing/Paths/ProcessorWatchingImage.cs
index 2d3d2cc2b8..d961a59946 100644
--- a/tests/ImageSharp.Tests/Drawing/Paths/ProcessorWatchingImage.cs
+++ b/tests/ImageSharp.Tests/Drawing/Paths/ProcessorWatchingImage.cs
@@ -6,13 +6,13 @@ namespace ImageSharp.Tests.Drawing.Paths
     using ImageSharp;
     using Processing;
     using System.Collections.Generic;
-    using ImageSharp.Formats;
+   using ImageSharp.PixelFormats;
 
     /// <summary>
     /// Watches but does not actually run the processors against the image.
     /// </summary>
-    /// <seealso cref="ImageSharp.Image{ImageSharp.Color}" />
-    public class ProcessorWatchingImage : Image<Color>
+    /// <seealso cref="ImageSharp.Image{Rgba32}" />
+    public class ProcessorWatchingImage : Image<Rgba32>
     {
         public List<ProcessorDetails> ProcessorApplications { get; } = new List<ProcessorDetails>();
         
@@ -21,7 +21,7 @@ namespace ImageSharp.Tests.Drawing.Paths
         {
         }
 
-        public override void ApplyProcessor(IImageProcessor<Color> processor, Rectangle rectangle)
+        public override void ApplyProcessor(IImageProcessor<Rgba32> processor, Rectangle rectangle)
         {
             this.ProcessorApplications.Add(new ProcessorDetails
             {
@@ -32,7 +32,7 @@ namespace ImageSharp.Tests.Drawing.Paths
 
         public struct ProcessorDetails
         {
-            public IImageProcessor<Color> processor;
+            public IImageProcessor<Rgba32> processor;
             public Rectangle rectangle;
         }
     }
diff --git a/tests/ImageSharp.Tests/Drawing/PolygonTests.cs b/tests/ImageSharp.Tests/Drawing/PolygonTests.cs
index 3e06ca918e..554c5a32ed 100644
--- a/tests/ImageSharp.Tests/Drawing/PolygonTests.cs
+++ b/tests/ImageSharp.Tests/Drawing/PolygonTests.cs
@@ -13,6 +13,8 @@ namespace ImageSharp.Tests.Drawing
     using ImageSharp.Drawing;
     using System.Numerics;
 
+    using ImageSharp.PixelFormats;
+
     public class PolygonTests : FileTestBase
     {
         [Fact]
@@ -25,8 +27,8 @@ namespace ImageSharp.Tests.Drawing
                 using (FileStream output = File.OpenWrite($"{path}/Simple.png"))
                 {
                     image
-                        .BackgroundColor(Color.Blue)
-                        .DrawPolygon(Color.HotPink, 5,
+                        .BackgroundColor(Rgba32.Blue)
+                        .DrawPolygon(Rgba32.HotPink, 5,
                         new[] {
                             new Vector2(10, 10),
                             new Vector2(200, 150),
@@ -35,15 +37,15 @@ namespace ImageSharp.Tests.Drawing
                         .Save(output);
                 }
 
-                using (PixelAccessor<Color> sourcePixels = image.Lock())
+                using (PixelAccessor<Rgba32> sourcePixels = image.Lock())
                 {
-                    Assert.Equal(Color.HotPink, sourcePixels[9, 9]);
+                    Assert.Equal(Rgba32.HotPink, sourcePixels[9, 9]);
 
-                    Assert.Equal(Color.HotPink, sourcePixels[199, 149]);
+                    Assert.Equal(Rgba32.HotPink, sourcePixels[199, 149]);
 
-                    Assert.Equal(Color.Blue, sourcePixels[50, 50]);
+                    Assert.Equal(Rgba32.Blue, sourcePixels[50, 50]);
 
-                    Assert.Equal(Color.Blue, sourcePixels[2, 2]);
+                    Assert.Equal(Rgba32.Blue, sourcePixels[2, 2]);
                 }
             }
         }
@@ -58,30 +60,30 @@ namespace ImageSharp.Tests.Drawing
                             new Vector2(50, 300)
             };
 
-            Color color = new Color(Color.HotPink.R, Color.HotPink.G, Color.HotPink.B, 150);
+            Rgba32 color = new Rgba32(Rgba32.HotPink.R, Rgba32.HotPink.G, Rgba32.HotPink.B, 150);
 
             using (Image image = new Image(500, 500))
             {
                 using (FileStream output = File.OpenWrite($"{path}/Opacity.png"))
                 {
                     image
-                        .BackgroundColor(Color.Blue)
+                        .BackgroundColor(Rgba32.Blue)
                         .DrawPolygon(color, 10, simplePath)
                         .Save(output);
                 }
 
                 //shift background color towards forground color by the opacity amount
-                Color mergedColor = new Color(Vector4.Lerp(Color.Blue.ToVector4(), Color.HotPink.ToVector4(), 150f / 255f));
+                Rgba32 mergedColor = new Rgba32(Vector4.Lerp(Rgba32.Blue.ToVector4(), Rgba32.HotPink.ToVector4(), 150f / 255f));
 
-                using (PixelAccessor<Color> sourcePixels = image.Lock())
+                using (PixelAccessor<Rgba32> sourcePixels = image.Lock())
                 {
                     Assert.Equal(mergedColor, sourcePixels[9, 9]);
 
                     Assert.Equal(mergedColor, sourcePixels[199, 149]);
 
-                    Assert.Equal(Color.Blue, sourcePixels[50, 50]);
+                    Assert.Equal(Rgba32.Blue, sourcePixels[50, 50]);
 
-                    Assert.Equal(Color.Blue, sourcePixels[2, 2]);
+                    Assert.Equal(Rgba32.Blue, sourcePixels[2, 2]);
                 }
             }
         }
@@ -96,22 +98,22 @@ namespace ImageSharp.Tests.Drawing
                 using (FileStream output = File.OpenWrite($"{path}/Rectangle.png"))
                 {
                     image
-                        .BackgroundColor(Color.Blue)
-                        .Draw(Color.HotPink, 10, new Rectangle(10, 10, 190, 140))
+                        .BackgroundColor(Rgba32.Blue)
+                        .Draw(Rgba32.HotPink, 10, new Rectangle(10, 10, 190, 140))
                         .Save(output);
                 }
 
-                using (PixelAccessor<Color> sourcePixels = image.Lock())
+                using (PixelAccessor<Rgba32> sourcePixels = image.Lock())
                 {
-                    Assert.Equal(Color.HotPink, sourcePixels[8, 8]);
+                    Assert.Equal(Rgba32.HotPink, sourcePixels[8, 8]);
 
-                    Assert.Equal(Color.HotPink, sourcePixels[198, 10]);
+                    Assert.Equal(Rgba32.HotPink, sourcePixels[198, 10]);
 
-                    Assert.Equal(Color.HotPink, sourcePixels[10, 50]);
+                    Assert.Equal(Rgba32.HotPink, sourcePixels[10, 50]);
 
-                    Assert.Equal(Color.Blue, sourcePixels[50, 50]);
+                    Assert.Equal(Rgba32.Blue, sourcePixels[50, 50]);
 
-                    Assert.Equal(Color.Blue, sourcePixels[2, 2]);
+                    Assert.Equal(Rgba32.Blue, sourcePixels[2, 2]);
                 }
             }
         }
diff --git a/tests/ImageSharp.Tests/Drawing/RecolorImageTest.cs b/tests/ImageSharp.Tests/Drawing/RecolorImageTest.cs
index 0b450d166e..d3236ae001 100644
--- a/tests/ImageSharp.Tests/Drawing/RecolorImageTest.cs
+++ b/tests/ImageSharp.Tests/Drawing/RecolorImageTest.cs
@@ -9,6 +9,8 @@ namespace ImageSharp.Tests
     using System.IO;
     using System.Linq;
 
+    using ImageSharp.PixelFormats;
+
     using Xunit;
 
     public class RecolorImageTest : FileTestBase
@@ -18,7 +20,7 @@ namespace ImageSharp.Tests
         {
             string path = this.CreateOutputDirectory("Drawing", "RecolorImage");
 
-            RecolorBrush brush = new RecolorBrush(Color.Yellow, Color.HotPink, 0.2f);
+            RecolorBrush brush = new RecolorBrush(Rgba32.Yellow, Rgba32.HotPink, 0.2f);
 
             foreach (TestFile file in Files)
             {
@@ -38,7 +40,7 @@ namespace ImageSharp.Tests
         {
             string path = this.CreateOutputDirectory("Drawing", "RecolorImage");
 
-            RecolorBrush brush = new RecolorBrush(Color.Yellow, Color.HotPink, 0.2f);
+            RecolorBrush brush = new RecolorBrush(Rgba32.Yellow, Rgba32.HotPink, 0.2f);
 
             foreach (TestFile file in Files)
             {
diff --git a/tests/ImageSharp.Tests/Drawing/SolidBezierTests.cs b/tests/ImageSharp.Tests/Drawing/SolidBezierTests.cs
index 1a7e98a12f..0886aa15ae 100644
--- a/tests/ImageSharp.Tests/Drawing/SolidBezierTests.cs
+++ b/tests/ImageSharp.Tests/Drawing/SolidBezierTests.cs
@@ -8,6 +8,8 @@ namespace ImageSharp.Tests.Drawing
     using System.IO;
     using System.Numerics;
 
+    using ImageSharp.PixelFormats;
+
     using SixLabors.Shapes;
 
     using Xunit;
@@ -29,20 +31,20 @@ namespace ImageSharp.Tests.Drawing
                 using (FileStream output = File.OpenWrite($"{path}/Simple.png"))
                 {
                     image
-                        .BackgroundColor(Color.Blue)
-                        .Fill(Color.HotPink, new Polygon(new BezierLineSegment(simplePath)))
+                        .BackgroundColor(Rgba32.Blue)
+                        .Fill(Rgba32.HotPink, new Polygon(new BezierLineSegment(simplePath)))
                         .Save(output);
                 }
 
-                using (PixelAccessor<Color> sourcePixels = image.Lock())
+                using (PixelAccessor<Rgba32> sourcePixels = image.Lock())
                 {
-                    Assert.Equal(Color.HotPink, sourcePixels[150, 300]);
+                    Assert.Equal(Rgba32.HotPink, sourcePixels[150, 300]);
 
                     //curve points should not be never be set
-                    Assert.Equal(Color.Blue, sourcePixels[240, 30]);
+                    Assert.Equal(Rgba32.Blue, sourcePixels[240, 30]);
 
                     // inside shape should not be empty
-                    Assert.Equal(Color.HotPink, sourcePixels[200, 250]);
+                    Assert.Equal(Rgba32.HotPink, sourcePixels[200, 250]);
                 }
             }
         }
@@ -57,28 +59,28 @@ namespace ImageSharp.Tests.Drawing
                         new Vector2(240, 30),
                         new Vector2(300, 400)
             };
-            Color color = new Color(Color.HotPink.R, Color.HotPink.G, Color.HotPink.B, 150);
+            Rgba32 color = new Rgba32(Rgba32.HotPink.R, Rgba32.HotPink.G, Rgba32.HotPink.B, 150);
 
             using (Image image = new Image(500, 500))
             {
                 using (FileStream output = File.OpenWrite($"{path}/Opacity.png"))
                 {
                     image
-                        .BackgroundColor(Color.Blue)
+                        .BackgroundColor(Rgba32.Blue)
                         .Fill(color, new Polygon(new BezierLineSegment(simplePath)))
                         .Save(output);
                 }
 
                 //shift background color towards forground color by the opacity amount
-                Color mergedColor = new Color(Vector4.Lerp(Color.Blue.ToVector4(), Color.HotPink.ToVector4(), 150f / 255f));
+                Rgba32 mergedColor = new Rgba32(Vector4.Lerp(Rgba32.Blue.ToVector4(), Rgba32.HotPink.ToVector4(), 150f / 255f));
 
-                using (PixelAccessor<Color> sourcePixels = image.Lock())
+                using (PixelAccessor<Rgba32> sourcePixels = image.Lock())
                 {
                     //top of curve
                     Assert.Equal(mergedColor, sourcePixels[138, 116]);
 
                     //curve points should not be never be set
-                    Assert.Equal(Color.Blue, sourcePixels[240, 30]);
+                    Assert.Equal(Rgba32.Blue, sourcePixels[240, 30]);
 
                     // inside shape should not be empty
                     Assert.Equal(mergedColor, sourcePixels[200, 250]);
diff --git a/tests/ImageSharp.Tests/Drawing/SolidComplexPolygonTests.cs b/tests/ImageSharp.Tests/Drawing/SolidComplexPolygonTests.cs
index 4ff250a934..1de7e21441 100644
--- a/tests/ImageSharp.Tests/Drawing/SolidComplexPolygonTests.cs
+++ b/tests/ImageSharp.Tests/Drawing/SolidComplexPolygonTests.cs
@@ -11,6 +11,8 @@ namespace ImageSharp.Tests.Drawing
     using ImageSharp.Drawing;
     using System.Numerics;
 
+    using ImageSharp.PixelFormats;
+
     using SixLabors.Shapes;
 
     public class SolidComplexPolygonTests : FileTestBase
@@ -35,17 +37,17 @@ namespace ImageSharp.Tests.Drawing
                 using (FileStream output = File.OpenWrite($"{path}/Simple.png"))
                 {
                     image
-                        .BackgroundColor(Color.Blue)
-                        .Fill(Color.HotPink, clipped)
+                        .BackgroundColor(Rgba32.Blue)
+                        .Fill(Rgba32.HotPink, clipped)
                         .Save(output);
                 }
 
-                using (PixelAccessor<Color> sourcePixels = image.Lock())
+                using (PixelAccessor<Rgba32> sourcePixels = image.Lock())
                 {
-                    Assert.Equal(Color.HotPink, sourcePixels[20, 35]);
+                    Assert.Equal(Rgba32.HotPink, sourcePixels[20, 35]);
 
                     //inside hole
-                    Assert.Equal(Color.Blue, sourcePixels[60, 100]);
+                    Assert.Equal(Rgba32.Blue, sourcePixels[60, 100]);
                 }
             }
         }
@@ -70,17 +72,17 @@ namespace ImageSharp.Tests.Drawing
                 using (FileStream output = File.OpenWrite($"{path}/SimpleOverlapping.png"))
                 {
                     image
-                        .BackgroundColor(Color.Blue)
-                        .Fill(Color.HotPink, simplePath.Clip(hole1))
+                        .BackgroundColor(Rgba32.Blue)
+                        .Fill(Rgba32.HotPink, simplePath.Clip(hole1))
                         .Save(output);
                 }
 
-                using (PixelAccessor<Color> sourcePixels = image.Lock())
+                using (PixelAccessor<Rgba32> sourcePixels = image.Lock())
                 {
-                    Assert.Equal(Color.HotPink, sourcePixels[20, 35]);
+                    Assert.Equal(Rgba32.HotPink, sourcePixels[20, 35]);
 
                     //inside hole
-                    Assert.Equal(Color.Blue, sourcePixels[60, 100]);
+                    Assert.Equal(Rgba32.Blue, sourcePixels[60, 100]);
                 }
             }
         }
@@ -98,27 +100,27 @@ namespace ImageSharp.Tests.Drawing
                             new Vector2(37, 85),
                             new Vector2(93, 85),
                             new Vector2(65, 137)));
-            Color color = new Color(Color.HotPink.R, Color.HotPink.G, Color.HotPink.B, 150);
+            Rgba32 color = new Rgba32(Rgba32.HotPink.R, Rgba32.HotPink.G, Rgba32.HotPink.B, 150);
 
             using (Image image = new Image(500, 500))
             {
                 using (FileStream output = File.OpenWrite($"{path}/Opacity.png"))
                 {
                     image
-                        .BackgroundColor(Color.Blue)
+                        .BackgroundColor(Rgba32.Blue)
                         .Fill(color, simplePath.Clip(hole1))
                         .Save(output);
                 }
 
                 //shift background color towards forground color by the opacity amount
-                Color mergedColor = new Color(Vector4.Lerp(Color.Blue.ToVector4(), Color.HotPink.ToVector4(), 150f / 255f));
+                Rgba32 mergedColor = new Rgba32(Vector4.Lerp(Rgba32.Blue.ToVector4(), Rgba32.HotPink.ToVector4(), 150f / 255f));
 
-                using (PixelAccessor<Color> sourcePixels = image.Lock())
+                using (PixelAccessor<Rgba32> sourcePixels = image.Lock())
                 {
                     Assert.Equal(mergedColor, sourcePixels[20, 35]);
 
                     //inside hole
-                    Assert.Equal(Color.Blue, sourcePixels[60, 100]);
+                    Assert.Equal(Rgba32.Blue, sourcePixels[60, 100]);
                 }
             }
         }
diff --git a/tests/ImageSharp.Tests/Drawing/SolidPolygonTests.cs b/tests/ImageSharp.Tests/Drawing/SolidPolygonTests.cs
index 79363480fc..d76dcf023e 100644
--- a/tests/ImageSharp.Tests/Drawing/SolidPolygonTests.cs
+++ b/tests/ImageSharp.Tests/Drawing/SolidPolygonTests.cs
@@ -13,6 +13,8 @@ namespace ImageSharp.Tests.Drawing
     using System.Numerics;
     using Xunit;
     using ImageSharp.Drawing.Brushes;
+    using ImageSharp.PixelFormats;
+
     using SixLabors.Shapes;
 
     public class SolidPolygonTests : FileTestBase
@@ -32,13 +34,13 @@ namespace ImageSharp.Tests.Drawing
                 using (FileStream output = File.OpenWrite($"{path}/Simple.png"))
                 {
                     image
-                        .FillPolygon(Color.HotPink, simplePath, new GraphicsOptions(true))
+                        .FillPolygon(Rgba32.HotPink, simplePath, new GraphicsOptions(true))
                         .Save(output);
                 }
 
-                using (PixelAccessor<Color> sourcePixels = image.Lock())
+                using (PixelAccessor<Rgba32> sourcePixels = image.Lock())
                 {
-                    Assert.Equal(Color.HotPink, sourcePixels[81, 145]);
+                    Assert.Equal(Rgba32.HotPink, sourcePixels[81, 145]);
                 }
             }
         }
@@ -58,13 +60,13 @@ namespace ImageSharp.Tests.Drawing
                 using (FileStream output = File.OpenWrite($"{path}/Pattern.png"))
                 {
                     image
-                        .FillPolygon(Brushes.Horizontal(Color.HotPink), simplePath, new GraphicsOptions(true))
+                        .FillPolygon(Brushes.Horizontal(Rgba32.HotPink), simplePath, new GraphicsOptions(true))
                         .Save(output);
                 }
 
-                using (PixelAccessor<Color> sourcePixels = image.Lock())
+                using (PixelAccessor<Rgba32> sourcePixels = image.Lock())
                 {
-                    Assert.Equal(Color.HotPink, sourcePixels[81, 145]);
+                    Assert.Equal(Rgba32.HotPink, sourcePixels[81, 145]);
                 }
             }
         }
@@ -83,19 +85,19 @@ namespace ImageSharp.Tests.Drawing
             using (FileStream output = File.OpenWrite($"{path}/Simple_NoAntialias.png"))
             {
                 image
-                    .BackgroundColor(Color.Blue)
-                    .FillPolygon(Color.HotPink, simplePath, new GraphicsOptions(false))
+                    .BackgroundColor(Rgba32.Blue)
+                    .FillPolygon(Rgba32.HotPink, simplePath, new GraphicsOptions(false))
                     .Save(output);
 
-                using (PixelAccessor<Color> sourcePixels = image.Lock())
+                using (PixelAccessor<Rgba32> sourcePixels = image.Lock())
                 {
-                    Assert.Equal(Color.HotPink, sourcePixels[11, 11]);
+                    Assert.Equal(Rgba32.HotPink, sourcePixels[11, 11]);
 
-                    Assert.Equal(Color.HotPink, sourcePixels[199, 150]);
+                    Assert.Equal(Rgba32.HotPink, sourcePixels[199, 150]);
 
-                    Assert.Equal(Color.HotPink, sourcePixels[50, 50]);
+                    Assert.Equal(Rgba32.HotPink, sourcePixels[50, 50]);
 
-                    Assert.Equal(Color.Blue, sourcePixels[2, 2]);
+                    Assert.Equal(Rgba32.Blue, sourcePixels[2, 2]);
                 }
             }
         }
@@ -117,7 +119,7 @@ namespace ImageSharp.Tests.Drawing
                 ImageBrush brush = new ImageBrush(brushImage);
 
                 image
-                .BackgroundColor(Color.Blue)
+                .BackgroundColor(Rgba32.Blue)
                 .FillPolygon(brush, simplePath)
                 .Save(output);
             }
@@ -132,24 +134,24 @@ namespace ImageSharp.Tests.Drawing
                             new Vector2(200, 150),
                             new Vector2(50, 300)
             };
-            Color color = new Color(Color.HotPink.R, Color.HotPink.G, Color.HotPink.B, 150);
+            Rgba32 color = new Rgba32(Rgba32.HotPink.R, Rgba32.HotPink.G, Rgba32.HotPink.B, 150);
 
             using (Image image = new Image(500, 500))
             {
                 using (FileStream output = File.OpenWrite($"{path}/Opacity.png"))
                 {
                     image
-                        .BackgroundColor(Color.Blue)
+                        .BackgroundColor(Rgba32.Blue)
                         .FillPolygon(color, simplePath)
                         .Save(output);
                 }
 
                 //shift background color towards forground color by the opacity amount
-                Color mergedColor = new Color(Vector4.Lerp(Color.Blue.ToVector4(), Color.HotPink.ToVector4(), 150f / 255f));
+                Rgba32 mergedColor = new Rgba32(Vector4.Lerp(Rgba32.Blue.ToVector4(), Rgba32.HotPink.ToVector4(), 150f / 255f));
 
-                using (PixelAccessor<Color> sourcePixels = image.Lock())
+                using (PixelAccessor<Rgba32> sourcePixels = image.Lock())
                 {
-                    Assert.Equal(Color.Blue, sourcePixels[2, 2]);
+                    Assert.Equal(Rgba32.Blue, sourcePixels[2, 2]);
                 }
             }
         }
@@ -164,22 +166,22 @@ namespace ImageSharp.Tests.Drawing
                 using (FileStream output = File.OpenWrite($"{path}/Rectangle.png"))
                 {
                     image
-                        .BackgroundColor(Color.Blue)
-                        .Fill(Color.HotPink, new SixLabors.Shapes.Rectangle(10, 10, 190, 140))
+                        .BackgroundColor(Rgba32.Blue)
+                        .Fill(Rgba32.HotPink, new SixLabors.Shapes.Rectangle(10, 10, 190, 140))
                          .Save(output);
                 }
 
-                using (PixelAccessor<Color> sourcePixels = image.Lock())
+                using (PixelAccessor<Rgba32> sourcePixels = image.Lock())
                 {
-                    Assert.Equal(Color.HotPink, sourcePixels[11, 11]);
+                    Assert.Equal(Rgba32.HotPink, sourcePixels[11, 11]);
 
-                    Assert.Equal(Color.HotPink, sourcePixels[198, 10]);
+                    Assert.Equal(Rgba32.HotPink, sourcePixels[198, 10]);
 
-                    Assert.Equal(Color.HotPink, sourcePixels[10, 50]);
+                    Assert.Equal(Rgba32.HotPink, sourcePixels[10, 50]);
 
-                    Assert.Equal(Color.HotPink, sourcePixels[50, 50]);
+                    Assert.Equal(Rgba32.HotPink, sourcePixels[50, 50]);
 
-                    Assert.Equal(Color.Blue, sourcePixels[2, 2]);
+                    Assert.Equal(Rgba32.Blue, sourcePixels[2, 2]);
                 }
             }
         }
@@ -194,16 +196,16 @@ namespace ImageSharp.Tests.Drawing
                 using (FileStream output = File.OpenWrite($"{path}/Triangle.png"))
                 {
                     image
-                        .BackgroundColor(Color.Blue)
-                        .Fill(Color.HotPink, new RegularPolygon(50, 50, 3, 30))
+                        .BackgroundColor(Rgba32.Blue)
+                        .Fill(Rgba32.HotPink, new RegularPolygon(50, 50, 3, 30))
                          .Save(output);
                 }
 
-                using (PixelAccessor<Color> sourcePixels = image.Lock())
+                using (PixelAccessor<Rgba32> sourcePixels = image.Lock())
                 {
-                    Assert.Equal(Color.Blue, sourcePixels[30, 65]);
+                    Assert.Equal(Rgba32.Blue, sourcePixels[30, 65]);
 
-                    Assert.Equal(Color.HotPink, sourcePixels[50, 50]);
+                    Assert.Equal(Rgba32.HotPink, sourcePixels[50, 50]);
                 }
             }
         }
@@ -220,8 +222,8 @@ namespace ImageSharp.Tests.Drawing
                 using (FileStream output = File.OpenWrite($"{path}/Septagon.png"))
                 {
                     image
-                        .BackgroundColor(Color.Blue)
-                        .Fill(Color.HotPink, new RegularPolygon(50, 50, 7, 30, -(float)Math.PI))
+                        .BackgroundColor(Rgba32.Blue)
+                        .Fill(Rgba32.HotPink, new RegularPolygon(50, 50, 7, 30, -(float)Math.PI))
                          .Save(output);
                 }
             }
@@ -239,8 +241,8 @@ namespace ImageSharp.Tests.Drawing
                 using (FileStream output = File.OpenWrite($"{path}/ellipse.png"))
                 {
                     image
-                        .BackgroundColor(Color.Blue)
-                        .Fill(Color.HotPink, new Ellipse(50, 50, 30, 50)
+                        .BackgroundColor(Rgba32.Blue)
+                        .Fill(Rgba32.HotPink, new Ellipse(50, 50, 30, 50)
                                                 .Rotate((float)(Math.PI / 3)))
                          .Save(output);
                 }
@@ -259,8 +261,8 @@ namespace ImageSharp.Tests.Drawing
                 using (FileStream output = File.OpenWrite($"{path}/clipped-corner.png"))
                 {
                     image
-                        .Fill(Color.Blue)
-                        .FillPolygon(Color.HotPink, new[]
+                        .Fill(Rgba32.Blue)
+                        .FillPolygon(Rgba32.HotPink, new[]
                         {
                             new Vector2( 8, 8 ),
                             new Vector2( 64, 8 ),
diff --git a/tests/ImageSharp.Tests/Drawing/Text/DrawText.cs b/tests/ImageSharp.Tests/Drawing/Text/DrawText.cs
index 52b7fcbb65..bce493a69d 100644
--- a/tests/ImageSharp.Tests/Drawing/Text/DrawText.cs
+++ b/tests/ImageSharp.Tests/Drawing/Text/DrawText.cs
@@ -12,6 +12,7 @@ namespace ImageSharp.Tests.Drawing.Text
     using ImageSharp.Drawing.Brushes;
     using ImageSharp.Drawing.Pens;
     using ImageSharp.Drawing.Processors;
+    using ImageSharp.PixelFormats;
     using ImageSharp.Tests.Drawing.Paths;
 
     using SixLabors.Fonts;
@@ -21,9 +22,9 @@ namespace ImageSharp.Tests.Drawing.Text
 
     public class DrawText : IDisposable
     {
-        Color color = Color.HotPink;
+        Rgba32 color = Rgba32.HotPink;
 
-        SolidBrush brush = Brushes.Solid(Color.HotPink);
+        SolidBrush brush = Brushes.Solid(Rgba32.HotPink);
 
         IPath path = new SixLabors.Shapes.Path(
             new LinearLineSegment(
@@ -53,73 +54,73 @@ namespace ImageSharp.Tests.Drawing.Text
             this.img.DrawText(
                 "123",
                 this.Font,
-                Brushes.Solid(Color.Red),
+                Brushes.Solid(Rgba32.Red),
                 null,
                 Vector2.Zero,
                 new TextGraphicsOptions(true));
 
             Assert.NotEmpty(this.img.ProcessorApplications);
             Assert.Equal(3, this.img.ProcessorApplications.Count); // 3 fills where applied
-            Assert.IsType<FillRegionProcessor<Color>>(this.img.ProcessorApplications[0].processor);
+            Assert.IsType<FillRegionProcessor<Rgba32>>(this.img.ProcessorApplications[0].processor);
         }
 
         [Fact]
         public void FillsForEachACharachterWhenBrushSetAndNotPenDefaultOptions()
         {
-            this.img.DrawText("123", this.Font, Brushes.Solid(Color.Red), null, Vector2.Zero);
+            this.img.DrawText("123", this.Font, Brushes.Solid(Rgba32.Red), null, Vector2.Zero);
 
             Assert.NotEmpty(this.img.ProcessorApplications);
             Assert.Equal(3, this.img.ProcessorApplications.Count); // 3 fills where applied
-            Assert.IsType<FillRegionProcessor<Color>>(this.img.ProcessorApplications[0].processor);
+            Assert.IsType<FillRegionProcessor<Rgba32>>(this.img.ProcessorApplications[0].processor);
         }
 
         [Fact]
         public void FillsForEachACharachterWhenBrushSet()
         {
-            this.img.DrawText("123", this.Font, Brushes.Solid(Color.Red), Vector2.Zero, new TextGraphicsOptions(true));
+            this.img.DrawText("123", this.Font, Brushes.Solid(Rgba32.Red), Vector2.Zero, new TextGraphicsOptions(true));
 
             Assert.NotEmpty(this.img.ProcessorApplications);
             Assert.Equal(3, this.img.ProcessorApplications.Count); // 3 fills where applied
-            Assert.IsType<FillRegionProcessor<Color>>(this.img.ProcessorApplications[0].processor);
+            Assert.IsType<FillRegionProcessor<Rgba32>>(this.img.ProcessorApplications[0].processor);
         }
 
         [Fact]
         public void FillsForEachACharachterWhenBrushSetDefaultOptions()
         {
-            this.img.DrawText("123", this.Font, Brushes.Solid(Color.Red), Vector2.Zero);
+            this.img.DrawText("123", this.Font, Brushes.Solid(Rgba32.Red), Vector2.Zero);
 
             Assert.NotEmpty(this.img.ProcessorApplications);
             Assert.Equal(3, this.img.ProcessorApplications.Count); // 3 fills where applied
-            Assert.IsType<FillRegionProcessor<Color>>(this.img.ProcessorApplications[0].processor);
+            Assert.IsType<FillRegionProcessor<Rgba32>>(this.img.ProcessorApplications[0].processor);
         }
 
         [Fact]
         public void FillsForEachACharachterWhenColorSet()
         {
-            this.img.DrawText("123", this.Font, Color.Red, Vector2.Zero, new TextGraphicsOptions(true));
+            this.img.DrawText("123", this.Font, Rgba32.Red, Vector2.Zero, new TextGraphicsOptions(true));
 
             Assert.NotEmpty(this.img.ProcessorApplications);
             Assert.Equal(3, this.img.ProcessorApplications.Count);
-            FillRegionProcessor<Color> processor =
-                Assert.IsType<FillRegionProcessor<Color>>(this.img.ProcessorApplications[0].processor);
+            FillRegionProcessor<Rgba32> processor =
+                Assert.IsType<FillRegionProcessor<Rgba32>>(this.img.ProcessorApplications[0].processor);
 
-            SolidBrush<Color> brush = Assert.IsType<SolidBrush<Color>>(processor.Brush);
-            Assert.Equal(Color.Red, brush.Color);
+            SolidBrush<Rgba32> brush = Assert.IsType<SolidBrush<Rgba32>>(processor.Brush);
+            Assert.Equal(Rgba32.Red, brush.Color);
         }
 
         [Fact]
         public void FillsForEachACharachterWhenColorSetDefaultOptions()
         {
-            this.img.DrawText("123", this.Font, Color.Red, Vector2.Zero);
+            this.img.DrawText("123", this.Font, Rgba32.Red, Vector2.Zero);
 
             Assert.NotEmpty(this.img.ProcessorApplications);
             Assert.Equal(3, this.img.ProcessorApplications.Count);
-            Assert.IsType<FillRegionProcessor<Color>>(this.img.ProcessorApplications[0].processor);
-            FillRegionProcessor<Color> processor =
-                Assert.IsType<FillRegionProcessor<Color>>(this.img.ProcessorApplications[0].processor);
+            Assert.IsType<FillRegionProcessor<Rgba32>>(this.img.ProcessorApplications[0].processor);
+            FillRegionProcessor<Rgba32> processor =
+                Assert.IsType<FillRegionProcessor<Rgba32>>(this.img.ProcessorApplications[0].processor);
 
-            SolidBrush<Color> brush = Assert.IsType<SolidBrush<Color>>(processor.Brush);
-            Assert.Equal(Color.Red, brush.Color);
+            SolidBrush<Rgba32> brush = Assert.IsType<SolidBrush<Rgba32>>(processor.Brush);
+            Assert.Equal(Rgba32.Red, brush.Color);
         }
 
         [Fact]
@@ -129,43 +130,43 @@ namespace ImageSharp.Tests.Drawing.Text
                 "123",
                 this.Font,
                 null,
-                Pens.Dash(Color.Red, 1),
+                Pens.Dash(Rgba32.Red, 1),
                 Vector2.Zero,
                 new TextGraphicsOptions(true));
 
             Assert.NotEmpty(this.img.ProcessorApplications);
             Assert.Equal(3, this.img.ProcessorApplications.Count); // 3 fills where applied
-            Assert.IsType<DrawPathProcessor<Color>>(this.img.ProcessorApplications[0].processor);
+            Assert.IsType<DrawPathProcessor<Rgba32>>(this.img.ProcessorApplications[0].processor);
         }
 
         [Fact]
         public void DrawForEachACharachterWhenPenSetAndNotBrushDefaultOptions()
         {
-            this.img.DrawText("123", this.Font, null, Pens.Dash(Color.Red, 1), Vector2.Zero);
+            this.img.DrawText("123", this.Font, null, Pens.Dash(Rgba32.Red, 1), Vector2.Zero);
 
             Assert.NotEmpty(this.img.ProcessorApplications);
             Assert.Equal(3, this.img.ProcessorApplications.Count); // 3 fills where applied
-            Assert.IsType<DrawPathProcessor<Color>>(this.img.ProcessorApplications[0].processor);
+            Assert.IsType<DrawPathProcessor<Rgba32>>(this.img.ProcessorApplications[0].processor);
         }
 
         [Fact]
         public void DrawForEachACharachterWhenPenSet()
         {
-            this.img.DrawText("123", this.Font, Pens.Dash(Color.Red, 1), Vector2.Zero, new TextGraphicsOptions(true));
+            this.img.DrawText("123", this.Font, Pens.Dash(Rgba32.Red, 1), Vector2.Zero, new TextGraphicsOptions(true));
 
             Assert.NotEmpty(this.img.ProcessorApplications);
             Assert.Equal(3, this.img.ProcessorApplications.Count); // 3 fills where applied
-            Assert.IsType<DrawPathProcessor<Color>>(this.img.ProcessorApplications[0].processor);
+            Assert.IsType<DrawPathProcessor<Rgba32>>(this.img.ProcessorApplications[0].processor);
         }
 
         [Fact]
         public void DrawForEachACharachterWhenPenSetDefaultOptions()
         {
-            this.img.DrawText("123", this.Font, Pens.Dash(Color.Red, 1), Vector2.Zero);
+            this.img.DrawText("123", this.Font, Pens.Dash(Rgba32.Red, 1), Vector2.Zero);
 
             Assert.NotEmpty(this.img.ProcessorApplications);
             Assert.Equal(3, this.img.ProcessorApplications.Count); // 3 fills where applied
-            Assert.IsType<DrawPathProcessor<Color>>(this.img.ProcessorApplications[0].processor);
+            Assert.IsType<DrawPathProcessor<Rgba32>>(this.img.ProcessorApplications[0].processor);
         }
 
         [Fact]
@@ -174,8 +175,8 @@ namespace ImageSharp.Tests.Drawing.Text
             this.img.DrawText(
                 "123",
                 this.Font,
-                Brushes.Solid(Color.Red),
-                Pens.Dash(Color.Red, 1),
+                Brushes.Solid(Rgba32.Red),
+                Pens.Dash(Rgba32.Red, 1),
                 Vector2.Zero,
                 new TextGraphicsOptions(true));
 
@@ -186,7 +187,7 @@ namespace ImageSharp.Tests.Drawing.Text
         [Fact]
         public void DrawForEachACharachterWhenPenSetAndFillFroEachWhenBrushSetDefaultOptions()
         {
-            this.img.DrawText("123", this.Font, Brushes.Solid(Color.Red), Pens.Dash(Color.Red, 1), Vector2.Zero);
+            this.img.DrawText("123", this.Font, Brushes.Solid(Rgba32.Red), Pens.Dash(Rgba32.Red, 1), Vector2.Zero);
 
             Assert.NotEmpty(this.img.ProcessorApplications);
             Assert.Equal(6, this.img.ProcessorApplications.Count);
@@ -198,26 +199,26 @@ namespace ImageSharp.Tests.Drawing.Text
             this.img.DrawText(
                 "1",
                 this.Font,
-                Brushes.Solid(Color.Red),
-                Pens.Dash(Color.Red, 1),
+                Brushes.Solid(Rgba32.Red),
+                Pens.Dash(Rgba32.Red, 1),
                 Vector2.Zero,
                 new TextGraphicsOptions(true));
 
             Assert.NotEmpty(this.img.ProcessorApplications);
             Assert.Equal(2, this.img.ProcessorApplications.Count);
-            Assert.IsType<FillRegionProcessor<Color>>(this.img.ProcessorApplications[0].processor);
-            Assert.IsType<DrawPathProcessor<Color>>(this.img.ProcessorApplications[1].processor);
+            Assert.IsType<FillRegionProcessor<Rgba32>>(this.img.ProcessorApplications[0].processor);
+            Assert.IsType<DrawPathProcessor<Rgba32>>(this.img.ProcessorApplications[1].processor);
         }
 
         [Fact]
         public void BrushAppliesBeforPenDefaultOptions()
         {
-            this.img.DrawText("1", this.Font, Brushes.Solid(Color.Red), Pens.Dash(Color.Red, 1), Vector2.Zero);
+            this.img.DrawText("1", this.Font, Brushes.Solid(Rgba32.Red), Pens.Dash(Rgba32.Red, 1), Vector2.Zero);
 
             Assert.NotEmpty(this.img.ProcessorApplications);
             Assert.Equal(2, this.img.ProcessorApplications.Count);
-            Assert.IsType<FillRegionProcessor<Color>>(this.img.ProcessorApplications[0].processor);
-            Assert.IsType<DrawPathProcessor<Color>>(this.img.ProcessorApplications[1].processor);
+            Assert.IsType<FillRegionProcessor<Rgba32>>(this.img.ProcessorApplications[0].processor);
+            Assert.IsType<DrawPathProcessor<Rgba32>>(this.img.ProcessorApplications[1].processor);
         }
 
         [Fact]
@@ -225,19 +226,19 @@ namespace ImageSharp.Tests.Drawing.Text
         {
             this.img.MetaData.VerticalResolution = 1;
             this.img.MetaData.HorizontalResolution = 1;
-            this.img.DrawText("1", this.Font, Brushes.Solid(Color.Red), Vector2.Zero, new TextGraphicsOptions(true) {
+            this.img.DrawText("1", this.Font, Brushes.Solid(Rgba32.Red), Vector2.Zero, new TextGraphicsOptions(true) {
                 UseImageResolution = false
             });
 
-            this.img.DrawText("1", this.Font, Brushes.Solid(Color.Red), Vector2.Zero, new TextGraphicsOptions(true)
+            this.img.DrawText("1", this.Font, Brushes.Solid(Rgba32.Red), Vector2.Zero, new TextGraphicsOptions(true)
             {
                 UseImageResolution = true
             });
 
             Assert.NotEmpty(this.img.ProcessorApplications);
             Assert.Equal(2, this.img.ProcessorApplications.Count);
-            FillRegionProcessor<Color> ownResolution = Assert.IsType<FillRegionProcessor<Color>>(this.img.ProcessorApplications[0].processor);
-            FillRegionProcessor<Color> imgResolution = Assert.IsType<FillRegionProcessor<Color>>(this.img.ProcessorApplications[1].processor);
+            FillRegionProcessor<Rgba32> ownResolution = Assert.IsType<FillRegionProcessor<Rgba32>>(this.img.ProcessorApplications[0].processor);
+            FillRegionProcessor<Rgba32> imgResolution = Assert.IsType<FillRegionProcessor<Rgba32>>(this.img.ProcessorApplications[1].processor);
 
             ShapeRegion ownRegion = Assert.IsType<ShapeRegion>(ownResolution.Region);
             ShapeRegion imgRegion = Assert.IsType<ShapeRegion>(imgResolution.Region);
diff --git a/tests/ImageSharp.Tests/Drawing/Text/OutputText.cs b/tests/ImageSharp.Tests/Drawing/Text/OutputText.cs
index 0bb3afccd7..1dbc93b9b4 100644
--- a/tests/ImageSharp.Tests/Drawing/Text/OutputText.cs
+++ b/tests/ImageSharp.Tests/Drawing/Text/OutputText.cs
@@ -13,6 +13,8 @@ namespace ImageSharp.Tests.Drawing.Text
     using SixLabors.Shapes;
     using ImageSharp.Drawing.Processors;
     using ImageSharp.Drawing.Pens;
+    using ImageSharp.PixelFormats;
+
     using SixLabors.Fonts;
 
     public class OutputText : FileTestBase
@@ -32,8 +34,8 @@ namespace ImageSharp.Tests.Drawing.Text
             //draws 2 overlapping triangle glyphs twice 1 set on each line
             using (Image img = new Image(100, 200))
             {
-                img.Fill(Color.DarkBlue)
-                   .DrawText("AB\nAB", new Font(this.Font, 50), Color.Red, new Vector2(0, 0));
+                img.Fill(Rgba32.DarkBlue)
+                   .DrawText("AB\nAB", new Font(this.Font, 50), Rgba32.Red, new Vector2(0, 0));
                 img.Save($"{this.CreateOutputDirectory("Drawing", "Text")}/AB.png");
             }
         }
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/BadEofJpegTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/BadEofJpegTests.cs
index 8dbdb998c5..dc6985dd34 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/BadEofJpegTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/BadEofJpegTests.cs
@@ -17,6 +17,7 @@ namespace ImageSharp.Tests
     using System.Numerics;
 
     using ImageSharp.Formats.Jpg;
+    using ImageSharp.PixelFormats;
     using ImageSharp.Processing;
 
     public class BadEOFJpegTests : MeasureFixture
@@ -27,11 +28,11 @@ namespace ImageSharp.Tests
         }
 
         [Theory]
-        [WithFile(TestImages.Jpeg.Baseline.Bad.MissingEOF, PixelTypes.Color)]
-        public void LoadBaselineImage<TColor>(TestImageProvider<TColor> provider)
-            where TColor : struct, IPixel<TColor>
+        [WithFile(TestImages.Jpeg.Baseline.Bad.MissingEOF, PixelTypes.Rgba32)]
+        public void LoadBaselineImage<TPixel>(TestImageProvider<TPixel> provider)
+            where TPixel : struct, IPixel<TPixel>
         {
-            using (Image<TColor> image = provider.GetImage())
+            using (Image<TPixel> image = provider.GetImage())
             {
                 Assert.NotNull(image);
                 provider.Utility.SaveTestOutputFile(image, "bmp");
@@ -39,11 +40,11 @@ namespace ImageSharp.Tests
         }
 
         [Theory] // TODO: #18
-        [WithFile(TestImages.Jpeg.Progressive.Bad.BadEOF, PixelTypes.Color)]
-        public void LoadProgressiveImage<TColor>(TestImageProvider<TColor> provider)
-            where TColor : struct, IPixel<TColor>
+        [WithFile(TestImages.Jpeg.Progressive.Bad.BadEOF, PixelTypes.Rgba32)]
+        public void LoadProgressiveImage<TPixel>(TestImageProvider<TPixel> provider)
+            where TPixel : struct, IPixel<TPixel>
         {
-            using (Image<TColor> image = provider.GetImage())
+            using (Image<TPixel> image = provider.GetImage())
             {
                 Assert.NotNull(image);
                 provider.Utility.SaveTestOutputFile(image, "bmp");
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs
index d83424b240..1bcc72c43b 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs
@@ -10,6 +10,7 @@ namespace ImageSharp.Tests
     using System.IO;
 
     using ImageSharp.Formats;
+    using ImageSharp.PixelFormats;
 
     using Xunit;
 
@@ -25,22 +26,22 @@ namespace ImageSharp.Tests
         public static string[] ProgressiveTestJpegs = TestImages.Jpeg.Progressive.All;
 
         [Theory]
-        [WithFileCollection(nameof(BaselineTestJpegs), PixelTypes.Color | PixelTypes.StandardImageClass | PixelTypes.Argb32)]
-        public void OpenBaselineJpeg_SaveBmp<TColor>(TestImageProvider<TColor> provider)
-            where TColor : struct, IPixel<TColor>
+        [WithFileCollection(nameof(BaselineTestJpegs), PixelTypes.Rgba32 | PixelTypes.StandardImageClass | PixelTypes.Argb32)]
+        public void OpenBaselineJpeg_SaveBmp<TPixel>(TestImageProvider<TPixel> provider)
+            where TPixel : struct, IPixel<TPixel>
         {
-            using (Image<TColor> image = provider.GetImage())
+            using (Image<TPixel> image = provider.GetImage())
             {
                 provider.Utility.SaveTestOutputFile(image, "bmp");
             }
         }
 
         [Theory]
-        [WithFileCollection(nameof(ProgressiveTestJpegs), PixelTypes.Color | PixelTypes.StandardImageClass | PixelTypes.Argb32)]
-        public void OpenProgressiveJpeg_SaveBmp<TColor>(TestImageProvider<TColor> provider)
-            where TColor : struct, IPixel<TColor>
+        [WithFileCollection(nameof(ProgressiveTestJpegs), PixelTypes.Rgba32 | PixelTypes.StandardImageClass | PixelTypes.Argb32)]
+        public void OpenProgressiveJpeg_SaveBmp<TPixel>(TestImageProvider<TPixel> provider)
+            where TPixel : struct, IPixel<TPixel>
         {
-            using (Image<TColor> image = provider.GetImage())
+            using (Image<TPixel> image = provider.GetImage())
             {
                 provider.Utility.SaveTestOutputFile(image, "bmp");
             }
@@ -52,14 +53,14 @@ namespace ImageSharp.Tests
         [WithSolidFilledImages(16, 16, 255, 0, 0, PixelTypes.StandardImageClass, JpegSubsample.Ratio444, 75)]
         [WithSolidFilledImages(16, 16, 255, 0, 0, PixelTypes.StandardImageClass, JpegSubsample.Ratio444, 100)]
         [WithSolidFilledImages(8, 8, 255, 0, 0, PixelTypes.StandardImageClass, JpegSubsample.Ratio444, 100)]
-        public void DecodeGenerated_SaveBmp<TColor>(
-            TestImageProvider<TColor> provider,
+        public void DecodeGenerated_SaveBmp<TPixel>(
+            TestImageProvider<TPixel> provider,
             JpegSubsample subsample,
             int quality)
-            where TColor : struct, IPixel<TColor>
+            where TPixel : struct, IPixel<TPixel>
         {
             byte[] data;
-            using (Image<TColor> image = provider.GetImage())
+            using (Image<TPixel> image = provider.GetImage())
             {
                 JpegEncoder encoder = new JpegEncoder();
                 JpegEncoderOptions options = new JpegEncoderOptions { Subsample = subsample, Quality = quality };
@@ -72,18 +73,18 @@ namespace ImageSharp.Tests
             }
 
             // TODO: Automatic image comparers could help here a lot :P
-            Image<TColor> mirror = provider.Factory.CreateImage(data);
+            Image<TPixel> mirror = provider.Factory.CreateImage(data);
             provider.Utility.TestName += $"_{subsample}_Q{quality}";
             provider.Utility.SaveTestOutputFile(mirror, "bmp");
         }
 
         [Theory]
         [WithSolidFilledImages(42, 88, 255, 0, 0, PixelTypes.StandardImageClass)]
-        public void DecodeGenerated_MetadataOnly<TColor>(
-            TestImageProvider<TColor> provider)
-            where TColor : struct, IPixel<TColor>
+        public void DecodeGenerated_MetadataOnly<TPixel>(
+            TestImageProvider<TPixel> provider)
+            where TPixel : struct, IPixel<TPixel>
         {
-            using (Image<TColor> image = provider.GetImage())
+            using (Image<TPixel> image = provider.GetImage())
             {
                 using (MemoryStream ms = new MemoryStream())
                 {
@@ -92,7 +93,7 @@ namespace ImageSharp.Tests
                     
                     using (JpegDecoderCore decoder = new JpegDecoderCore(null, null))
                     {
-                        Image<TColor> mirror = decoder.Decode<TColor>(ms);
+                        Image<TPixel> mirror = decoder.Decode<TPixel>(ms);
 
                         Assert.Equal(decoder.ImageWidth, image.Width);
                         Assert.Equal(decoder.ImageHeight, image.Height);
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegEncoderTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegEncoderTests.cs
index f900fe782c..d5f7c2ea3f 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/JpegEncoderTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegEncoderTests.cs
@@ -15,6 +15,7 @@ using Xunit.Abstractions;
 namespace ImageSharp.Tests
 {
     using ImageSharp.Formats.Jpg;
+    using ImageSharp.PixelFormats;
     using ImageSharp.Processing;
 
     public class JpegEncoderTests : MeasureFixture
@@ -31,10 +32,10 @@ namespace ImageSharp.Tests
         [WithFile(TestImages.Jpeg.Baseline.Lake, PixelTypes.StandardImageClass, 75, JpegSubsample.Ratio420)]
         [WithFile(TestImages.Jpeg.Baseline.Snake, PixelTypes.StandardImageClass, 75, JpegSubsample.Ratio444)]
         [WithFile(TestImages.Jpeg.Baseline.Lake, PixelTypes.StandardImageClass, 75, JpegSubsample.Ratio444)]
-        public void LoadResizeSave<TColor>(TestImageProvider<TColor> provider, int quality, JpegSubsample subsample)
-            where TColor : struct, IPixel<TColor>
+        public void LoadResizeSave<TPixel>(TestImageProvider<TPixel> provider, int quality, JpegSubsample subsample)
+            where TPixel : struct, IPixel<TPixel>
         {
-            using (Image<TColor> image = provider.GetImage().Resize(new ResizeOptions { Size = new Size(150, 100), Mode = ResizeMode.Max }))
+            using (Image<TPixel> image = provider.GetImage().Resize(new ResizeOptions { Size = new Size(150, 100), Mode = ResizeMode.Max }))
             {
                 image.MetaData.Quality = quality;
                 image.MetaData.ExifProfile = null; // Reduce the size of the file
@@ -48,12 +49,12 @@ namespace ImageSharp.Tests
         }
 
         [Theory]
-        [WithFileCollection(nameof(AllBmpFiles), PixelTypes.Color | PixelTypes.StandardImageClass | PixelTypes.Argb32, JpegSubsample.Ratio420, 75)]
-        [WithFileCollection(nameof(AllBmpFiles), PixelTypes.Color | PixelTypes.StandardImageClass | PixelTypes.Argb32, JpegSubsample.Ratio444, 75)]
-        public void OpenBmp_SaveJpeg<TColor>(TestImageProvider<TColor> provider, JpegSubsample subSample, int quality)
-           where TColor : struct, IPixel<TColor>
+        [WithFileCollection(nameof(AllBmpFiles), PixelTypes.Rgba32 | PixelTypes.StandardImageClass | PixelTypes.Argb32, JpegSubsample.Ratio420, 75)]
+        [WithFileCollection(nameof(AllBmpFiles), PixelTypes.Rgba32 | PixelTypes.StandardImageClass | PixelTypes.Argb32, JpegSubsample.Ratio444, 75)]
+        public void OpenBmp_SaveJpeg<TPixel>(TestImageProvider<TPixel> provider, JpegSubsample subSample, int quality)
+           where TPixel : struct, IPixel<TPixel>
         {
-            using (Image<TColor> image = provider.GetImage())
+            using (Image<TPixel> image = provider.GetImage())
             {
                 ImagingTestCaseUtility utility = provider.Utility;
                 utility.TestName += "_" + subSample + "_Q" + quality;
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegProfilingBenchmarks.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegProfilingBenchmarks.cs
index 28a64a765c..5150925b4f 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/JpegProfilingBenchmarks.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegProfilingBenchmarks.cs
@@ -11,6 +11,7 @@ namespace ImageSharp.Tests
     using System.Numerics;
 
     using ImageSharp.Formats;
+    using ImageSharp.PixelFormats;
 
     using Xunit;
     using Xunit.Abstractions;
@@ -69,9 +70,9 @@ namespace ImageSharp.Tests
                 .Concat(new[] { TestImages.Jpeg.Baseline.Calliphora, TestImages.Jpeg.Baseline.Cmyk })
                 .ToArray();
 
-            Image<Color>[] testImages =
+            Image<Rgba32>[] testImages =
                 testFiles.Select(
-                        tf => TestImageProvider<Color>.File(tf, pixelTypeOverride: PixelTypes.StandardImageClass).GetImage())
+                        tf => TestImageProvider<Rgba32>.File(tf, pixelTypeOverride: PixelTypes.StandardImageClass).GetImage())
                     .ToArray();
 
             using (MemoryStream ms = new MemoryStream())
@@ -79,7 +80,7 @@ namespace ImageSharp.Tests
                 this.Measure(executionCount,
                     () =>
                     {
-                        foreach (Image<Color> img in testImages)
+                        foreach (Image<Rgba32> img in testImages)
                         {
                             JpegEncoder encoder = new JpegEncoder();
                             JpegEncoderOptions options = new JpegEncoderOptions { Quality = quality, Subsample = subsample };
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegUtilsTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegUtilsTests.cs
index 25fe46aa24..f242faf12c 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/JpegUtilsTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegUtilsTests.cs
@@ -10,16 +10,17 @@ namespace ImageSharp.Tests
     using System.Numerics;
 
     using ImageSharp.Formats.Jpg;
+    using ImageSharp.PixelFormats;
 
     using Xunit;
 
     public class JpegUtilsTests : TestBase
     {
-        public static Image<TColor> CreateTestImage<TColor>(GenericFactory<TColor> factory)
-            where TColor : struct, IPixel<TColor>
+        public static Image<TPixel> CreateTestImage<TPixel>(GenericFactory<TPixel> factory)
+            where TPixel : struct, IPixel<TPixel>
         {
-            Image<TColor> image = factory.CreateImage(10, 10);
-            using (PixelAccessor<TColor> pixels = image.Lock())
+            Image<TPixel> image = factory.CreateImage(10, 10);
+            using (PixelAccessor<TPixel> pixels = image.Lock())
             {
                 for (int i = 0; i < 10; i++)
                 {
@@ -27,7 +28,7 @@ namespace ImageSharp.Tests
                     {
                         Vector4 v = new Vector4(i / 10f, j / 10f, 0, 1);
 
-                        TColor color = default(TColor);
+                        TPixel color = default(TPixel);
                         color.PackFromVector4(v);
 
                         pixels[i, j] = color;
@@ -39,15 +40,15 @@ namespace ImageSharp.Tests
         }
 
         [Theory]
-        [WithMemberFactory(nameof(CreateTestImage), PixelTypes.Color | PixelTypes.StandardImageClass | PixelTypes.Argb32)]
-        public void CopyStretchedRGBTo_FromOrigo<TColor>(TestImageProvider<TColor> provider)
-            where TColor : struct, IPixel<TColor>
+        [WithMemberFactory(nameof(CreateTestImage), PixelTypes.Rgba32| PixelTypes.StandardImageClass | PixelTypes.Argb32)]
+        public void CopyStretchedRGBTo_FromOrigo<TPixel>(TestImageProvider<TPixel> provider)
+            where TPixel : struct, IPixel<TPixel>
         {
-            using (Image<TColor> src = provider.GetImage())
-            using (Image<TColor> dest = provider.Factory.CreateImage(8, 8))
-            using (PixelArea<TColor> area = new PixelArea<TColor>(8, 8, ComponentOrder.Xyz))
-            using (PixelAccessor<TColor> s = src.Lock())
-            using (PixelAccessor<TColor> d = dest.Lock())
+            using (Image<TPixel> src = provider.GetImage())
+            using (Image<TPixel> dest = provider.Factory.CreateImage(8, 8))
+            using (PixelArea<TPixel> area = new PixelArea<TPixel>(8, 8, ComponentOrder.Xyz))
+            using (PixelAccessor<TPixel> s = src.Lock())
+            using (PixelAccessor<TPixel> d = dest.Lock())
             {
                 s.CopyRGBBytesStretchedTo(area, 0, 0);
                 d.CopyFrom(area, 0, 0);
@@ -61,15 +62,15 @@ namespace ImageSharp.Tests
         }
 
         [Theory]
-        [WithMemberFactory(nameof(CreateTestImage), PixelTypes.Color | PixelTypes.StandardImageClass | PixelTypes.Argb32)]
-        public void CopyStretchedRGBTo_WithOffset<TColor>(TestImageProvider<TColor> provider)
-            where TColor : struct, IPixel<TColor>
+        [WithMemberFactory(nameof(CreateTestImage), PixelTypes.Rgba32| PixelTypes.StandardImageClass | PixelTypes.Argb32)]
+        public void CopyStretchedRGBTo_WithOffset<TPixel>(TestImageProvider<TPixel> provider)
+            where TPixel : struct, IPixel<TPixel>
         {
-            using (Image<TColor> src = provider.GetImage())
-            using (PixelArea<TColor> area = new PixelArea<TColor>(8, 8, ComponentOrder.Xyz))
-            using (Image<TColor> dest = provider.Factory.CreateImage(8, 8))
-            using (PixelAccessor<TColor> s = src.Lock())
-            using (PixelAccessor<TColor> d = dest.Lock())
+            using (Image<TPixel> src = provider.GetImage())
+            using (PixelArea<TPixel> area = new PixelArea<TPixel>(8, 8, ComponentOrder.Xyz))
+            using (Image<TPixel> dest = provider.Factory.CreateImage(8, 8))
+            using (PixelAccessor<TPixel> s = src.Lock())
+            using (PixelAccessor<TPixel> d = dest.Lock())
             {
                 s.CopyRGBBytesStretchedTo(area, 7, 6);
                 d.CopyFrom(area, 0, 0);
diff --git a/tests/ImageSharp.Tests/Formats/Png/PngEncoderTests.cs b/tests/ImageSharp.Tests/Formats/Png/PngEncoderTests.cs
index 51cb0cdc00..ae4dfc1e9a 100644
--- a/tests/ImageSharp.Tests/Formats/Png/PngEncoderTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Png/PngEncoderTests.cs
@@ -11,16 +11,18 @@ namespace ImageSharp.Tests
     using System.Linq;
     using System.Threading.Tasks;
     using ImageSharp.IO;
+    using ImageSharp.PixelFormats;
+
     using Xunit;
 
     public class PngEncoderTests : FileTestBase
     {
         [Theory]
         [WithBlankImages(1, 1, PixelTypes.All)]
-        public void WritesFileMarker<TColor>(TestImageProvider<TColor> provider)
-            where TColor : struct, IPixel<TColor>
+        public void WritesFileMarker<TPixel>(TestImageProvider<TPixel> provider)
+            where TPixel : struct, IPixel<TPixel>
         {
-            using (Image<TColor> image = provider.GetImage())
+            using (Image<TPixel> image = provider.GetImage())
             using (MemoryStream ms = new MemoryStream())
             {
                 image.Save(ms, new PngEncoder());
diff --git a/tests/ImageSharp.Tests/Formats/Png/PngSmokeTests.cs b/tests/ImageSharp.Tests/Formats/Png/PngSmokeTests.cs
index a7453f77ca..46ade9f9a6 100644
--- a/tests/ImageSharp.Tests/Formats/Png/PngSmokeTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Png/PngSmokeTests.cs
@@ -15,15 +15,17 @@ namespace ImageSharp.Tests.Formats.Png
     using ImageSharp.IO;
     using System.Numerics;
 
+    using ImageSharp.PixelFormats;
+
     public class PngSmokeTests
     {
         [Theory]
         [WithTestPatternImages(300, 300, PixelTypes.All)]
-        public void GeneralTest<TColor>(TestImageProvider<TColor> provider)
-            where TColor : struct, IPixel<TColor>
+        public void GeneralTest<TPixel>(TestImageProvider<TPixel> provider)
+            where TPixel : struct, IPixel<TPixel>
         {
             // does saving a file then repoening mean both files are identical???
-            using (Image<TColor> image = provider.GetImage())
+            using (Image<TPixel> image = provider.GetImage())
             using (MemoryStream ms = new MemoryStream())
             {
                 // image.Save(provider.Utility.GetTestOutputFileName("bmp"));
@@ -40,11 +42,11 @@ namespace ImageSharp.Tests.Formats.Png
 
         [Theory]
         [WithTestPatternImages(100, 100, PixelTypes.All)]
-        public void CanSaveIndexedPng<TColor>(TestImageProvider<TColor> provider)
-            where TColor : struct, IPixel<TColor>
+        public void CanSaveIndexedPng<TPixel>(TestImageProvider<TPixel> provider)
+            where TPixel : struct, IPixel<TPixel>
         {
             // does saving a file then repoening mean both files are identical???
-            using (Image<TColor> image = provider.GetImage())
+            using (Image<TPixel> image = provider.GetImage())
             using (MemoryStream ms = new MemoryStream())
             {
                 // image.Save(provider.Utility.GetTestOutputFileName("bmp"));
@@ -62,11 +64,11 @@ namespace ImageSharp.Tests.Formats.Png
         // JJS: Commented out for now since the test does not take into lossy nature of indexing.
         //[Theory]
         //[WithTestPatternImages(100, 100, PixelTypes.Color)]
-        //public void CanSaveIndexedPngTwice<TColor>(TestImageProvider<TColor> provider)
-        //    where TColor : struct, IPixel<TColor>
+        //public void CanSaveIndexedPngTwice<TPixel>(TestImageProvider<TPixel> provider)
+        //    where TPixel : struct, IPixel<TPixel>
         //{
         //    // does saving a file then repoening mean both files are identical???
-        //    using (Image<TColor> source = provider.GetImage())
+        //    using (Image<TPixel> source = provider.GetImage())
         //    using (MemoryStream ms = new MemoryStream())
         //    {
         //        source.MetaData.Quality = 256;
@@ -104,11 +106,11 @@ namespace ImageSharp.Tests.Formats.Png
 
         [Theory]
         [WithTestPatternImages(300, 300, PixelTypes.All)]
-        public void Resize<TColor>(TestImageProvider<TColor> provider)
-            where TColor : struct, IPixel<TColor>
+        public void Resize<TPixel>(TestImageProvider<TPixel> provider)
+            where TPixel : struct, IPixel<TPixel>
         {
             // does saving a file then repoening mean both files are identical???
-            using (Image<TColor> image = provider.GetImage())
+            using (Image<TPixel> image = provider.GetImage())
             using (MemoryStream ms = new MemoryStream())
             {
                 // image.Save(provider.Utility.GetTestOutputFileName("png"));
diff --git a/tests/ImageSharp.Tests/Image/ImageLoadTests.cs b/tests/ImageSharp.Tests/Image/ImageLoadTests.cs
index 10b0cbb947..505074a6aa 100644
--- a/tests/ImageSharp.Tests/Image/ImageLoadTests.cs
+++ b/tests/ImageSharp.Tests/Image/ImageLoadTests.cs
@@ -7,9 +7,10 @@ namespace ImageSharp.Tests
 {
     using System;
     using System.IO;
-    using System.Linq;
+
     using ImageSharp.Formats;
     using ImageSharp.IO;
+    using ImageSharp.PixelFormats;
     using Moq;
     using Xunit;
 
@@ -20,7 +21,7 @@ namespace ImageSharp.Tests
     {
         private readonly Mock<IFileSystem> fileSystem;
         private readonly IDecoderOptions decoderOptions;
-        private Image<Color> returnImage;
+        private Image<Rgba32> returnImage;
         private Mock<IImageDecoder> localDecoder;
         private Mock<IImageFormat> localFormat;
         private readonly string FilePath;
@@ -44,7 +45,7 @@ namespace ImageSharp.Tests
             this.localFormat.Setup(x => x.IsSupportedFileFormat(It.IsAny<byte[]>())).Returns(true);
             this.localFormat.Setup(x => x.SupportedExtensions).Returns(new string[] { "png", "jpg" });
 
-            this.localDecoder.Setup(x => x.Decode<Color>(It.IsAny<Configuration>(), It.IsAny<Stream>(), It.IsAny<IDecoderOptions>()))
+            this.localDecoder.Setup(x => x.Decode<Rgba32>(It.IsAny<Configuration>(), It.IsAny<Stream>(), It.IsAny<IDecoderOptions>()))
 
                 .Callback<Configuration, Stream, IDecoderOptions>((c, s, o) => {
                     using (var ms = new MemoryStream())
@@ -103,10 +104,10 @@ namespace ImageSharp.Tests
         [Fact]
         public void LoadFromStreamWithType()
         {
-            Image<Color> img = Image.Load<Color>(this.DataStream);
+            Image<Rgba32> img = Image.Load<Rgba32>(this.DataStream);
 
             Assert.NotNull(img);
-            Assert.Equal(TestFormat.GlobalTestFormat.Sample<Color>(), img);
+            Assert.Equal(TestFormat.GlobalTestFormat.Sample<Rgba32>(), img);
             Assert.Equal(TestFormat.GlobalTestFormat, img.CurrentImageFormat);
 
             TestFormat.GlobalTestFormat.VerifyDecodeCall(this.Marker, null, Configuration.Default);
@@ -128,10 +129,10 @@ namespace ImageSharp.Tests
         [Fact]
         public void LoadFromStreamWithTypeAndOptions()
         {
-            Image<Color> img = Image.Load<Color>(this.DataStream, this.decoderOptions);
+            Image<Rgba32> img = Image.Load<Rgba32>(this.DataStream, this.decoderOptions);
 
             Assert.NotNull(img);
-            Assert.Equal(TestFormat.GlobalTestFormat.Sample<Color>(), img);
+            Assert.Equal(TestFormat.GlobalTestFormat.Sample<Rgba32>(), img);
             Assert.Equal(TestFormat.GlobalTestFormat, img.CurrentImageFormat);
 
             TestFormat.GlobalTestFormat.VerifyDecodeCall(this.Marker, this.decoderOptions, Configuration.Default);
@@ -147,7 +148,7 @@ namespace ImageSharp.Tests
             Assert.NotNull(img);
             Assert.Equal(this.localFormat.Object, img.CurrentImageFormat);
 
-            this.localDecoder.Verify(x => x.Decode<Color>(this.LocalConfiguration, stream, null));
+            this.localDecoder.Verify(x => x.Decode<Rgba32>(this.LocalConfiguration, stream, null));
 
         }
 
@@ -155,13 +156,13 @@ namespace ImageSharp.Tests
         public void LoadFromStreamWithTypeAndConfig()
         {
             Stream stream = new MemoryStream();
-            Image<Color> img = Image.Load<Color>(this.LocalConfiguration, stream);
+            Image<Rgba32> img = Image.Load<Rgba32>(this.LocalConfiguration, stream);
 
             Assert.NotNull(img);
             Assert.Equal(this.returnImage, img);
             Assert.Equal(this.localFormat.Object, img.CurrentImageFormat);
 
-            this.localDecoder.Verify(x => x.Decode<Color>(this.LocalConfiguration, stream, null));
+            this.localDecoder.Verify(x => x.Decode<Rgba32>(this.LocalConfiguration, stream, null));
 
         }
 
@@ -174,7 +175,7 @@ namespace ImageSharp.Tests
             Assert.NotNull(img);
             Assert.Equal(this.localFormat.Object, img.CurrentImageFormat);
 
-            this.localDecoder.Verify(x => x.Decode<Color>(this.LocalConfiguration, stream, this.decoderOptions));
+            this.localDecoder.Verify(x => x.Decode<Rgba32>(this.LocalConfiguration, stream, this.decoderOptions));
 
         }
 
@@ -182,13 +183,13 @@ namespace ImageSharp.Tests
         public void LoadFromStreamWithTypeAndConfigAndOptions()
         {
             Stream stream = new MemoryStream();
-            Image<Color> img = Image.Load<Color>(this.LocalConfiguration, stream, this.decoderOptions);
+            Image<Rgba32> img = Image.Load<Rgba32>(this.LocalConfiguration, stream, this.decoderOptions);
 
             Assert.NotNull(img);
             Assert.Equal(this.returnImage, img);
             Assert.Equal(this.localFormat.Object, img.CurrentImageFormat);
 
-            this.localDecoder.Verify(x => x.Decode<Color>(this.LocalConfiguration, stream, this.decoderOptions));
+            this.localDecoder.Verify(x => x.Decode<Rgba32>(this.LocalConfiguration, stream, this.decoderOptions));
 
         }
 
@@ -201,18 +202,18 @@ namespace ImageSharp.Tests
             Image img = Image.Load(stream, this.localDecoder.Object);
 
             Assert.NotNull(img);
-            this.localDecoder.Verify(x => x.Decode<Color>(Configuration.Default, stream, null));
+            this.localDecoder.Verify(x => x.Decode<Rgba32>(Configuration.Default, stream, null));
         }
 
         [Fact]
         public void LoadFromStreamWithTypeAndDecoder()
         {
             Stream stream = new MemoryStream();
-            Image<Color> img = Image.Load<Color>(stream, this.localDecoder.Object);
+            Image<Rgba32> img = Image.Load<Rgba32>(stream, this.localDecoder.Object);
 
             Assert.NotNull(img);
             Assert.Equal(this.returnImage, img);
-            this.localDecoder.Verify(x => x.Decode<Color>(Configuration.Default, stream, null));
+            this.localDecoder.Verify(x => x.Decode<Rgba32>(Configuration.Default, stream, null));
         }
 
         [Fact]
@@ -222,18 +223,18 @@ namespace ImageSharp.Tests
             Image img = Image.Load(stream, this.localDecoder.Object, this.decoderOptions);
 
             Assert.NotNull(img);
-            this.localDecoder.Verify(x => x.Decode<Color>(Configuration.Default, stream, this.decoderOptions));
+            this.localDecoder.Verify(x => x.Decode<Rgba32>(Configuration.Default, stream, this.decoderOptions));
         }
 
         [Fact]
         public void LoadFromStreamWithTypeAndDecoderAndOptions()
         {
             Stream stream = new MemoryStream();
-            Image<Color> img = Image.Load<Color>(stream, this.localDecoder.Object, this.decoderOptions);
+            Image<Rgba32> img = Image.Load<Rgba32>(stream, this.localDecoder.Object, this.decoderOptions);
 
             Assert.NotNull(img);
             Assert.Equal(this.returnImage, img);
-            this.localDecoder.Verify(x => x.Decode<Color>(Configuration.Default, stream, this.decoderOptions));
+            this.localDecoder.Verify(x => x.Decode<Rgba32>(Configuration.Default, stream, this.decoderOptions));
         }
 
         [Fact]
@@ -252,10 +253,10 @@ namespace ImageSharp.Tests
         [Fact]
         public void LoadFromBytesWithType()
         {
-            Image<Color> img = Image.Load<Color>(this.DataStream.ToArray());
+            Image<Rgba32> img = Image.Load<Rgba32>(this.DataStream.ToArray());
 
             Assert.NotNull(img);
-            Assert.Equal(TestFormat.GlobalTestFormat.Sample<Color>(), img);
+            Assert.Equal(TestFormat.GlobalTestFormat.Sample<Rgba32>(), img);
             Assert.Equal(TestFormat.GlobalTestFormat, img.CurrentImageFormat);
 
             TestFormat.GlobalTestFormat.VerifyDecodeCall(this.Marker, null, Configuration.Default);
@@ -277,10 +278,10 @@ namespace ImageSharp.Tests
         [Fact]
         public void LoadFromBytesWithTypeAndOptions()
         {
-            Image<Color> img = Image.Load<Color>(this.DataStream.ToArray(), this.decoderOptions);
+            Image<Rgba32> img = Image.Load<Rgba32>(this.DataStream.ToArray(), this.decoderOptions);
 
             Assert.NotNull(img);
-            Assert.Equal(TestFormat.GlobalTestFormat.Sample<Color>(), img);
+            Assert.Equal(TestFormat.GlobalTestFormat.Sample<Rgba32>(), img);
             Assert.Equal(TestFormat.GlobalTestFormat, img.CurrentImageFormat);
 
             TestFormat.GlobalTestFormat.VerifyDecodeCall(this.Marker, this.decoderOptions, Configuration.Default);
@@ -295,7 +296,7 @@ namespace ImageSharp.Tests
             Assert.NotNull(img);
             Assert.Equal(this.localFormat.Object, img.CurrentImageFormat);
 
-            this.localDecoder.Verify(x => x.Decode<Color>(this.LocalConfiguration, It.IsAny<Stream>(), null));
+            this.localDecoder.Verify(x => x.Decode<Rgba32>(this.LocalConfiguration, It.IsAny<Stream>(), null));
 
             Assert.Equal(this.DataStream.ToArray(), this.DecodedData);
         }
@@ -303,14 +304,14 @@ namespace ImageSharp.Tests
         [Fact]
         public void LoadFromBytesWithTypeAndConfig()
         {
-            Image<Color> img = Image.Load<Color>(this.LocalConfiguration, this.DataStream.ToArray());
+            Image<Rgba32> img = Image.Load<Rgba32>(this.LocalConfiguration, this.DataStream.ToArray());
 
             Assert.NotNull(img);
             Assert.Equal(this.returnImage, img);
             Assert.Equal(this.localFormat.Object, img.CurrentImageFormat);
 
 
-            this.localDecoder.Verify(x => x.Decode<Color>(this.LocalConfiguration, It.IsAny<Stream>(), null));
+            this.localDecoder.Verify(x => x.Decode<Rgba32>(this.LocalConfiguration, It.IsAny<Stream>(), null));
 
             Assert.Equal(this.DataStream.ToArray(), this.DecodedData);
         }
@@ -323,7 +324,7 @@ namespace ImageSharp.Tests
             Assert.NotNull(img);
             Assert.Equal(this.localFormat.Object, img.CurrentImageFormat);
 
-            this.localDecoder.Verify(x => x.Decode<Color>(this.LocalConfiguration, It.IsAny<Stream>(), this.decoderOptions));
+            this.localDecoder.Verify(x => x.Decode<Rgba32>(this.LocalConfiguration, It.IsAny<Stream>(), this.decoderOptions));
 
             Assert.Equal(this.DataStream.ToArray(), this.DecodedData);
         }
@@ -331,13 +332,13 @@ namespace ImageSharp.Tests
         [Fact]
         public void LoadFromBytesWithTypeAndConfigAndOptions()
         {
-            Image<Color> img = Image.Load<Color>(this.LocalConfiguration, this.DataStream.ToArray(), this.decoderOptions);
+            Image<Rgba32> img = Image.Load<Rgba32>(this.LocalConfiguration, this.DataStream.ToArray(), this.decoderOptions);
 
             Assert.NotNull(img);
             Assert.Equal(this.returnImage, img);
             Assert.Equal(this.localFormat.Object, img.CurrentImageFormat);
 
-            this.localDecoder.Verify(x => x.Decode<Color>(this.LocalConfiguration, It.IsAny<Stream>(), this.decoderOptions));
+            this.localDecoder.Verify(x => x.Decode<Rgba32>(this.LocalConfiguration, It.IsAny<Stream>(), this.decoderOptions));
 
             Assert.Equal(this.DataStream.ToArray(), this.DecodedData);
         }
@@ -349,18 +350,18 @@ namespace ImageSharp.Tests
             Image img = Image.Load(this.DataStream.ToArray(), this.localDecoder.Object);
 
             Assert.NotNull(img);
-            this.localDecoder.Verify(x => x.Decode<Color>(Configuration.Default, It.IsAny<Stream>(), null));
+            this.localDecoder.Verify(x => x.Decode<Rgba32>(Configuration.Default, It.IsAny<Stream>(), null));
             Assert.Equal(this.DataStream.ToArray(), this.DecodedData);
         }
 
         [Fact]
         public void LoadFromBytesWithTypeAndDecoder()
         {
-            Image<Color> img = Image.Load<Color>(this.DataStream.ToArray(), this.localDecoder.Object);
+            Image<Rgba32> img = Image.Load<Rgba32>(this.DataStream.ToArray(), this.localDecoder.Object);
 
             Assert.NotNull(img);
             Assert.Equal(this.returnImage, img);
-            this.localDecoder.Verify(x => x.Decode<Color>(Configuration.Default, It.IsAny<Stream>(), null));
+            this.localDecoder.Verify(x => x.Decode<Rgba32>(Configuration.Default, It.IsAny<Stream>(), null));
             Assert.Equal(this.DataStream.ToArray(), this.DecodedData);
         }
 
@@ -370,18 +371,18 @@ namespace ImageSharp.Tests
             Image img = Image.Load(this.DataStream.ToArray(), this.localDecoder.Object, this.decoderOptions);
 
             Assert.NotNull(img);
-            this.localDecoder.Verify(x => x.Decode<Color>(Configuration.Default, It.IsAny<Stream>(), this.decoderOptions));
+            this.localDecoder.Verify(x => x.Decode<Rgba32>(Configuration.Default, It.IsAny<Stream>(), this.decoderOptions));
             Assert.Equal(this.DataStream.ToArray(), this.DecodedData);
         }
 
         [Fact]
         public void LoadFromBytesWithTypeAndDecoderAndOptions()
         {
-            Image<Color> img = Image.Load<Color>(this.DataStream.ToArray(), this.localDecoder.Object, this.decoderOptions);
+            Image<Rgba32> img = Image.Load<Rgba32>(this.DataStream.ToArray(), this.localDecoder.Object, this.decoderOptions);
 
             Assert.NotNull(img);
             Assert.Equal(this.returnImage, img);
-            this.localDecoder.Verify(x => x.Decode<Color>(Configuration.Default, It.IsAny<Stream>(), this.decoderOptions));
+            this.localDecoder.Verify(x => x.Decode<Rgba32>(Configuration.Default, It.IsAny<Stream>(), this.decoderOptions));
             Assert.Equal(this.DataStream.ToArray(), this.DecodedData);
         }
 
@@ -401,10 +402,10 @@ namespace ImageSharp.Tests
         [Fact]
         public void LoadFromFileWithType()
         {
-            Image<Color> img = Image.Load<Color>(this.DataStream);
+            Image<Rgba32> img = Image.Load<Rgba32>(this.DataStream);
 
             Assert.NotNull(img);
-            Assert.Equal(TestFormat.GlobalTestFormat.Sample<Color>(), img);
+            Assert.Equal(TestFormat.GlobalTestFormat.Sample<Rgba32>(), img);
             Assert.Equal(TestFormat.GlobalTestFormat, img.CurrentImageFormat);
 
             TestFormat.GlobalTestFormat.VerifyDecodeCall(this.Marker, null, Configuration.Default);
@@ -426,10 +427,10 @@ namespace ImageSharp.Tests
         [Fact]
         public void LoadFromFileWithTypeAndOptions()
         {
-            Image<Color> img = Image.Load<Color>(this.DataStream, this.decoderOptions);
+            Image<Rgba32> img = Image.Load<Rgba32>(this.DataStream, this.decoderOptions);
 
             Assert.NotNull(img);
-            Assert.Equal(TestFormat.GlobalTestFormat.Sample<Color>(), img);
+            Assert.Equal(TestFormat.GlobalTestFormat.Sample<Rgba32>(), img);
             Assert.Equal(TestFormat.GlobalTestFormat, img.CurrentImageFormat);
 
             TestFormat.GlobalTestFormat.VerifyDecodeCall(this.Marker, this.decoderOptions, Configuration.Default);
@@ -444,20 +445,20 @@ namespace ImageSharp.Tests
             Assert.NotNull(img);
             Assert.Equal(this.localFormat.Object, img.CurrentImageFormat);
 
-            this.localDecoder.Verify(x => x.Decode<Color>(this.LocalConfiguration, this.DataStream, null));
+            this.localDecoder.Verify(x => x.Decode<Rgba32>(this.LocalConfiguration, this.DataStream, null));
 
         }
 
         [Fact]
         public void LoadFromFileWithTypeAndConfig()
         {
-            Image<Color> img = Image.Load<Color>(this.LocalConfiguration, this.FilePath);
+            Image<Rgba32> img = Image.Load<Rgba32>(this.LocalConfiguration, this.FilePath);
 
             Assert.NotNull(img);
             Assert.Equal(this.returnImage, img);
             Assert.Equal(this.localFormat.Object, img.CurrentImageFormat);
 
-            this.localDecoder.Verify(x => x.Decode<Color>(this.LocalConfiguration, this.DataStream, null));
+            this.localDecoder.Verify(x => x.Decode<Rgba32>(this.LocalConfiguration, this.DataStream, null));
 
         }
 
@@ -469,20 +470,20 @@ namespace ImageSharp.Tests
             Assert.NotNull(img);
             Assert.Equal(this.localFormat.Object, img.CurrentImageFormat);
 
-            this.localDecoder.Verify(x => x.Decode<Color>(this.LocalConfiguration, this.DataStream, this.decoderOptions));
+            this.localDecoder.Verify(x => x.Decode<Rgba32>(this.LocalConfiguration, this.DataStream, this.decoderOptions));
 
         }
 
         [Fact]
         public void LoadFromFileWithTypeAndConfigAndOptions()
         {
-            Image<Color> img = Image.Load<Color>(this.LocalConfiguration, this.FilePath, this.decoderOptions);
+            Image<Rgba32> img = Image.Load<Rgba32>(this.LocalConfiguration, this.FilePath, this.decoderOptions);
 
             Assert.NotNull(img);
             Assert.Equal(this.returnImage, img);
             Assert.Equal(this.localFormat.Object, img.CurrentImageFormat);
 
-            this.localDecoder.Verify(x => x.Decode<Color>(this.LocalConfiguration, this.DataStream, this.decoderOptions));
+            this.localDecoder.Verify(x => x.Decode<Rgba32>(this.LocalConfiguration, this.DataStream, this.decoderOptions));
 
         }
 
@@ -493,17 +494,17 @@ namespace ImageSharp.Tests
             Image img = Image.Load(this.FilePath, this.localDecoder.Object);
 
             Assert.NotNull(img);
-            this.localDecoder.Verify(x => x.Decode<Color>(Configuration.Default, this.DataStream, null));
+            this.localDecoder.Verify(x => x.Decode<Rgba32>(Configuration.Default, this.DataStream, null));
         }
 
         [Fact]
         public void LoadFromFileWithTypeAndDecoder()
         {
-            Image<Color> img = Image.Load<Color>(this.FilePath, this.localDecoder.Object);
+            Image<Rgba32> img = Image.Load<Rgba32>(this.FilePath, this.localDecoder.Object);
 
             Assert.NotNull(img);
             Assert.Equal(this.returnImage, img);
-            this.localDecoder.Verify(x => x.Decode<Color>(Configuration.Default, this.DataStream, null));
+            this.localDecoder.Verify(x => x.Decode<Rgba32>(Configuration.Default, this.DataStream, null));
         }
 
         [Fact]
@@ -512,17 +513,17 @@ namespace ImageSharp.Tests
             Image img = Image.Load(this.FilePath, this.localDecoder.Object, this.decoderOptions);
 
             Assert.NotNull(img);
-            this.localDecoder.Verify(x => x.Decode<Color>(Configuration.Default, this.DataStream, this.decoderOptions));
+            this.localDecoder.Verify(x => x.Decode<Rgba32>(Configuration.Default, this.DataStream, this.decoderOptions));
         }
 
         [Fact]
         public void LoadFromFileWithTypeAndDecoderAndOptions()
         {
-            Image<Color> img = Image.Load<Color>(this.FilePath, this.localDecoder.Object, this.decoderOptions);
+            Image<Rgba32> img = Image.Load<Rgba32>(this.FilePath, this.localDecoder.Object, this.decoderOptions);
 
             Assert.NotNull(img);
             Assert.Equal(this.returnImage, img);
-            this.localDecoder.Verify(x => x.Decode<Color>(Configuration.Default, this.DataStream, this.decoderOptions));
+            this.localDecoder.Verify(x => x.Decode<Rgba32>(Configuration.Default, this.DataStream, this.decoderOptions));
         }
 
         public void Dispose()
diff --git a/tests/ImageSharp.Tests/Image/ImageSaveTests.cs b/tests/ImageSharp.Tests/Image/ImageSaveTests.cs
index 0d1c3e09b5..902bedb5e5 100644
--- a/tests/ImageSharp.Tests/Image/ImageSaveTests.cs
+++ b/tests/ImageSharp.Tests/Image/ImageSaveTests.cs
@@ -10,6 +10,8 @@ namespace ImageSharp.Tests
     using System.Linq;
     using ImageSharp.Formats;
     using ImageSharp.IO;
+    using ImageSharp.PixelFormats;
+
     using Moq;
     using Xunit;
 
@@ -59,7 +61,7 @@ namespace ImageSharp.Tests
             this.fileSystem.Setup(x => x.Create("path.png")).Returns(stream);
             this.Image.Save("path.png");
 
-            this.encoder.Verify(x => x.Encode<Color>(this.Image, stream, null));
+            this.encoder.Verify(x => x.Encode<Rgba32>(this.Image, stream, null));
         }
 
         [Fact]
@@ -70,7 +72,7 @@ namespace ImageSharp.Tests
 
             this.Image.Save("path.jpg", this.encoderOptions);
             
-            this.encoder.Verify(x => x.Encode<Color>(this.Image, stream, this.encoderOptions));
+            this.encoder.Verify(x => x.Encode<Rgba32>(this.Image, stream, this.encoderOptions));
         }
 
         [Fact]
@@ -81,7 +83,7 @@ namespace ImageSharp.Tests
 
             this.Image.Save("path.jpg", this.encoderNotInFormat.Object);
 
-            this.encoderNotInFormat.Verify(x => x.Encode<Color>(this.Image, stream, null));
+            this.encoderNotInFormat.Verify(x => x.Encode<Rgba32>(this.Image, stream, null));
         }
 
         [Fact]
@@ -92,7 +94,7 @@ namespace ImageSharp.Tests
 
             this.Image.Save("path.jpg", this.encoderNotInFormat.Object, this.encoderOptions);
 
-            this.encoderNotInFormat.Verify(x => x.Encode<Color>(this.Image, stream, this.encoderOptions));
+            this.encoderNotInFormat.Verify(x => x.Encode<Rgba32>(this.Image, stream, this.encoderOptions));
         }
 
 
@@ -105,7 +107,7 @@ namespace ImageSharp.Tests
 
             this.Image.Save("path.jpg", this.encoderNotInFormat.Object);
 
-            this.encoderNotInFormat.Verify(x => x.Encode<Color>(this.Image, stream, null));
+            this.encoderNotInFormat.Verify(x => x.Encode<Rgba32>(this.Image, stream, null));
         }
 
         [Fact]
@@ -116,7 +118,7 @@ namespace ImageSharp.Tests
 
             this.Image.Save("path.jpg", this.encoderNotInFormat.Object, this.encoderOptions);
 
-            this.encoderNotInFormat.Verify(x => x.Encode<Color>(this.Image, stream, this.encoderOptions));
+            this.encoderNotInFormat.Verify(x => x.Encode<Rgba32>(this.Image, stream, this.encoderOptions));
         }
 
         [Fact]
@@ -125,7 +127,7 @@ namespace ImageSharp.Tests
             Stream stream = new MemoryStream();
             this.Image.Save(stream);
             
-            this.encoder.Verify(x => x.Encode<Color>(this.Image, stream, null));
+            this.encoder.Verify(x => x.Encode<Rgba32>(this.Image, stream, null));
         }
 
         [Fact]
@@ -135,7 +137,7 @@ namespace ImageSharp.Tests
 
             this.Image.Save(stream, this.encoderOptions);
 
-            this.encoder.Verify(x => x.Encode<Color>(this.Image, stream, this.encoderOptions));
+            this.encoder.Verify(x => x.Encode<Rgba32>(this.Image, stream, this.encoderOptions));
         }
 
         [Fact]
@@ -145,7 +147,7 @@ namespace ImageSharp.Tests
 
             this.Image.Save(stream, this.encoderNotInFormat.Object);
 
-            this.encoderNotInFormat.Verify(x => x.Encode<Color>(this.Image, stream, null));
+            this.encoderNotInFormat.Verify(x => x.Encode<Rgba32>(this.Image, stream, null));
         }
 
         [Fact]
@@ -155,7 +157,7 @@ namespace ImageSharp.Tests
 
             this.Image.Save(stream, this.encoderNotInFormat.Object, this.encoderOptions);
 
-            this.encoderNotInFormat.Verify(x => x.Encode<Color>(this.Image, stream, this.encoderOptions));
+            this.encoderNotInFormat.Verify(x => x.Encode<Rgba32>(this.Image, stream, this.encoderOptions));
         }
 
         [Fact]
@@ -165,7 +167,7 @@ namespace ImageSharp.Tests
 
             this.Image.Save(stream, this.formatNotRegistered.Object);
 
-            this.encoderNotInFormat.Verify(x => x.Encode<Color>(this.Image, stream, null));
+            this.encoderNotInFormat.Verify(x => x.Encode<Rgba32>(this.Image, stream, null));
         }
 
         [Fact]
@@ -175,7 +177,7 @@ namespace ImageSharp.Tests
 
             this.Image.Save(stream, this.formatNotRegistered.Object, this.encoderOptions);
 
-            this.encoderNotInFormat.Verify(x => x.Encode<Color>(this.Image, stream, this.encoderOptions));
+            this.encoderNotInFormat.Verify(x => x.Encode<Rgba32>(this.Image, stream, this.encoderOptions));
         }
 
         public void Dispose()
diff --git a/tests/ImageSharp.Tests/Image/PixelAccessorTests.cs b/tests/ImageSharp.Tests/Image/PixelAccessorTests.cs
index cd9cd04b72..a6c4b4545d 100644
--- a/tests/ImageSharp.Tests/Image/PixelAccessorTests.cs
+++ b/tests/ImageSharp.Tests/Image/PixelAccessorTests.cs
@@ -8,6 +8,8 @@ namespace ImageSharp.Tests
     using System;
     using System.Numerics;
 
+    using ImageSharp.PixelFormats;
+
     using Xunit;
 
     /// <summary>
@@ -15,11 +17,11 @@ namespace ImageSharp.Tests
     /// </summary>
     public class PixelAccessorTests
     {
-        public static Image<TColor> CreateTestImage<TColor>(GenericFactory<TColor> factory)
-            where TColor : struct, IPixel<TColor>
+        public static Image<TPixel> CreateTestImage<TPixel>(GenericFactory<TPixel> factory)
+            where TPixel : struct, IPixel<TPixel>
         {
-            Image<TColor> image = factory.CreateImage(10, 10);
-            using (PixelAccessor<TColor> pixels = image.Lock())
+            Image<TPixel> image = factory.CreateImage(10, 10);
+            using (PixelAccessor<TPixel> pixels = image.Lock())
             {
                 for (int i = 0; i < 10; i++)
                 {
@@ -28,7 +30,7 @@ namespace ImageSharp.Tests
                         Vector4 v = new Vector4(i, j, 0, 1);
                         v /= 10;
 
-                        TColor color = default(TColor);
+                        TPixel color = default(TPixel);
                         color.PackFromVector4(v);
 
                         pixels[i, j] = color;
@@ -43,21 +45,21 @@ namespace ImageSharp.Tests
         [WithMemberFactory(nameof(CreateTestImage), PixelTypes.All, ComponentOrder.Zyx)]
         [WithMemberFactory(nameof(CreateTestImage), PixelTypes.All, ComponentOrder.Xyzw)]
         [WithMemberFactory(nameof(CreateTestImage), PixelTypes.All, ComponentOrder.Zyxw)]
-        public void CopyTo_Then_CopyFrom_OnFullImageRect<TColor>(TestImageProvider<TColor> provider, ComponentOrder order)
-            where TColor : struct, IPixel<TColor>
+        public void CopyTo_Then_CopyFrom_OnFullImageRect<TPixel>(TestImageProvider<TPixel> provider, ComponentOrder order)
+            where TPixel : struct, IPixel<TPixel>
         {
-            using (Image<TColor> src = provider.GetImage())
+            using (Image<TPixel> src = provider.GetImage())
             {
-                using (Image<TColor> dest = new Image<TColor>(src.Width, src.Height))
+                using (Image<TPixel> dest = new Image<TPixel>(src.Width, src.Height))
                 {
-                    using (PixelArea<TColor> area = new PixelArea<TColor>(src.Width, src.Height, order))
+                    using (PixelArea<TPixel> area = new PixelArea<TPixel>(src.Width, src.Height, order))
                     {
-                        using (PixelAccessor<TColor> srcPixels = src.Lock())
+                        using (PixelAccessor<TPixel> srcPixels = src.Lock())
                         {
                             srcPixels.CopyTo(area, 0, 0);
                         }
 
-                        using (PixelAccessor<TColor> destPixels = dest.Lock())
+                        using (PixelAccessor<TPixel> destPixels = dest.Lock())
                         {
                             destPixels.CopyFrom(area, 0, 0);
                         }
@@ -69,10 +71,10 @@ namespace ImageSharp.Tests
         }
 
         // TODO: Need a processor in the library with this signature
-        private static void Fill<TColor>(Image<TColor> image, Rectangle region, TColor color)
-             where TColor : struct, IPixel<TColor>
+        private static void Fill<TPixel>(Image<TPixel> image, Rectangle region, TPixel color)
+             where TPixel : struct, IPixel<TPixel>
         {
-            using (PixelAccessor<TColor> pixels = image.Lock())
+            using (PixelAccessor<TPixel> pixels = image.Lock())
             {
                 for (int y = region.Top; y < region.Bottom; y++)
                 {
@@ -89,21 +91,21 @@ namespace ImageSharp.Tests
         [WithBlankImages(16, 16, PixelTypes.All, ComponentOrder.Zyx)]
         [WithBlankImages(16, 16, PixelTypes.All, ComponentOrder.Xyzw)]
         [WithBlankImages(16, 16, PixelTypes.All, ComponentOrder.Zyxw)]
-        public void CopyToThenCopyFromWithOffset<TColor>(TestImageProvider<TColor> provider, ComponentOrder order)
-            where TColor : struct, IPixel<TColor>
+        public void CopyToThenCopyFromWithOffset<TPixel>(TestImageProvider<TPixel> provider, ComponentOrder order)
+            where TPixel : struct, IPixel<TPixel>
         {
-            using (Image<TColor> destImage = new Image<TColor>(8, 8))
+            using (Image<TPixel> destImage = new Image<TPixel>(8, 8))
             {
-                using (Image<TColor> srcImage = provider.GetImage())
+                using (Image<TPixel> srcImage = provider.GetImage())
                 {
-                    Fill(srcImage, new Rectangle(4, 4, 8, 8), NamedColors<TColor>.Red);
-                    using (PixelAccessor<TColor> srcPixels = srcImage.Lock())
+                    Fill(srcImage, new Rectangle(4, 4, 8, 8), NamedColors<TPixel>.Red);
+                    using (PixelAccessor<TPixel> srcPixels = srcImage.Lock())
                     {
-                        using (PixelArea<TColor> area = new PixelArea<TColor>(8, 8, order))
+                        using (PixelArea<TPixel> area = new PixelArea<TPixel>(8, 8, order))
                         {
                             srcPixels.CopyTo(area, 4, 4);
 
-                            using (PixelAccessor<TColor> destPixels = destImage.Lock())
+                            using (PixelAccessor<TPixel> destPixels = destImage.Lock())
                             {
                                 destPixels.CopyFrom(area, 0, 0);
                             }
@@ -114,7 +116,7 @@ namespace ImageSharp.Tests
                 provider.Utility.SourceFileOrDescription = order.ToString();
                 provider.Utility.SaveTestOutputFile(destImage, "bmp");
 
-                using (Image<TColor> expectedImage = new Image<TColor>(8, 8).Fill(NamedColors<TColor>.Red))
+                using (Image<TPixel> expectedImage = new Image<TPixel>(8, 8).Fill(NamedColors<TPixel>.Red))
                 {
                     Assert.True(destImage.IsEquivalentTo(expectedImage));
                 }
@@ -125,7 +127,7 @@ namespace ImageSharp.Tests
         [Fact]
         public void CopyFromZYX()
         {
-            using (Image<Color> image = new Image<Color>(1, 1))
+            using (Image<Rgba32> image = new Image<Rgba32>(1, 1))
             {
                 CopyFromZYX(image);
             }
@@ -134,7 +136,7 @@ namespace ImageSharp.Tests
         [Fact]
         public void CopyFromZYXW()
         {
-            using (Image<Color> image = new Image<Color>(1, 1))
+            using (Image<Rgba32> image = new Image<Rgba32>(1, 1))
             {
                 CopyFromZYXW(image);
             }
@@ -143,7 +145,7 @@ namespace ImageSharp.Tests
         [Fact]
         public void CopyToZYX()
         {
-            using (Image<Color> image = new Image<Color>(1, 1))
+            using (Image<Rgba32> image = new Image<Rgba32>(1, 1))
             {
                 CopyToZYX(image);
             }
@@ -152,23 +154,23 @@ namespace ImageSharp.Tests
         [Fact]
         public void CopyToZYXW()
         {
-            using (Image<Color> image = new Image<Color>(1, 1))
+            using (Image<Rgba32> image = new Image<Rgba32>(1, 1))
             {
                 CopyToZYXW(image);
             }
         }
         
-        private static void CopyFromZYX<TColor>(Image<TColor> image)
-            where TColor : struct, IPixel<TColor>
+        private static void CopyFromZYX<TPixel>(Image<TPixel> image)
+            where TPixel : struct, IPixel<TPixel>
         {
-            using (PixelAccessor<TColor> pixels = image.Lock())
+            using (PixelAccessor<TPixel> pixels = image.Lock())
             {
                 byte red = 1;
                 byte green = 2;
                 byte blue = 3;
                 byte alpha = 255;
 
-                using (PixelArea<TColor> row = new PixelArea<TColor>(1, ComponentOrder.Zyx))
+                using (PixelArea<TPixel> row = new PixelArea<TPixel>(1, ComponentOrder.Zyx))
                 {
                     row.Bytes[0] = blue;
                     row.Bytes[1] = green;
@@ -176,7 +178,7 @@ namespace ImageSharp.Tests
 
                     pixels.CopyFrom(row, 0);
 
-                    Color color = (Color)(object)pixels[0, 0];
+                    Rgba32 color = (Rgba32)(object)pixels[0, 0];
                     Assert.Equal(red, color.R);
                     Assert.Equal(green, color.G);
                     Assert.Equal(blue, color.B);
@@ -185,17 +187,17 @@ namespace ImageSharp.Tests
             }
         }
 
-        private static void CopyFromZYXW<TColor>(Image<TColor> image)
-            where TColor : struct, IPixel<TColor>
+        private static void CopyFromZYXW<TPixel>(Image<TPixel> image)
+            where TPixel : struct, IPixel<TPixel>
         {
-            using (PixelAccessor<TColor> pixels = image.Lock())
+            using (PixelAccessor<TPixel> pixels = image.Lock())
             {
                 byte red = 1;
                 byte green = 2;
                 byte blue = 3;
                 byte alpha = 4;
 
-                using (PixelArea<TColor> row = new PixelArea<TColor>(1, ComponentOrder.Zyxw))
+                using (PixelArea<TPixel> row = new PixelArea<TPixel>(1, ComponentOrder.Zyxw))
                 {
                     row.Bytes[0] = blue;
                     row.Bytes[1] = green;
@@ -204,7 +206,7 @@ namespace ImageSharp.Tests
 
                     pixels.CopyFrom(row, 0);
 
-                    Color color = (Color)(object)pixels[0, 0];
+                    Rgba32 color = (Rgba32)(object)pixels[0, 0];
                     Assert.Equal(red, color.R);
                     Assert.Equal(green, color.G);
                     Assert.Equal(blue, color.B);
@@ -213,18 +215,18 @@ namespace ImageSharp.Tests
             }
         }
 
-        private static void CopyToZYX<TColor>(Image<TColor> image)
-          where TColor : struct, IPixel<TColor>
+        private static void CopyToZYX<TPixel>(Image<TPixel> image)
+          where TPixel : struct, IPixel<TPixel>
         {
-            using (PixelAccessor<TColor> pixels = image.Lock())
+            using (PixelAccessor<TPixel> pixels = image.Lock())
             {
                 byte red = 1;
                 byte green = 2;
                 byte blue = 3;
 
-                using (PixelArea<TColor> row = new PixelArea<TColor>(1, ComponentOrder.Zyx))
+                using (PixelArea<TPixel> row = new PixelArea<TPixel>(1, ComponentOrder.Zyx))
                 {
-                    pixels[0, 0] = (TColor)(object)new Color(red, green, blue);
+                    pixels[0, 0] = (TPixel)(object)new Rgba32(red, green, blue);
 
                     pixels.CopyTo(row, 0);
 
@@ -235,19 +237,19 @@ namespace ImageSharp.Tests
             }
         }
 
-        private static void CopyToZYXW<TColor>(Image<TColor> image)
-            where TColor : struct, IPixel<TColor>
+        private static void CopyToZYXW<TPixel>(Image<TPixel> image)
+            where TPixel : struct, IPixel<TPixel>
         {
-            using (PixelAccessor<TColor> pixels = image.Lock())
+            using (PixelAccessor<TPixel> pixels = image.Lock())
             {
                 byte red = 1;
                 byte green = 2;
                 byte blue = 3;
                 byte alpha = 4;
 
-                using (PixelArea<TColor> row = new PixelArea<TColor>(1, ComponentOrder.Zyxw))
+                using (PixelArea<TPixel> row = new PixelArea<TPixel>(1, ComponentOrder.Zyxw))
                 {
-                    pixels[0, 0] = (TColor)(object)new Color(red, green, blue, alpha);
+                    pixels[0, 0] = (TPixel)(object)new Rgba32(red, green, blue, alpha);
 
                     pixels.CopyTo(row, 0);
 
diff --git a/tests/ImageSharp.Tests/ImageComparer.cs b/tests/ImageSharp.Tests/ImageComparer.cs
index 41b884dd43..7d0a8377d3 100644
--- a/tests/ImageSharp.Tests/ImageComparer.cs
+++ b/tests/ImageSharp.Tests/ImageComparer.cs
@@ -2,6 +2,8 @@
 {
     using System;
     using ImageSharp;
+    using ImageSharp.PixelFormats;
+
     using Xunit;
 
     /// <summary>
@@ -16,8 +18,8 @@
         /// <summary>
         /// Does a visual comparison between 2 images and then asserts the difference is less then a configurable threshold
         /// </summary>
-        /// <typeparam name="TColorA">The color of the expected image</typeparam>
-        /// <typeparam name="TColorB">The color type fo the the actual image</typeparam>
+        /// <typeparam name="TPixelA">The color of the expected image</typeparam>
+        /// <typeparam name="TPixelB">The color type fo the the actual image</typeparam>
         /// <param name="expected">The expected image</param>
         /// <param name="actual">The actual image</param>
         /// <param name="imageTheshold">
@@ -32,9 +34,9 @@
         /// This is a sampling factor we sample a grid of average pixels <paramref name="scalingFactor"/> width by <paramref name="scalingFactor"/> high
         /// The default undefined value is <see cref="ImageComparer.DefaultScalingFactor"/>
         /// </param>
-        public static void CheckSimilarity<TColorA, TColorB>(Image<TColorA> expected, Image<TColorB> actual, float imageTheshold = DefaultImageThreshold, byte segmentThreshold = DefaultSegmentThreshold, int scalingFactor = DefaultScalingFactor)
-           where TColorA : struct, IPixel<TColorA>
-           where TColorB : struct, IPixel<TColorB>
+        public static void CheckSimilarity<TPixelA, TPixelB>(Image<TPixelA> expected, Image<TPixelB> actual, float imageTheshold = DefaultImageThreshold, byte segmentThreshold = DefaultSegmentThreshold, int scalingFactor = DefaultScalingFactor)
+           where TPixelA : struct, IPixel<TPixelA>
+           where TPixelB : struct, IPixel<TPixelB>
         {
             float percentage = expected.PercentageDifference(actual, segmentThreshold, scalingFactor);
 
@@ -44,8 +46,8 @@
         /// <summary>
         /// Does a visual comparison between 2 images and then and returns the percentage diffence between the 2
         /// </summary>
-        /// <typeparam name="TColorA">The color of the source image</typeparam>
-        /// <typeparam name="TColorB">The color type for the target image</typeparam>
+        /// <typeparam name="TPixelA">The color of the source image</typeparam>
+        /// <typeparam name="TPixelB">The color type for the target image</typeparam>
         /// <param name="source">The source image</param>
         /// <param name="target">The target image</param>
         /// <param name="segmentThreshold">
@@ -57,9 +59,9 @@
         /// The default undefined value is <see cref="ImageComparer.DefaultScalingFactor"/>
         /// </param>
         /// <returns>Returns a number from 0 - 1 which represents the diference focter between the images.</returns>
-        public static float PercentageDifference<TColorA, TColorB>(this Image<TColorA> source, Image<TColorB> target, byte segmentThreshold = DefaultSegmentThreshold, int scalingFactor = DefaultScalingFactor)
-            where TColorA : struct, IPixel<TColorA>
-            where TColorB : struct, IPixel<TColorB>
+        public static float PercentageDifference<TPixelA, TPixelB>(this Image<TPixelA> source, Image<TPixelB> target, byte segmentThreshold = DefaultSegmentThreshold, int scalingFactor = DefaultScalingFactor)
+            where TPixelA : struct, IPixel<TPixelA>
+            where TPixelB : struct, IPixel<TPixelB>
         {
             // code adapted from https://www.codeproject.com/Articles/374386/Simple-image-comparison-in-NET
             Fast2DArray<byte> differences = GetDifferences(source, target, scalingFactor);
@@ -74,9 +76,9 @@
             return diffPixels / (scalingFactor * scalingFactor);
         }
 
-        private static Fast2DArray<byte> GetDifferences<TColorA, TColorB>(Image<TColorA> source, Image<TColorB> target, int scalingFactor)
-            where TColorA : struct, IPixel<TColorA>
-            where TColorB : struct, IPixel<TColorB>
+        private static Fast2DArray<byte> GetDifferences<TPixelA, TPixelB>(Image<TPixelA> source, Image<TPixelB> target, int scalingFactor)
+            where TPixelA : struct, IPixel<TPixelA>
+            where TPixelB : struct, IPixel<TPixelB>
         {
             Fast2DArray<byte> differences = new Fast2DArray<byte>(scalingFactor, scalingFactor);
             Fast2DArray<byte> firstGray = source.GetGrayScaleValues(scalingFactor);
@@ -93,13 +95,13 @@
             return differences;
         }
 
-        private static Fast2DArray<byte> GetGrayScaleValues<TColorA>(this Image<TColorA> source, int scalingFactor)
-            where TColorA : struct, IPixel<TColorA>
+        private static Fast2DArray<byte> GetGrayScaleValues<TPixelA>(this Image<TPixelA> source, int scalingFactor)
+            where TPixelA : struct, IPixel<TPixelA>
         {
             byte[] buffer = new byte[4];
-            using (Image<TColorA> img = new Image<TColorA>(source).Resize(scalingFactor, scalingFactor).Grayscale())
+            using (Image<TPixelA> img = new Image<TPixelA>(source).Resize(scalingFactor, scalingFactor).Grayscale())
             {
-                using (PixelAccessor<TColorA> pixels = img.Lock())
+                using (PixelAccessor<TPixelA> pixels = img.Lock())
                 {
                     Fast2DArray<byte> grayScale = new Fast2DArray<byte>(scalingFactor, scalingFactor);
                     for (int y = 0; y < scalingFactor; y++)
diff --git a/tests/ImageSharp.Tests/MetaData/Profiles/Exif/ExifProfileTests.cs b/tests/ImageSharp.Tests/MetaData/Profiles/Exif/ExifProfileTests.cs
index f380724df0..6a832859aa 100644
--- a/tests/ImageSharp.Tests/MetaData/Profiles/Exif/ExifProfileTests.cs
+++ b/tests/ImageSharp.Tests/MetaData/Profiles/Exif/ExifProfileTests.cs
@@ -10,6 +10,9 @@ namespace ImageSharp.Tests
     using System.IO;
     using System.Linq;
     using System.Text;
+
+    using ImageSharp.PixelFormats;
+
     using Xunit;
 
     public class ExifProfileTests
@@ -243,7 +246,7 @@ namespace ImageSharp.Tests
 
             TestProfile(profile);
 
-            Image<Color> thumbnail = profile.CreateThumbnail<Color>();
+            Image<Rgba32> thumbnail = profile.CreateThumbnail<Rgba32>();
             Assert.NotNull(thumbnail);
             Assert.Equal(256, thumbnail.Width);
             Assert.Equal(170, thumbnail.Height);
diff --git a/tests/ImageSharp.Tests/Processors/Filters/BackgroundColorTest.cs b/tests/ImageSharp.Tests/Processors/Filters/BackgroundColorTest.cs
index fd08b87a47..eccfc13af3 100644
--- a/tests/ImageSharp.Tests/Processors/Filters/BackgroundColorTest.cs
+++ b/tests/ImageSharp.Tests/Processors/Filters/BackgroundColorTest.cs
@@ -7,6 +7,8 @@ namespace ImageSharp.Tests
 {
     using System.IO;
 
+    using ImageSharp.PixelFormats;
+
     using Xunit;
 
     public class BackgroundColorTest : FileTestBase
@@ -21,7 +23,7 @@ namespace ImageSharp.Tests
                 using (Image image = file.CreateImage())
                 using (FileStream output = File.OpenWrite($"{path}/{file.FileName}"))
                 {
-                    image.BackgroundColor(Color.HotPink).Save(output);
+                    image.BackgroundColor(Rgba32.HotPink).Save(output);
                 }
             }
         }
diff --git a/tests/ImageSharp.Tests/Processors/Filters/GlowTest.cs b/tests/ImageSharp.Tests/Processors/Filters/GlowTest.cs
index 1afb1300a9..ad10488459 100644
--- a/tests/ImageSharp.Tests/Processors/Filters/GlowTest.cs
+++ b/tests/ImageSharp.Tests/Processors/Filters/GlowTest.cs
@@ -7,6 +7,8 @@ namespace ImageSharp.Tests
 {
     using System.IO;
 
+    using ImageSharp.PixelFormats;
+
     using Xunit;
 
     public class GlowTest : FileTestBase
@@ -37,7 +39,7 @@ namespace ImageSharp.Tests
                 using (Image image = file.CreateImage())
                 using (FileStream output = File.OpenWrite($"{path}/{filename}"))
                 {
-                    image.Glow(Color.HotPink).Save(output);
+                    image.Glow(Rgba32.HotPink).Save(output);
                 }
             }
         }
diff --git a/tests/ImageSharp.Tests/Processors/Filters/GrayscaleTest.cs b/tests/ImageSharp.Tests/Processors/Filters/GrayscaleTest.cs
index 97947a7874..2b717a0b79 100644
--- a/tests/ImageSharp.Tests/Processors/Filters/GrayscaleTest.cs
+++ b/tests/ImageSharp.Tests/Processors/Filters/GrayscaleTest.cs
@@ -12,6 +12,8 @@ namespace ImageSharp.Tests
     using ImageSharp.Tests;
     using System.Numerics;
 
+    using ImageSharp.PixelFormats;
+
     public class GrayscaleTest : FileTestBase
     {
         /// <summary>
@@ -20,14 +22,14 @@ namespace ImageSharp.Tests
         [Theory]
         [WithTestPatternImages(50, 50, PixelTypes.StandardImageClass, GrayscaleMode.Bt709)] 
         [WithTestPatternImages(50, 50, PixelTypes.StandardImageClass, GrayscaleMode.Bt601)]
-        public void ImageShouldApplyGrayscaleFilterAll<TColor>(TestImageProvider<TColor> provider, GrayscaleMode value)
-            where TColor : struct, IPixel<TColor>
+        public void ImageShouldApplyGrayscaleFilterAll<TPixel>(TestImageProvider<TPixel> provider, GrayscaleMode value)
+            where TPixel : struct, IPixel<TPixel>
         {
-            using (Image<TColor> image = provider.GetImage())
+            using (Image<TPixel> image = provider.GetImage())
             {
                 image.Grayscale(value);
                 byte[] data = new byte[3];
-                foreach (TColor p in image.Pixels)
+                foreach (TPixel p in image.Pixels)
                 {
                     p.ToXyzBytes(data, 0);
                     Assert.Equal(data[0], data[1]);
diff --git a/tests/ImageSharp.Tests/Processors/Filters/ResizeProfilingBenchmarks.cs b/tests/ImageSharp.Tests/Processors/Filters/ResizeProfilingBenchmarks.cs
index da09aa85e7..917bb895c5 100644
--- a/tests/ImageSharp.Tests/Processors/Filters/ResizeProfilingBenchmarks.cs
+++ b/tests/ImageSharp.Tests/Processors/Filters/ResizeProfilingBenchmarks.cs
@@ -3,6 +3,7 @@ namespace ImageSharp.Tests
     using System.IO;
     using System.Text;
 
+    using ImageSharp.PixelFormats;
     using ImageSharp.Processing;
     using ImageSharp.Processing.Processors;
 
@@ -36,13 +37,13 @@ namespace ImageSharp.Tests
         // [Fact]
         public void PrintWeightsData()
         {
-            ResizeProcessor<Color> proc = new ResizeProcessor<Color>(new BicubicResampler(), 200, 200);
+            ResizeProcessor<Rgba32> proc = new ResizeProcessor<Rgba32>(new BicubicResampler(), 200, 200);
 
-            ResamplingWeightedProcessor<Color>.WeightsBuffer weights = proc.PrecomputeWeights(200, 500);
+            ResamplingWeightedProcessor<Rgba32>.WeightsBuffer weights = proc.PrecomputeWeights(200, 500);
 
             StringBuilder bld = new StringBuilder();
 
-            foreach (ResamplingWeightedProcessor<Color>.WeightsWindow window in weights.Weights)
+            foreach (ResamplingWeightedProcessor<Rgba32>.WeightsWindow window in weights.Weights)
             {
                 for (int i = 0; i < window.Length; i++)
                 {
diff --git a/tests/ImageSharp.Tests/Processors/Filters/VignetteTest.cs b/tests/ImageSharp.Tests/Processors/Filters/VignetteTest.cs
index 7f40ef1d21..89794aeaf8 100644
--- a/tests/ImageSharp.Tests/Processors/Filters/VignetteTest.cs
+++ b/tests/ImageSharp.Tests/Processors/Filters/VignetteTest.cs
@@ -7,6 +7,8 @@ namespace ImageSharp.Tests
 {
     using System.IO;
 
+    using ImageSharp.PixelFormats;
+
     using Xunit;
 
     public class VignetteTest : FileTestBase
@@ -37,7 +39,7 @@ namespace ImageSharp.Tests
                 using (Image image = file.CreateImage())
                 using (FileStream output = File.OpenWrite($"{path}/{filename}"))
                 {
-                    image.Vignette(Color.HotPink).Save(output);
+                    image.Vignette(Rgba32.HotPink).Save(output);
                 }
             }
         }
diff --git a/tests/ImageSharp.Tests/TestFormat.cs b/tests/ImageSharp.Tests/TestFormat.cs
index 084ad59938..318df5ead3 100644
--- a/tests/ImageSharp.Tests/TestFormat.cs
+++ b/tests/ImageSharp.Tests/TestFormat.cs
@@ -12,6 +12,8 @@ namespace ImageSharp.Tests
     using System.Linq;
     using System.Reflection;
     using ImageSharp.Formats;
+    using ImageSharp.PixelFormats;
+
     using Xunit;
 
     /// <summary>
@@ -68,17 +70,17 @@ namespace ImageSharp.Tests
             }
         }
 
-        public Image<TColor> Sample<TColor>()
-            where TColor : struct, IPixel<TColor>
+        public Image<TPixel> Sample<TPixel>()
+            where TPixel : struct, IPixel<TPixel>
         {
             lock (this._sampleImages)
             {
-                if (!this._sampleImages.ContainsKey(typeof(TColor)))
+                if (!this._sampleImages.ContainsKey(typeof(TPixel)))
                 {
-                    this._sampleImages.Add(typeof(TColor), new Image<TColor>(1, 1));
+                    this._sampleImages.Add(typeof(TPixel), new Image<TPixel>(1, 1));
                 }
             
-                return (Image<TColor>)this._sampleImages[typeof(TColor)];
+                return (Image<TPixel>)this._sampleImages[typeof(TPixel)];
             }
         }
 
@@ -149,7 +151,7 @@ namespace ImageSharp.Tests
             }
 
 
-            public Image<TColor> Decode<TColor>(Configuration config, Stream stream, IDecoderOptions options) where TColor : struct, IPixel<TColor>
+            public Image<TPixel> Decode<TPixel>(Configuration config, Stream stream, IDecoderOptions options) where TPixel : struct, IPixel<TPixel>
 
             {
                 var ms = new MemoryStream();
@@ -163,7 +165,7 @@ namespace ImageSharp.Tests
                 });
 
                 // TODO record this happend so we an verify it.
-                return this.testFormat.Sample<TColor>();
+                return this.testFormat.Sample<TPixel>();
             }
         }
 
@@ -176,7 +178,7 @@ namespace ImageSharp.Tests
                 this.testFormat = testFormat;
             }
 
-            public void Encode<TColor>(Image<TColor> image, Stream stream, IEncoderOptions options) where TColor : struct, IPixel<TColor>
+            public void Encode<TPixel>(Image<TPixel> image, Stream stream, IEncoderOptions options) where TPixel : struct, IPixel<TPixel>
             {
                 // TODO record this happend so we an verify it.
             }
diff --git a/tests/ImageSharp.Tests/TestUtilities/Attributes/ImageDataAttributeBase.cs b/tests/ImageSharp.Tests/TestUtilities/Attributes/ImageDataAttributeBase.cs
index 206393e274..ffbd1b888e 100644
--- a/tests/ImageSharp.Tests/TestUtilities/Attributes/ImageDataAttributeBase.cs
+++ b/tests/ImageSharp.Tests/TestUtilities/Attributes/ImageDataAttributeBase.cs
@@ -13,7 +13,7 @@ namespace ImageSharp.Tests
     using Xunit.Sdk;
 
     /// <summary>
-    /// Base class for Theory Data attributes which pass an instance of <see cref="TestImageProvider{TColor}"/> to the test case.
+    /// Base class for Theory Data attributes which pass an instance of <see cref="TestImageProvider{TPixel}"/> to the test case.
     /// </summary>
     public abstract class ImageDataAttributeBase : DataAttribute
     {
diff --git a/tests/ImageSharp.Tests/TestUtilities/Attributes/WithBlankImageAttribute.cs b/tests/ImageSharp.Tests/TestUtilities/Attributes/WithBlankImageAttribute.cs
index e1f8f4c551..25d3c8cac1 100644
--- a/tests/ImageSharp.Tests/TestUtilities/Attributes/WithBlankImageAttribute.cs
+++ b/tests/ImageSharp.Tests/TestUtilities/Attributes/WithBlankImageAttribute.cs
@@ -9,13 +9,13 @@ namespace ImageSharp.Tests
     using System.Reflection;
 
     /// <summary>
-    /// Triggers passing <see cref="TestImageProvider{TColor}"/> instances which produce a blank image of size width * height.
-    /// One <see cref="TestImageProvider{TColor}"/> instance will be passed for each the pixel format defined by the pixelTypes parameter
+    /// Triggers passing <see cref="TestImageProvider{TPixel}"/> instances which produce a blank image of size width * height.
+    /// One <see cref="TestImageProvider{TPixel}"/> instance will be passed for each the pixel format defined by the pixelTypes parameter
     /// </summary>
     public class WithBlankImagesAttribute : ImageDataAttributeBase
     {
         /// <summary>
-        /// Triggers passing an <see cref="TestImageProvider{TColor}"/> that produces a blank image of size width * height
+        /// Triggers passing an <see cref="TestImageProvider{TPixel}"/> that produces a blank image of size width * height
         /// </summary>
         /// <param name="width">The required width</param>
         /// <param name="height">The required height</param>
diff --git a/tests/ImageSharp.Tests/TestUtilities/Attributes/WithFileAttribute.cs b/tests/ImageSharp.Tests/TestUtilities/Attributes/WithFileAttribute.cs
index 617a9a2374..752c114e56 100644
--- a/tests/ImageSharp.Tests/TestUtilities/Attributes/WithFileAttribute.cs
+++ b/tests/ImageSharp.Tests/TestUtilities/Attributes/WithFileAttribute.cs
@@ -9,16 +9,16 @@ namespace ImageSharp.Tests
     using System.Reflection;
 
     /// <summary>
-    /// Triggers passing <see cref="TestImageProvider{TColor}"/> instances which read an image from the given file
-    /// One <see cref="TestImageProvider{TColor}"/> instance will be passed for each the pixel format defined by the pixelTypes parameter
+    /// Triggers passing <see cref="TestImageProvider{TPixel}"/> instances which read an image from the given file
+    /// One <see cref="TestImageProvider{TPixel}"/> instance will be passed for each the pixel format defined by the pixelTypes parameter
     /// </summary>
     public class WithFileAttribute : ImageDataAttributeBase
     {
         private readonly string fileName;
 
         /// <summary>
-        /// Triggers passing <see cref="TestImageProvider{TColor}"/> instances which read an image from the given file
-        /// One <see cref="TestImageProvider{TColor}"/> instance will be passed for each the pixel format defined by the pixelTypes parameter
+        /// Triggers passing <see cref="TestImageProvider{TPixel}"/> instances which read an image from the given file
+        /// One <see cref="TestImageProvider{TPixel}"/> instance will be passed for each the pixel format defined by the pixelTypes parameter
         /// </summary>
         /// <param name="fileName">The name of the file</param>
         /// <param name="pixelTypes">The requested pixel types</param>
diff --git a/tests/ImageSharp.Tests/TestUtilities/Attributes/WithFileCollectionAttribute.cs b/tests/ImageSharp.Tests/TestUtilities/Attributes/WithFileCollectionAttribute.cs
index be0fa7b3f9..3bd93e6096 100644
--- a/tests/ImageSharp.Tests/TestUtilities/Attributes/WithFileCollectionAttribute.cs
+++ b/tests/ImageSharp.Tests/TestUtilities/Attributes/WithFileCollectionAttribute.cs
@@ -11,16 +11,16 @@ namespace ImageSharp.Tests
     using System.Reflection;
 
     /// <summary>
-    /// Triggers passing <see cref="TestImageProvider{TColor}"/> instances which read an image for each file being enumerated by the (static) test class field/property defined by enumeratorMemberName
-    /// <see cref="TestImageProvider{TColor}"/> instances will be passed for each the pixel format defined by the pixelTypes parameter
+    /// Triggers passing <see cref="TestImageProvider{TPixel}"/> instances which read an image for each file being enumerated by the (static) test class field/property defined by enumeratorMemberName
+    /// <see cref="TestImageProvider{TPixel}"/> instances will be passed for each the pixel format defined by the pixelTypes parameter
     /// </summary>
     public class WithFileCollectionAttribute : ImageDataAttributeBase
     {
         private readonly string enumeratorMemberName;
 
         /// <summary>
-        /// Triggers passing <see cref="TestImageProvider{TColor}"/> instances which read an image for each file being enumerated by the (static) test class field/property defined by enumeratorMemberName
-        /// <see cref="TestImageProvider{TColor}"/> instances will be passed for each the pixel format defined by the pixelTypes parameter
+        /// Triggers passing <see cref="TestImageProvider{TPixel}"/> instances which read an image for each file being enumerated by the (static) test class field/property defined by enumeratorMemberName
+        /// <see cref="TestImageProvider{TPixel}"/> instances will be passed for each the pixel format defined by the pixelTypes parameter
         /// </summary>
         /// <param name="enumeratorMemberName">The name of the static test class field/property enumerating the files</param>
         /// <param name="pixelTypes">The requested pixel types</param>
diff --git a/tests/ImageSharp.Tests/TestUtilities/Attributes/WithMemberFactoryAttribute.cs b/tests/ImageSharp.Tests/TestUtilities/Attributes/WithMemberFactoryAttribute.cs
index fa5e57dd09..661640f661 100644
--- a/tests/ImageSharp.Tests/TestUtilities/Attributes/WithMemberFactoryAttribute.cs
+++ b/tests/ImageSharp.Tests/TestUtilities/Attributes/WithMemberFactoryAttribute.cs
@@ -10,17 +10,17 @@ namespace ImageSharp.Tests
     using System.Reflection;
 
     /// <summary>
-    /// Triggers passing <see cref="TestImageProvider{TColor}"/> instances which return the image produced by the given test class member method
-    /// <see cref="TestImageProvider{TColor}"/> instances will be passed for each the pixel format defined by the pixelTypes parameter
-    /// The parameter of the factory method must be a <see cref="GenericFactory{TColor}"/> instance
+    /// Triggers passing <see cref="TestImageProvider{TPixel}"/> instances which return the image produced by the given test class member method
+    /// <see cref="TestImageProvider{TPixel}"/> instances will be passed for each the pixel format defined by the pixelTypes parameter
+    /// The parameter of the factory method must be a <see cref="GenericFactory{TPixel}"/> instance
     /// </summary>
     public class WithMemberFactoryAttribute : ImageDataAttributeBase
     {
         private readonly string memberMethodName;
 
         /// <summary>
-        /// Triggers passing <see cref="TestImageProvider{TColor}"/> instances which return the image produced by the given test class member method
-        /// <see cref="TestImageProvider{TColor}"/> instances will be passed for each the pixel format defined by the pixelTypes parameter
+        /// Triggers passing <see cref="TestImageProvider{TPixel}"/> instances which return the image produced by the given test class member method
+        /// <see cref="TestImageProvider{TPixel}"/> instances will be passed for each the pixel format defined by the pixelTypes parameter
         /// </summary>
         /// <param name="memberMethodName">The name of the static test class which returns the image</param>
         /// <param name="pixelTypes">The requested pixel types</param>
diff --git a/tests/ImageSharp.Tests/TestUtilities/Attributes/WithSolidFilledImagesAttribute.cs b/tests/ImageSharp.Tests/TestUtilities/Attributes/WithSolidFilledImagesAttribute.cs
index d225f8a776..9a8538e78b 100644
--- a/tests/ImageSharp.Tests/TestUtilities/Attributes/WithSolidFilledImagesAttribute.cs
+++ b/tests/ImageSharp.Tests/TestUtilities/Attributes/WithSolidFilledImagesAttribute.cs
@@ -9,14 +9,14 @@ namespace ImageSharp.Tests
     using System.Reflection;
 
     /// <summary>
-    /// Triggers passing <see cref="TestImageProvider{TColor}"/> instances which produce an image of size width * height filled with the requested color.
-    /// One <see cref="TestImageProvider{TColor}"/> instance will be passed for each the pixel format defined by the pixelTypes parameter
+    /// Triggers passing <see cref="TestImageProvider{TPixel}"/> instances which produce an image of size width * height filled with the requested color.
+    /// One <see cref="TestImageProvider{TPixel}"/> instance will be passed for each the pixel format defined by the pixelTypes parameter
     /// </summary>
     public class WithSolidFilledImagesAttribute : WithBlankImagesAttribute
     {
         /// <summary>
-        /// Triggers passing <see cref="TestImageProvider{TColor}"/> instances which produce an image of size width * height filled with the requested color.
-        /// One <see cref="TestImageProvider{TColor}"/> instance will be passed for each the pixel format defined by the pixelTypes parameter
+        /// Triggers passing <see cref="TestImageProvider{TPixel}"/> instances which produce an image of size width * height filled with the requested color.
+        /// One <see cref="TestImageProvider{TPixel}"/> instance will be passed for each the pixel format defined by the pixelTypes parameter
         /// </summary>
         /// <param name="width">The width of the requested image</param>
         /// <param name="height">The height of the requested image</param>
@@ -38,8 +38,8 @@ namespace ImageSharp.Tests
         }
 
         /// <summary>
-        /// Triggers passing <see cref="TestImageProvider{TColor}"/> instances which produce an image of size width * height filled with the requested color.
-        /// One <see cref="TestImageProvider{TColor}"/> instance will be passed for each the pixel format defined by the pixelTypes parameter
+        /// Triggers passing <see cref="TestImageProvider{TPixel}"/> instances which produce an image of size width * height filled with the requested color.
+        /// One <see cref="TestImageProvider{TPixel}"/> instance will be passed for each the pixel format defined by the pixelTypes parameter
         /// </summary>
         /// <param name="width">The width of the requested image</param>
         /// <param name="height">The height of the requested image</param>
diff --git a/tests/ImageSharp.Tests/TestUtilities/Attributes/WithTestPatternImageAttribute.cs b/tests/ImageSharp.Tests/TestUtilities/Attributes/WithTestPatternImageAttribute.cs
index 98bc45f5b2..f2d2aeb88d 100644
--- a/tests/ImageSharp.Tests/TestUtilities/Attributes/WithTestPatternImageAttribute.cs
+++ b/tests/ImageSharp.Tests/TestUtilities/Attributes/WithTestPatternImageAttribute.cs
@@ -9,13 +9,13 @@ namespace ImageSharp.Tests
     using System.Reflection;
 
     /// <summary>
-    /// Triggers passing <see cref="TestImageProvider{TColor}"/> instances which produce a blank image of size width * height.
-    /// One <see cref="TestImageProvider{TColor}"/> instance will be passed for each the pixel format defined by the pixelTypes parameter
+    /// Triggers passing <see cref="TestImageProvider{TPixel}"/> instances which produce a blank image of size width * height.
+    /// One <see cref="TestImageProvider{TPixel}"/> instance will be passed for each the pixel format defined by the pixelTypes parameter
     /// </summary>
     public class WithTestPatternImagesAttribute : ImageDataAttributeBase
     {
         /// <summary>
-        /// Triggers passing an <see cref="TestImageProvider{TColor}"/> that produces a test pattern image of size width * height
+        /// Triggers passing an <see cref="TestImageProvider{TPixel}"/> that produces a test pattern image of size width * height
         /// </summary>
         /// <param name="width">The required width</param>
         /// <param name="height">The required height</param>
diff --git a/tests/ImageSharp.Tests/TestUtilities/Factories/GenericFactory.cs b/tests/ImageSharp.Tests/TestUtilities/Factories/GenericFactory.cs
index c2fe0dc5c2..4a0950788d 100644
--- a/tests/ImageSharp.Tests/TestUtilities/Factories/GenericFactory.cs
+++ b/tests/ImageSharp.Tests/TestUtilities/Factories/GenericFactory.cs
@@ -7,26 +7,28 @@ namespace ImageSharp.Tests
 {
     using System;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// Utility class to create specialized subclasses of generic classes (eg. <see cref="Image"/>)
     /// Used as parameter for <see cref="WithMemberFactoryAttribute"/> -based factory methods
     /// </summary>
-    public class GenericFactory<TColor>
-        where TColor : struct, IPixel<TColor>
+    public class GenericFactory<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
-        public virtual Image<TColor> CreateImage(int width, int height)
+        public virtual Image<TPixel> CreateImage(int width, int height)
         {
-            return new Image<TColor>(width, height);
+            return new Image<TPixel>(width, height);
         }
 
-        public virtual Image<TColor> CreateImage(byte[] bytes)
+        public virtual Image<TPixel> CreateImage(byte[] bytes)
         {
-            return Image.Load<TColor>(bytes);
+            return Image.Load<TPixel>(bytes);
         }
 
-        public virtual Image<TColor> CreateImage(Image<TColor> other)
+        public virtual Image<TPixel> CreateImage(Image<TPixel> other)
         {
-            return new Image<TColor>(other);
+            return new Image<TPixel>(other);
         }
     }
 }
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests/TestUtilities/Factories/ImageFactory.cs b/tests/ImageSharp.Tests/TestUtilities/Factories/ImageFactory.cs
index 2361bc01ce..c4d758bd6c 100644
--- a/tests/ImageSharp.Tests/TestUtilities/Factories/ImageFactory.cs
+++ b/tests/ImageSharp.Tests/TestUtilities/Factories/ImageFactory.cs
@@ -5,13 +5,15 @@
 
 namespace ImageSharp.Tests
 {
-    public class ImageFactory : GenericFactory<Color>
+    using ImageSharp.PixelFormats;
+
+    public class ImageFactory : GenericFactory<Rgba32>
     {
-        public override Image<Color> CreateImage(byte[] bytes) => Image.Load(bytes);
+        public override Image<Rgba32> CreateImage(byte[] bytes) => Image.Load(bytes);
 
-        public override Image<Color> CreateImage(int width, int height) => new Image(width, height);
+        public override Image<Rgba32> CreateImage(int width, int height) => new Image(width, height);
 
-        public override Image<Color> CreateImage(Image<Color> other)
+        public override Image<Rgba32> CreateImage(Image<Rgba32> other)
         {
             Image img = (Image)other;
             return new Image(img);
diff --git a/tests/ImageSharp.Tests/TestUtilities/ImageProviders/BlankProvider.cs b/tests/ImageSharp.Tests/TestUtilities/ImageProviders/BlankProvider.cs
index 6dc0d89c52..4252a60b5e 100644
--- a/tests/ImageSharp.Tests/TestUtilities/ImageProviders/BlankProvider.cs
+++ b/tests/ImageSharp.Tests/TestUtilities/ImageProviders/BlankProvider.cs
@@ -6,12 +6,15 @@
 namespace ImageSharp.Tests
 {
     using System;
+
+    using ImageSharp.PixelFormats;
+
     using Xunit.Abstractions;
 
-    public abstract partial class TestImageProvider<TColor>
-        where TColor : struct, IPixel<TColor>
+    public abstract partial class TestImageProvider<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
-        private class BlankProvider : TestImageProvider<TColor>, IXunitSerializable
+        private class BlankProvider : TestImageProvider<TPixel>, IXunitSerializable
         {
             public BlankProvider(int width, int height)
             {
@@ -30,7 +33,7 @@ namespace ImageSharp.Tests
 
             protected int Width { get; private set; }
 
-            public override Image<TColor> GetImage() => this.Factory.CreateImage(this.Width, this.Height);
+            public override Image<TPixel> GetImage() => this.Factory.CreateImage(this.Width, this.Height);
 
 
             public override void Deserialize(IXunitSerializationInfo info)
diff --git a/tests/ImageSharp.Tests/TestUtilities/ImageProviders/FileProvider.cs b/tests/ImageSharp.Tests/TestUtilities/ImageProviders/FileProvider.cs
index bc18209f32..4217d52b06 100644
--- a/tests/ImageSharp.Tests/TestUtilities/ImageProviders/FileProvider.cs
+++ b/tests/ImageSharp.Tests/TestUtilities/ImageProviders/FileProvider.cs
@@ -7,14 +7,17 @@ namespace ImageSharp.Tests
 {
     using System;
     using System.Collections.Concurrent;
+
+    using ImageSharp.PixelFormats;
+
     using Xunit.Abstractions;
 
-    public abstract partial class TestImageProvider<TColor>
-        where TColor : struct, IPixel<TColor>
+    public abstract partial class TestImageProvider<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
-        private class FileProvider : TestImageProvider<TColor>, IXunitSerializable
+        private class FileProvider : TestImageProvider<TPixel>, IXunitSerializable
         {
-            // Need PixelTypes in the dictionary key, because result images of TestImageProvider<TColor>.FileProvider 
+            // Need PixelTypes in the dictionary key, because result images of TestImageProvider<TPixel>.FileProvider 
             // are shared between PixelTypes.Color & PixelTypes.StandardImageClass
             private class Key : Tuple<PixelTypes, string>
             {
@@ -24,8 +27,8 @@ namespace ImageSharp.Tests
                 }
             }
 
-            private static ConcurrentDictionary<Key, Image<TColor>> cache =
-                new ConcurrentDictionary<Key, Image<TColor>>();
+            private static ConcurrentDictionary<Key, Image<TPixel>> cache =
+                new ConcurrentDictionary<Key, Image<TPixel>>();
 
             private string filePath;
 
@@ -40,11 +43,11 @@ namespace ImageSharp.Tests
 
             public override string SourceFileOrDescription => this.filePath;
 
-            public override Image<TColor> GetImage()
+            public override Image<TPixel> GetImage()
             {
                 Key key = new Key(this.PixelType, this.filePath);
 
-                Image<TColor> cachedImage = cache.GetOrAdd(
+                Image<TPixel> cachedImage = cache.GetOrAdd(
                     key,
                     fn =>
                         {
diff --git a/tests/ImageSharp.Tests/TestUtilities/ImageProviders/LambdaProvider.cs b/tests/ImageSharp.Tests/TestUtilities/ImageProviders/LambdaProvider.cs
index 9addc8ca6c..30e7a63b50 100644
--- a/tests/ImageSharp.Tests/TestUtilities/ImageProviders/LambdaProvider.cs
+++ b/tests/ImageSharp.Tests/TestUtilities/ImageProviders/LambdaProvider.cs
@@ -7,23 +7,25 @@ namespace ImageSharp.Tests
 {
     using System;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
-    /// Provides <see cref="Image{TColor}" /> instances for parametric unit tests.
+    /// Provides <see cref="Image{TPixel}" /> instances for parametric unit tests.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format of the image</typeparam>
-    public abstract partial class TestImageProvider<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format of the image</typeparam>
+    public abstract partial class TestImageProvider<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
-        private class LambdaProvider : TestImageProvider<TColor>
+        private class LambdaProvider : TestImageProvider<TPixel>
         {
-            private readonly Func<GenericFactory<TColor>, Image<TColor>> creator;
+            private readonly Func<GenericFactory<TPixel>, Image<TPixel>> creator;
 
-            public LambdaProvider(Func<GenericFactory<TColor>, Image<TColor>> creator)
+            public LambdaProvider(Func<GenericFactory<TPixel>, Image<TPixel>> creator)
             {
                 this.creator = creator;
             }
 
-            public override Image<TColor> GetImage() => this.creator(this.Factory);
+            public override Image<TPixel> GetImage() => this.creator(this.Factory);
         }
     }
 }
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests/TestUtilities/ImageProviders/SolidProvider.cs b/tests/ImageSharp.Tests/TestUtilities/ImageProviders/SolidProvider.cs
index 9a67508721..65d55da554 100644
--- a/tests/ImageSharp.Tests/TestUtilities/ImageProviders/SolidProvider.cs
+++ b/tests/ImageSharp.Tests/TestUtilities/ImageProviders/SolidProvider.cs
@@ -6,14 +6,17 @@
 namespace ImageSharp.Tests
 {
     using System;
+
+    using ImageSharp.PixelFormats;
+
     using Xunit.Abstractions;
 
     /// <summary>
-    /// Provides <see cref="Image{TColor}" /> instances for parametric unit tests.
+    /// Provides <see cref="Image{TPixel}" /> instances for parametric unit tests.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format of the image</typeparam>
-    public abstract partial class TestImageProvider<TColor>
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format of the image</typeparam>
+    public abstract partial class TestImageProvider<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
         private class SolidProvider : BlankProvider 
         {
@@ -46,10 +49,10 @@ namespace ImageSharp.Tests
             public override string SourceFileOrDescription
                 => $"Solid{this.Width}x{this.Height}_({this.r},{this.g},{this.b},{this.a})";
 
-            public override Image<TColor> GetImage()
+            public override Image<TPixel> GetImage()
             {
-                Image<TColor> image = base.GetImage();
-                TColor color = default(TColor);
+                Image<TPixel> image = base.GetImage();
+                TPixel color = default(TPixel);
                 color.PackFromBytes(this.r, this.g, this.b, this.a);
 
                 return image.Fill(color);
diff --git a/tests/ImageSharp.Tests/TestUtilities/ImageProviders/TestImageProvider.cs b/tests/ImageSharp.Tests/TestUtilities/ImageProviders/TestImageProvider.cs
index 26192ba1e1..9d6f46b72e 100644
--- a/tests/ImageSharp.Tests/TestUtilities/ImageProviders/TestImageProvider.cs
+++ b/tests/ImageSharp.Tests/TestUtilities/ImageProviders/TestImageProvider.cs
@@ -7,16 +7,19 @@ namespace ImageSharp.Tests
 {
     using System;
     using System.Reflection;
+
+    using ImageSharp.PixelFormats;
+
     using Xunit.Abstractions;
 
     /// <summary>
-    /// Provides <see cref="Image{TColor}" /> instances for parametric unit tests.
+    /// Provides <see cref="Image{TPixel}" /> instances for parametric unit tests.
     /// </summary>
-    /// <typeparam name="TColor">The pixel format of the image</typeparam>
-    public abstract partial class TestImageProvider<TColor> 
-        where TColor : struct, IPixel<TColor>
+    /// <typeparam name="TPixel">The pixel format of the image</typeparam>
+    public abstract partial class TestImageProvider<TPixel> 
+        where TPixel : struct, IPixel<TPixel>
     {
-        public PixelTypes PixelType { get; private set; } = typeof(TColor).GetPixelType();
+        public PixelTypes PixelType { get; private set; } = typeof(TPixel).GetPixelType();
 
         public virtual string SourceFileOrDescription => "";
 
@@ -25,25 +28,25 @@ namespace ImageSharp.Tests
         /// </summary>
         public ImagingTestCaseUtility Utility { get; private set; }
 
-        public GenericFactory<TColor> Factory { get; private set; } = new GenericFactory<TColor>();
+        public GenericFactory<TPixel> Factory { get; private set; } = new GenericFactory<TPixel>();
         public string TypeName { get; private set; }
         public string MethodName { get; private set; }
 
-        public static TestImageProvider<TColor> TestPattern(
+        public static TestImageProvider<TPixel> TestPattern(
                 int width,
                 int height,
                 MethodInfo testMethod = null,
                 PixelTypes pixelTypeOverride = PixelTypes.Undefined)
             => new TestPatternProvider(width, height).Init(testMethod, pixelTypeOverride);
 
-        public static TestImageProvider<TColor> Blank(
+        public static TestImageProvider<TPixel> Blank(
                         int width,
                         int height,
                         MethodInfo testMethod = null,
                         PixelTypes pixelTypeOverride = PixelTypes.Undefined)
                     => new BlankProvider(width, height).Init(testMethod, pixelTypeOverride);
 
-        public static TestImageProvider<TColor> File(
+        public static TestImageProvider<TPixel> File(
             string filePath,
             MethodInfo testMethod = null,
             PixelTypes pixelTypeOverride = PixelTypes.Undefined)
@@ -51,13 +54,13 @@ namespace ImageSharp.Tests
             return new FileProvider(filePath).Init(testMethod, pixelTypeOverride);
         }
 
-        public static TestImageProvider<TColor> Lambda(
-                Func<GenericFactory<TColor>, Image<TColor>> func,
+        public static TestImageProvider<TPixel> Lambda(
+                Func<GenericFactory<TPixel>, Image<TPixel>> func,
                 MethodInfo testMethod = null,
                 PixelTypes pixelTypeOverride = PixelTypes.Undefined)
             => new LambdaProvider(func).Init(testMethod, pixelTypeOverride);
 
-        public static TestImageProvider<TColor> Solid(
+        public static TestImageProvider<TPixel> Solid(
             int width,
             int height,
             byte r,
@@ -71,9 +74,9 @@ namespace ImageSharp.Tests
         }
 
         /// <summary>
-        /// Returns an <see cref="Image{TColor}"/> instance to the test case with the necessary traits.
+        /// Returns an <see cref="Image{TPixel}"/> instance to the test case with the necessary traits.
         /// </summary>
-        public abstract Image<TColor> GetImage();
+        public abstract Image<TPixel> GetImage();
 
         public virtual void Deserialize(IXunitSerializationInfo info)
         {
@@ -91,7 +94,7 @@ namespace ImageSharp.Tests
             info.AddValue("MethodName", this.MethodName);
         }
 
-        protected TestImageProvider<TColor> Init(string typeName, string methodName, PixelTypes pixelTypeOverride)
+        protected TestImageProvider<TPixel> Init(string typeName, string methodName, PixelTypes pixelTypeOverride)
         {
             if (pixelTypeOverride != PixelTypes.Undefined)
             {
@@ -102,7 +105,7 @@ namespace ImageSharp.Tests
 
             if (pixelTypeOverride == PixelTypes.StandardImageClass)
             {
-                this.Factory = new ImageFactory() as GenericFactory<TColor>;
+                this.Factory = new ImageFactory() as GenericFactory<TPixel>;
             }
 
             this.Utility = new ImagingTestCaseUtility()
@@ -119,7 +122,7 @@ namespace ImageSharp.Tests
             return this;
         }
 
-        protected TestImageProvider<TColor> Init(MethodInfo testMethod, PixelTypes pixelTypeOverride)
+        protected TestImageProvider<TPixel> Init(MethodInfo testMethod, PixelTypes pixelTypeOverride)
         {
             return Init(testMethod?.DeclaringType.Name, testMethod?.Name, pixelTypeOverride);
         }
diff --git a/tests/ImageSharp.Tests/TestUtilities/ImageProviders/TestPatternProvider.cs b/tests/ImageSharp.Tests/TestUtilities/ImageProviders/TestPatternProvider.cs
index c40abd9345..96d38fc401 100644
--- a/tests/ImageSharp.Tests/TestUtilities/ImageProviders/TestPatternProvider.cs
+++ b/tests/ImageSharp.Tests/TestUtilities/ImageProviders/TestPatternProvider.cs
@@ -8,19 +8,22 @@ namespace ImageSharp.Tests
     using System;
     using System.Collections.Generic;
     using System.Numerics;
+
+    using ImageSharp.PixelFormats;
+
     using Xunit.Abstractions;
 
-    public abstract partial class TestImageProvider<TColor>
-        where TColor : struct, IPixel<TColor>
+    public abstract partial class TestImageProvider<TPixel>
+        where TPixel : struct, IPixel<TPixel>
     {
 
         /// <summary>
         /// A test image provider that produces test patterns.
         /// </summary>
-        /// <typeparam name="TColor"></typeparam>
+        /// <typeparam name="TPixel"></typeparam>
         private class TestPatternProvider : BlankProvider
         {
-            static Dictionary<string, Image<TColor>> testImages = new Dictionary<string, Image<TColor>>();
+            static Dictionary<string, Image<TPixel>> testImages = new Dictionary<string, Image<TPixel>>();
 
             public TestPatternProvider(int width, int height)
                 : base(width, height)
@@ -34,29 +37,29 @@ namespace ImageSharp.Tests
 
             public override string SourceFileOrDescription => $"TestPattern{this.Width}x{this.Height}";
 
-            public override Image<TColor> GetImage()
+            public override Image<TPixel> GetImage()
             {
                 lock (testImages)
                 {
                     if (!testImages.ContainsKey(this.SourceFileOrDescription))
                     {
-                        Image<TColor> image = new Image<TColor>(this.Width, this.Height);
+                        Image<TPixel> image = new Image<TPixel>(this.Width, this.Height);
                         DrawTestPattern(image);
                         testImages.Add(this.SourceFileOrDescription, image);
                     }
                 }
 
-                return new Image<TColor>(testImages[this.SourceFileOrDescription]);
+                return new Image<TPixel>(testImages[this.SourceFileOrDescription]);
             }
 
             /// <summary>
             /// Draws the test pattern on an image by drawing 4 other patterns in the for quadrants of the image.
             /// </summary>
             /// <param name="image"></param>
-            private static void DrawTestPattern(Image<TColor> image)
+            private static void DrawTestPattern(Image<TPixel> image)
             {
                 // first lets split the image into 4 quadrants
-                using (PixelAccessor<TColor> pixels = image.Lock())
+                using (PixelAccessor<TPixel> pixels = image.Lock())
                 {
                     BlackWhiteChecker(pixels); // top left
                     VirticalBars(pixels); // top right
@@ -68,7 +71,7 @@ namespace ImageSharp.Tests
             /// Fills the top right quadrant with alternating solid vertical bars.
             /// </summary>
             /// <param name="pixels"></param>
-            private static void VirticalBars(PixelAccessor<TColor> pixels)
+            private static void VirticalBars(PixelAccessor<TPixel> pixels)
             {
                 // topLeft
                 int left = pixels.Width / 2;
@@ -76,9 +79,9 @@ namespace ImageSharp.Tests
                 int top = 0;
                 int bottom = pixels.Height / 2;
                 int stride = pixels.Width / 12;
-                TColor[] c = {
-                        NamedColors<TColor>.HotPink,
-                        NamedColors<TColor>.Blue
+                TPixel[] c = {
+                        NamedColors<TPixel>.HotPink,
+                        NamedColors<TPixel>.Blue
                     };
                 int p = 0;
                 for (int y = top; y < bottom; y++)
@@ -99,7 +102,7 @@ namespace ImageSharp.Tests
             /// fills the top left quadrant with a black and white checker board.
             /// </summary>
             /// <param name="pixels"></param>
-            private static void BlackWhiteChecker(PixelAccessor<TColor> pixels)
+            private static void BlackWhiteChecker(PixelAccessor<TPixel> pixels)
             {
                 // topLeft
                 int left = 0;
@@ -107,9 +110,9 @@ namespace ImageSharp.Tests
                 int top = 0;
                 int bottom = pixels.Height / 2;
                 int stride = pixels.Width / 6;
-                TColor[] c = {
-                        NamedColors<TColor>.Black,
-                        NamedColors<TColor>.White
+                TPixel[] c = {
+                        NamedColors<TPixel>.Black,
+                        NamedColors<TPixel>.White
                     };
 
                 int p = 0;
@@ -138,7 +141,7 @@ namespace ImageSharp.Tests
             /// Fills the bottom left quadrent with 3 horizental bars in Red, Green and Blue with a alpha gradient from left (transparent) to right (solid).
             /// </summary>
             /// <param name="pixels"></param>
-            private static void TransparentGradients(PixelAccessor<TColor> pixels)
+            private static void TransparentGradients(PixelAccessor<TPixel> pixels)
             {
                 // topLeft
                 int left = 0;
@@ -147,11 +150,11 @@ namespace ImageSharp.Tests
                 int bottom = pixels.Height;
                 int height = (int)Math.Ceiling(pixels.Height / 6f);
 
-                Vector4 red = Color.Red.ToVector4(); // use real color so we can see har it translates in the test pattern
-                Vector4 green = Color.Green.ToVector4(); // use real color so we can see har it translates in the test pattern
-                Vector4 blue = Color.Blue.ToVector4(); // use real color so we can see har it translates in the test pattern
+                Vector4 red = Rgba32.Red.ToVector4(); // use real color so we can see har it translates in the test pattern
+                Vector4 green = Rgba32.Green.ToVector4(); // use real color so we can see har it translates in the test pattern
+                Vector4 blue = Rgba32.Blue.ToVector4(); // use real color so we can see har it translates in the test pattern
 
-                TColor c = default(TColor);
+                TPixel c = default(TPixel);
 
                 for (int x = left; x < right; x++)
                 {
@@ -183,7 +186,7 @@ namespace ImageSharp.Tests
             /// A better algorithm could be used but it works
             /// </summary>
             /// <param name="pixels"></param>
-            private static void Rainbow(PixelAccessor<TColor> pixels)
+            private static void Rainbow(PixelAccessor<TPixel> pixels)
             {
                 int left = pixels.Width / 2;
                 int right = pixels.Width;
@@ -192,8 +195,8 @@ namespace ImageSharp.Tests
 
                 int pixelCount = left * top;
                 uint stepsPerPixel = (uint)(uint.MaxValue / pixelCount);
-                TColor c = default(TColor);
-                Color t = new Color(0);
+                TPixel c = default(TPixel);
+                Rgba32 t = new Rgba32(0);
 
                 for (int x = left; x < right; x++)
                     for (int y = top; y < bottom; y++)
diff --git a/tests/ImageSharp.Tests/TestUtilities/ImagingTestCaseUtility.cs b/tests/ImageSharp.Tests/TestUtilities/ImagingTestCaseUtility.cs
index 9fd33d90b6..6476c4ecf9 100644
--- a/tests/ImageSharp.Tests/TestUtilities/ImagingTestCaseUtility.cs
+++ b/tests/ImageSharp.Tests/TestUtilities/ImagingTestCaseUtility.cs
@@ -11,6 +11,7 @@ namespace ImageSharp.Tests
     using System.Reflection;
 
     using ImageSharp.Formats;
+    using ImageSharp.PixelFormats;
 
     /// <summary>
     /// Utility class to provide information about the test image & the test case for the test code,
@@ -19,12 +20,12 @@ namespace ImageSharp.Tests
     public class ImagingTestCaseUtility : TestBase
     {
         /// <summary>
-        /// Name of the TColor in the owner <see cref="TestImageProvider{TColor}"/>
+        /// Name of the TPixel in the owner <see cref="TestImageProvider{TPixel}"/>
         /// </summary>
         public string PixelTypeName { get; set; } = string.Empty;
 
         /// <summary>
-        /// The name of the file which is provided by <see cref="TestImageProvider{TColor}"/>
+        /// The name of the file which is provided by <see cref="TestImageProvider{TPixel}"/>
         /// Or a short string describing the image in the case of a non-file based image provider.
         /// </summary>
         public string SourceFileOrDescription { get; set; } = string.Empty;
@@ -91,13 +92,13 @@ namespace ImageSharp.Tests
         /// <summary>
         /// Encodes image by the format matching the required extension, than saves it to the recommended output file.
         /// </summary>
-        /// <typeparam name="TColor">The pixel format of the image</typeparam>
+        /// <typeparam name="TPixel">The pixel format of the image</typeparam>
         /// <param name="image">The image instance</param>
         /// <param name="extension">The requested extension</param>
         /// <param name="encoder">Optional encoder</param>
         /// <param name="options">Optional encoder options</param>
-        public void SaveTestOutputFile<TColor>(Image<TColor> image, string extension = null, IImageEncoder encoder = null, IEncoderOptions options = null)
-            where TColor : struct, IPixel<TColor>
+        public void SaveTestOutputFile<TPixel>(Image<TPixel> image, string extension = null, IImageEncoder encoder = null, IEncoderOptions options = null)
+            where TPixel : struct, IPixel<TPixel>
         {
             string path = this.GetTestOutputFileName(extension);
             extension = Path.GetExtension(path);
diff --git a/tests/ImageSharp.Tests/TestUtilities/PixelTypes.cs b/tests/ImageSharp.Tests/TestUtilities/PixelTypes.cs
index 92a16563a9..77c13f1252 100644
--- a/tests/ImageSharp.Tests/TestUtilities/PixelTypes.cs
+++ b/tests/ImageSharp.Tests/TestUtilities/PixelTypes.cs
@@ -9,7 +9,7 @@ namespace ImageSharp.Tests
 
     /// <summary>
     /// Flags that are mapped to PackedPixel types.
-    /// They trigger the desired parametrization for <see cref="TestImageProvider{TColor}"/>.
+    /// They trigger the desired parametrization for <see cref="TestImageProvider{TPixel}"/>.
     /// </summary>
     [Flags]
     public enum PixelTypes : uint
@@ -26,32 +26,34 @@ namespace ImageSharp.Tests
 
         Byte4 = 1 << 4,
 
-        Color = 1 << 5,
+        HalfSingle = 1 << 5,
 
-        HalfSingle = 1 << 6,
+        HalfVector2 = 1 << 6,
 
-        HalfVector2 = 1 << 7,
+        HalfVector4 = 1 << 7,
 
-        HalfVector4 = 1 << 8,
+        NormalizedByte2 = 1 << 8,
 
-        NormalizedByte2 = 1 << 9,
+        NormalizedByte4 = 1 << 9,
 
-        NormalizedByte4 = 1 << 10,
+        NormalizedShort4 = 1 << 10,
 
-        NormalizedShort4 = 1 << 11,
+        Rg32 = 1 << 11,
 
-        Rg32 = 1 << 12,
+        Rgba1010102 = 1 << 12,
 
-        Rgba1010102 = 1 << 13,
+        Rgba32 = 1 << 13,
 
         Rgba64 = 1 << 14,
 
-        Short2 = 1 << 15,
+        RgbaVector = 1 << 15,
 
-        Short4 = 1 << 16,
+        Short2 = 1 << 16,
+
+        Short4 = 1 << 17,
 
         /// <summary>
-        /// Triggers instantiating the <see cref="Image"/> subclass of <see cref="Image{TColor}"/>
+        /// Triggers instantiating the <see cref="Image"/> subclass of <see cref="Image{TPixel}"/>
         /// </summary>
         StandardImageClass = 1 << 29,
 
diff --git a/tests/ImageSharp.Tests/TestUtilities/TestImageExtensions.cs b/tests/ImageSharp.Tests/TestUtilities/TestImageExtensions.cs
index e2bc2bd2d7..5408d5362b 100644
--- a/tests/ImageSharp.Tests/TestUtilities/TestImageExtensions.cs
+++ b/tests/ImageSharp.Tests/TestUtilities/TestImageExtensions.cs
@@ -5,10 +5,12 @@ namespace ImageSharp.Tests
     using System.Collections.Generic;
     using System.Text;
 
+    using ImageSharp.PixelFormats;
+
     public static class TestImageExtensions
     {
-        public static void DebugSave<TColor>(this Image<TColor> img, TestImageProvider<TColor> provider, string extension = "png")
-                        where TColor : struct, IPixel<TColor>
+        public static void DebugSave<TPixel>(this Image<TPixel> img, TestImageProvider<TPixel> provider, string extension = "png")
+                        where TPixel : struct, IPixel<TPixel>
         {
             if(!bool.TryParse(Environment.GetEnvironmentVariable("CI"), out bool isCI) || !isCI)
             {
diff --git a/tests/ImageSharp.Tests/TestUtilities/TestUtilityExtensions.cs b/tests/ImageSharp.Tests/TestUtilities/TestUtilityExtensions.cs
index 260a677d3d..de05e83a9f 100644
--- a/tests/ImageSharp.Tests/TestUtilities/TestUtilityExtensions.cs
+++ b/tests/ImageSharp.Tests/TestUtilities/TestUtilityExtensions.cs
@@ -11,6 +11,8 @@ namespace ImageSharp.Tests
     using System.Linq;
     using System.Reflection;
 
+    using ImageSharp.PixelFormats;
+
     /// <summary>
     /// Extension methods for TestUtilities
     /// </summary>
@@ -18,7 +20,7 @@ namespace ImageSharp.Tests
     {
         private static readonly Dictionary<Type, PixelTypes> ClrTypes2PixelTypes = new Dictionary<Type, PixelTypes>();
 
-        private static readonly Assembly ImageSharpAssembly = typeof(Color).GetTypeInfo().Assembly;
+        private static readonly Assembly ImageSharpAssembly = typeof(Rgba32).GetTypeInfo().Assembly;
 
         private static readonly Dictionary<PixelTypes, Type> PixelTypes2ClrTypes = new Dictionary<PixelTypes, Type>();
 
@@ -28,8 +30,8 @@ namespace ImageSharp.Tests
 
         static TestUtilityExtensions()
         {
-            string nameSpace = typeof(Color).FullName;
-            nameSpace = nameSpace.Substring(0, nameSpace.Length - typeof(Color).Name.Length - 1);
+            string nameSpace = typeof(Rgba32).FullName;
+            nameSpace = nameSpace.Substring(0, nameSpace.Length - typeof(Rgba32).Name.Length - 1);
             foreach (PixelTypes pt in AllConcretePixelTypes.Where(pt => pt != PixelTypes.StandardImageClass))
             {
                 string typeName = $"{nameSpace}.{pt.ToString()}";
@@ -42,13 +44,13 @@ namespace ImageSharp.Tests
                 PixelTypes2ClrTypes[pt] = t;
                 ClrTypes2PixelTypes[t] = pt;
             }
-            PixelTypes2ClrTypes[PixelTypes.StandardImageClass] = typeof(Color);
+            PixelTypes2ClrTypes[PixelTypes.StandardImageClass] = typeof(Rgba32);
         }
 
         public static bool HasFlag(this PixelTypes pixelTypes, PixelTypes flag) => (pixelTypes & flag) == flag;
 
-        public static bool IsEquivalentTo<TColor>(this Image<TColor> a, Image<TColor> b, bool compareAlpha = true)
-            where TColor : struct, IPixel<TColor>
+        public static bool IsEquivalentTo<TPixel>(this Image<TPixel> a, Image<TPixel> b, bool compareAlpha = true)
+            where TPixel : struct, IPixel<TPixel>
         {
             if (a.Width != b.Width || a.Height != b.Height)
             {
@@ -58,16 +60,16 @@ namespace ImageSharp.Tests
             byte[] bytesA = new byte[3];
             byte[] bytesB = new byte[3];
 
-            using (PixelAccessor<TColor> pixA = a.Lock())
+            using (PixelAccessor<TPixel> pixA = a.Lock())
             {
-                using (PixelAccessor<TColor> pixB = b.Lock())
+                using (PixelAccessor<TPixel> pixB = b.Lock())
                 {
                     for (int y = 0; y < a.Height; y++)
                     {
                         for (int x = 0; x < a.Width; x++)
                         {
-                            TColor ca = pixA[x, y];
-                            TColor cb = pixB[x, y];
+                            TPixel ca = pixA[x, y];
+                            TPixel cb = pixB[x, y];
 
                             if (compareAlpha)
                             {
diff --git a/tests/ImageSharp.Tests/TestUtilities/Tests/TestImageProviderTests.cs b/tests/ImageSharp.Tests/TestUtilities/Tests/TestImageProviderTests.cs
index cea9cfea07..7d176c1e3e 100644
--- a/tests/ImageSharp.Tests/TestUtilities/Tests/TestImageProviderTests.cs
+++ b/tests/ImageSharp.Tests/TestUtilities/Tests/TestImageProviderTests.cs
@@ -7,6 +7,8 @@ namespace ImageSharp.Tests
 {
     using System;
 
+    using ImageSharp.PixelFormats;
+
     using Xunit;
     using Xunit.Abstractions;
 
@@ -20,11 +22,11 @@ namespace ImageSharp.Tests
         private ITestOutputHelper Output { get; }
 
         [Theory]
-        [WithBlankImages(42, 666, PixelTypes.Color | PixelTypes.Argb32 | PixelTypes.HalfSingle, "hello")]
-        public void Use_WithEmptyImageAttribute<TColor>(TestImageProvider<TColor> provider, string message)
-            where TColor : struct, IPixel<TColor>
+        [WithBlankImages(42, 666, PixelTypes.Rgba32 | PixelTypes.Argb32 | PixelTypes.HalfSingle, "hello")]
+        public void Use_WithEmptyImageAttribute<TPixel>(TestImageProvider<TPixel> provider, string message)
+            where TPixel : struct, IPixel<TPixel>
         {
-            Image<TColor> img = provider.GetImage();
+            Image<TPixel> img = provider.GetImage();
 
             Assert.Equal(42, img.Width);
             Assert.Equal(666, img.Height);
@@ -33,12 +35,12 @@ namespace ImageSharp.Tests
 
         [Theory]
         [WithBlankImages(42, 666, PixelTypes.All, "hello")]
-        public void Use_WithBlankImagesAttribute_WithAllPixelTypes<TColor>(
-            TestImageProvider<TColor> provider,
+        public void Use_WithBlankImagesAttribute_WithAllPixelTypes<TPixel>(
+            TestImageProvider<TPixel> provider,
             string message)
-            where TColor : struct, IPixel<TColor>
+            where TPixel : struct, IPixel<TPixel>
         {
-            Image<TColor> img = provider.GetImage();
+            Image<TPixel> img = provider.GetImage();
 
             Assert.Equal(42, img.Width);
             Assert.Equal(666, img.Height);
@@ -46,11 +48,11 @@ namespace ImageSharp.Tests
         }
 
         [Theory]
-        [WithBlankImages(1, 1, PixelTypes.Color, PixelTypes.Color)]
+        [WithBlankImages(1, 1, PixelTypes.Rgba32, PixelTypes.Rgba32)]
         [WithBlankImages(1, 1, PixelTypes.Alpha8, PixelTypes.Alpha8)]
         [WithBlankImages(1, 1, PixelTypes.StandardImageClass, PixelTypes.StandardImageClass)]
-        public void PixelType_PropertyValueIsCorrect<TColor>(TestImageProvider<TColor> provider, PixelTypes expected)
-            where TColor : struct, IPixel<TColor>
+        public void PixelType_PropertyValueIsCorrect<TPixel>(TestImageProvider<TPixel> provider, PixelTypes expected)
+            where TPixel : struct, IPixel<TPixel>
         {
             Assert.Equal(expected, provider.PixelType);
         }
@@ -58,11 +60,11 @@ namespace ImageSharp.Tests
         [Theory]
         [WithBlankImages(1, 1, PixelTypes.StandardImageClass)]
         [WithFile(TestImages.Bmp.F, PixelTypes.StandardImageClass)]
-        public void PixelTypes_ColorWithDefaultImageClass_TriggersCreatingTheNonGenericDerivedImageClass<TColor>(
-            TestImageProvider<TColor> provider)
-            where TColor : struct, IPixel<TColor>
+        public void PixelTypes_ColorWithDefaultImageClass_TriggersCreatingTheNonGenericDerivedImageClass<TPixel>(
+            TestImageProvider<TPixel> provider)
+            where TPixel : struct, IPixel<TPixel>
         {
-            Image<TColor> img = provider.GetImage();
+            Image<TPixel> img = provider.GetImage();
 
             Assert.IsType<Image>(img);
         }
@@ -70,11 +72,11 @@ namespace ImageSharp.Tests
         [Theory]
         [WithFile(TestImages.Bmp.Car, PixelTypes.All, 88)]
         [WithFile(TestImages.Bmp.F, PixelTypes.All, 88)]
-        public void Use_WithFileAttribute<TColor>(TestImageProvider<TColor> provider, int yo)
-            where TColor : struct, IPixel<TColor>
+        public void Use_WithFileAttribute<TPixel>(TestImageProvider<TPixel> provider, int yo)
+            where TPixel : struct, IPixel<TPixel>
         {
             Assert.NotNull(provider.Utility.SourceFileOrDescription);
-            Image<TColor> img = provider.GetImage();
+            Image<TPixel> img = provider.GetImage();
             Assert.True(img.Width * img.Height > 0);
 
             Assert.Equal(88, yo);
@@ -86,27 +88,27 @@ namespace ImageSharp.Tests
         public static string[] AllBmpFiles => TestImages.Bmp.All;
 
         [Theory]
-        [WithFileCollection(nameof(AllBmpFiles), PixelTypes.Color | PixelTypes.Argb32)]
-        public void Use_WithFileCollection<TColor>(TestImageProvider<TColor> provider)
-            where TColor : struct, IPixel<TColor>
+        [WithFileCollection(nameof(AllBmpFiles), PixelTypes.Rgba32 | PixelTypes.Argb32)]
+        public void Use_WithFileCollection<TPixel>(TestImageProvider<TPixel> provider)
+            where TPixel : struct, IPixel<TPixel>
         {
             Assert.NotNull(provider.Utility.SourceFileOrDescription);
-            Image<TColor> image = provider.GetImage();
+            Image<TPixel> image = provider.GetImage();
             provider.Utility.SaveTestOutputFile(image, "png");
         }
 
         [Theory]
-        [WithSolidFilledImages(10, 20, 255, 100, 50, 200, PixelTypes.Color | PixelTypes.Argb32)]
-        public void Use_WithSolidFilledImagesAttribute<TColor>(TestImageProvider<TColor> provider)
-            where TColor : struct, IPixel<TColor>
+        [WithSolidFilledImages(10, 20, 255, 100, 50, 200, PixelTypes.Rgba32 | PixelTypes.Argb32)]
+        public void Use_WithSolidFilledImagesAttribute<TPixel>(TestImageProvider<TPixel> provider)
+            where TPixel : struct, IPixel<TPixel>
         {
-            Image<TColor> img = provider.GetImage();
+            Image<TPixel> img = provider.GetImage();
             Assert.Equal(img.Width, 10);
             Assert.Equal(img.Height, 20);
 
             byte[] colors = new byte[4];
 
-            using (PixelAccessor<TColor> pixels = img.Lock())
+            using (PixelAccessor<TPixel> pixels = img.Lock())
             {
                 for (int y = 0; y < pixels.Height; y++)
                 {
@@ -124,23 +126,23 @@ namespace ImageSharp.Tests
         }
 
         /// <summary>
-        /// Need to us <see cref="GenericFactory{TColor}"/> to create instance of <see cref="Image"/> when pixelType is StandardImageClass
+        /// Need to us <see cref="GenericFactory{TPixel}"/> to create instance of <see cref="Image"/> when pixelType is StandardImageClass
         /// </summary>
-        /// <typeparam name="TColor"></typeparam>
+        /// <typeparam name="TPixel"></typeparam>
         /// <param name="factory"></param>
         /// <returns></returns>
-        public static Image<TColor> CreateTestImage<TColor>(GenericFactory<TColor> factory)
-            where TColor : struct, IPixel<TColor>
+        public static Image<TPixel> CreateTestImage<TPixel>(GenericFactory<TPixel> factory)
+            where TPixel : struct, IPixel<TPixel>
         {
             return factory.CreateImage(3, 3);
         }
 
         [Theory]
         [WithMemberFactory(nameof(CreateTestImage), PixelTypes.All)]
-        public void Use_WithMemberFactoryAttribute<TColor>(TestImageProvider<TColor> provider)
-            where TColor : struct, IPixel<TColor>
+        public void Use_WithMemberFactoryAttribute<TPixel>(TestImageProvider<TPixel> provider)
+            where TPixel : struct, IPixel<TPixel>
         {
-            Image<TColor> img = provider.GetImage();
+            Image<TPixel> img = provider.GetImage();
             Assert.Equal(img.Width, 3);
             if (provider.PixelType == PixelTypes.StandardImageClass)
             {
@@ -151,7 +153,7 @@ namespace ImageSharp.Tests
 
         public static readonly TheoryData<object> BasicData = new TheoryData<object>()
                                                                              {
-                                                                                 TestImageProvider<Color>.Blank(10, 20),
+                                                                                 TestImageProvider<Rgba32>.Blank(10, 20),
                                                                                  TestImageProvider<HalfVector4>.Blank(
                                                                                      10,
                                                                                      20),
@@ -159,17 +161,17 @@ namespace ImageSharp.Tests
 
         [Theory]
         [MemberData(nameof(BasicData))]
-        public void Blank_MemberData<TColor>(TestImageProvider<TColor> provider)
-            where TColor : struct, IPixel<TColor>
+        public void Blank_MemberData<TPixel>(TestImageProvider<TPixel> provider)
+            where TPixel : struct, IPixel<TPixel>
         {
-            Image<TColor> img = provider.GetImage();
+            Image<TPixel> img = provider.GetImage();
 
             Assert.True(img.Width * img.Height > 0);
         }
 
         public static readonly TheoryData<object> FileData = new TheoryData<object>()
                                                                             {
-                                                                                TestImageProvider<Color>.File(
+                                                                                TestImageProvider<Rgba32>.File(
                                                                                     TestImages.Bmp.Car),
                                                                                 TestImageProvider<HalfVector4>.File(
                                                                                     TestImages.Bmp.F)
@@ -177,13 +179,13 @@ namespace ImageSharp.Tests
 
         [Theory]
         [MemberData(nameof(FileData))]
-        public void File_MemberData<TColor>(TestImageProvider<TColor> provider)
-            where TColor : struct, IPixel<TColor>
+        public void File_MemberData<TPixel>(TestImageProvider<TPixel> provider)
+            where TPixel : struct, IPixel<TPixel>
         {
             this.Output.WriteLine("SRC: " + provider.Utility.SourceFileOrDescription);
             this.Output.WriteLine("OUT: " + provider.Utility.GetTestOutputFileName());
 
-            Image<TColor> img = provider.GetImage();
+            Image<TPixel> img = provider.GetImage();
 
             Assert.True(img.Width * img.Height > 0);
         }
diff --git a/tests/ImageSharp.Tests/TestUtilities/Tests/TestUtilityExtensionsTests.cs b/tests/ImageSharp.Tests/TestUtilities/Tests/TestUtilityExtensionsTests.cs
index 0d24410ac7..29623e1b59 100644
--- a/tests/ImageSharp.Tests/TestUtilities/Tests/TestUtilityExtensionsTests.cs
+++ b/tests/ImageSharp.Tests/TestUtilities/Tests/TestUtilityExtensionsTests.cs
@@ -11,6 +11,8 @@ namespace ImageSharp.Tests
     using System.Numerics;
     using System.Reflection;
 
+    using ImageSharp.PixelFormats;
+
     using Xunit;
     using Xunit.Abstractions;
 
@@ -23,12 +25,12 @@ namespace ImageSharp.Tests
 
         private ITestOutputHelper Output { get; }
 
-        public static Image<TColor> CreateTestImage<TColor>(GenericFactory<TColor> factory)
-            where TColor : struct, IPixel<TColor>
+        public static Image<TPixel> CreateTestImage<TPixel>(GenericFactory<TPixel> factory)
+            where TPixel : struct, IPixel<TPixel>
         {
-            Image<TColor> image = factory.CreateImage(10, 10);
+            Image<TPixel> image = factory.CreateImage(10, 10);
 
-            using (PixelAccessor<TColor> pixels = image.Lock())
+            using (PixelAccessor<TPixel> pixels = image.Lock())
             {
                 for (int i = 0; i < 10; i++)
                 {
@@ -37,7 +39,7 @@ namespace ImageSharp.Tests
                         Vector4 v = new Vector4(i, j, 0, 1);
                         v /= 10;
 
-                        TColor color = default(TColor);
+                        TPixel color = default(TPixel);
                         color.PackFromVector4(v);
 
                         pixels[i, j] = color;
@@ -51,50 +53,50 @@ namespace ImageSharp.Tests
         [Fact]
         public void Baz()
         {
-            Type type = typeof(Color).GetTypeInfo().Assembly.GetType("ImageSharp.Color");
+            Type type = typeof(Rgba32).GetTypeInfo().Assembly.GetType("ImageSharp.PixelFormats.Rgba32");
             this.Output.WriteLine(type.ToString());
 
-            Type fake = typeof(Color).GetTypeInfo().Assembly.GetType("ImageSharp.dsaada_DASqewrr");
+            Type fake = typeof(Rgba32).GetTypeInfo().Assembly.GetType("ImageSharp.dsaada_DASqewrr");
             Assert.Null(fake);
         }
         
         [Theory]
-        [WithFile(TestImages.Bmp.Car, PixelTypes.Color, true)]
-        [WithFile(TestImages.Bmp.Car, PixelTypes.Color, false)]
-        public void IsEquivalentTo_WhenFalse<TColor>(TestImageProvider<TColor> provider, bool compareAlpha)
-            where TColor : struct, IPixel<TColor>
+        [WithFile(TestImages.Bmp.Car, PixelTypes.Rgba32, true)]
+        [WithFile(TestImages.Bmp.Car, PixelTypes.Rgba32, false)]
+        public void IsEquivalentTo_WhenFalse<TPixel>(TestImageProvider<TPixel> provider, bool compareAlpha)
+            where TPixel : struct, IPixel<TPixel>
         {
-            Image<TColor> a = provider.GetImage();
-            Image<TColor> b = provider.GetImage();
+            Image<TPixel> a = provider.GetImage();
+            Image<TPixel> b = provider.GetImage();
             b = b.OilPaint(3, 2);
 
             Assert.False(a.IsEquivalentTo(b, compareAlpha));
         }
 
         [Theory]
-        [WithMemberFactory(nameof(CreateTestImage), PixelTypes.Color | PixelTypes.Bgr565, true)]
-        [WithMemberFactory(nameof(CreateTestImage), PixelTypes.Color | PixelTypes.Bgr565, false)]
-        public void IsEquivalentTo_WhenTrue<TColor>(TestImageProvider<TColor> provider, bool compareAlpha)
-            where TColor : struct, IPixel<TColor>
+        [WithMemberFactory(nameof(CreateTestImage), PixelTypes.Rgba32 | PixelTypes.Bgr565, true)]
+        [WithMemberFactory(nameof(CreateTestImage), PixelTypes.Rgba32 | PixelTypes.Bgr565, false)]
+        public void IsEquivalentTo_WhenTrue<TPixel>(TestImageProvider<TPixel> provider, bool compareAlpha)
+            where TPixel : struct, IPixel<TPixel>
         {
-            Image<TColor> a = provider.GetImage();
-            Image<TColor> b = provider.GetImage();
+            Image<TPixel> a = provider.GetImage();
+            Image<TPixel> b = provider.GetImage();
 
             Assert.True(a.IsEquivalentTo(b, compareAlpha));
         }
 
         [Theory]
-        [InlineData(PixelTypes.Color, typeof(Color))]
+        [InlineData(PixelTypes.Rgba32, typeof(Rgba32))]
         [InlineData(PixelTypes.Argb32, typeof(Argb32))]
         [InlineData(PixelTypes.HalfVector4, typeof(HalfVector4))]
-        [InlineData(PixelTypes.StandardImageClass, typeof(Color))]
+        [InlineData(PixelTypes.StandardImageClass, typeof(Rgba32))]
         public void ToType(PixelTypes pt, Type expectedType)
         {
             Assert.Equal(pt.ToType(), expectedType);
         }
 
         [Theory]
-        [InlineData(typeof(Color), PixelTypes.Color)]
+        [InlineData(typeof(Rgba32), PixelTypes.Rgba32)]
         [InlineData(typeof(Argb32), PixelTypes.Argb32)]
         public void GetPixelType(Type clrType, PixelTypes expectedPixelType)
         {
@@ -112,7 +114,7 @@ namespace ImageSharp.Tests
         [Fact]
         public void ToTypes()
         {
-            PixelTypes pixelTypes = PixelTypes.Alpha8 | PixelTypes.Bgr565 | PixelTypes.Color | PixelTypes.HalfVector2 | PixelTypes.StandardImageClass;
+            PixelTypes pixelTypes = PixelTypes.Alpha8 | PixelTypes.Bgr565 | PixelTypes.Rgba32 | PixelTypes.HalfVector2 | PixelTypes.StandardImageClass;
 
             IEnumerable<KeyValuePair<PixelTypes, Type>> expanded = pixelTypes.ExpandAllTypes();
 
@@ -120,9 +122,9 @@ namespace ImageSharp.Tests
 
             AssertContainsPixelType<Alpha8>(PixelTypes.Alpha8, expanded);
             AssertContainsPixelType<Bgr565>(PixelTypes.Bgr565, expanded);
-            AssertContainsPixelType<Color>(PixelTypes.Color, expanded);
+            AssertContainsPixelType<Rgba32>(PixelTypes.Rgba32, expanded);
             AssertContainsPixelType<HalfVector2>(PixelTypes.HalfVector2, expanded);
-            AssertContainsPixelType<Color>(PixelTypes.StandardImageClass, expanded);
+            AssertContainsPixelType<Rgba32>(PixelTypes.StandardImageClass, expanded);
         }
 
         [Fact]
@@ -131,8 +133,8 @@ namespace ImageSharp.Tests
             KeyValuePair<PixelTypes, Type>[] expanded = PixelTypes.All.ExpandAllTypes().ToArray();
 
             Assert.True(expanded.Length >= TestUtilityExtensions.GetAllPixelTypes().Length - 2);
-            AssertContainsPixelType<Color>(PixelTypes.Color, expanded);
-            AssertContainsPixelType<Color>(PixelTypes.StandardImageClass, expanded);
+            AssertContainsPixelType<Rgba32>(PixelTypes.Rgba32, expanded);
+            AssertContainsPixelType<Rgba32>(PixelTypes.StandardImageClass, expanded);
         }
     }
 }
\ No newline at end of file