diff --git a/src/ImageSharp/Common/Helpers/Guard.cs b/src/ImageSharp/Common/Helpers/Guard.cs
index b0546bf9a..0db5cb7c1 100644
--- a/src/ImageSharp/Common/Helpers/Guard.cs
+++ b/src/ImageSharp/Common/Helpers/Guard.cs
@@ -100,7 +100,7 @@ namespace SixLabors.ImageSharp
         {
             if (value.CompareTo(max) >= 0)
             {
-                throw new ArgumentOutOfRangeException(parameterName, $"Value must be less than {max}.");
+                throw new ArgumentOutOfRangeException(parameterName, $"Value {value} must be less than {max}.");
             }
         }
 
@@ -120,7 +120,7 @@ namespace SixLabors.ImageSharp
         {
             if (value.CompareTo(max) > 0)
             {
-                throw new ArgumentOutOfRangeException(parameterName, $"Value must be less than or equal to {max}.");
+                throw new ArgumentOutOfRangeException(parameterName, $"Value {value} must be less than or equal to {max}.");
             }
         }
 
@@ -142,7 +142,7 @@ namespace SixLabors.ImageSharp
             {
                 throw new ArgumentOutOfRangeException(
                     parameterName,
-                    $"Value must be greater than {min}.");
+                    $"Value {value} must be greater than {min}.");
             }
         }
 
@@ -162,7 +162,7 @@ namespace SixLabors.ImageSharp
         {
             if (value.CompareTo(min) < 0)
             {
-                throw new ArgumentOutOfRangeException(parameterName, $"Value must be greater than or equal to {min}.");
+                throw new ArgumentOutOfRangeException(parameterName, $"Value {value} must be greater than or equal to {min}.");
             }
         }
 
@@ -183,7 +183,7 @@ namespace SixLabors.ImageSharp
         {
             if (value.CompareTo(min) < 0 || value.CompareTo(max) > 0)
             {
-                throw new ArgumentOutOfRangeException(parameterName, $"Value must be greater than or equal to {min} and less than or equal to {max}.");
+                throw new ArgumentOutOfRangeException(parameterName, $"Value {value} must be greater than or equal to {min} and less than or equal to {max}.");
             }
         }
 
diff --git a/src/ImageSharp/Formats/Gif/GifEncoder.cs b/src/ImageSharp/Formats/Gif/GifEncoder.cs
index ad3e85f92..fb072bcb7 100644
--- a/src/ImageSharp/Formats/Gif/GifEncoder.cs
+++ b/src/ImageSharp/Formats/Gif/GifEncoder.cs
@@ -24,20 +24,11 @@ namespace SixLabors.ImageSharp.Formats.Gif
         /// </summary>
         public Encoding TextEncoding { get; set; } = GifConstants.DefaultEncoding;
 
-        /// <summary>
-        /// Gets or sets the size of the color palette to use. For gifs the value ranges from 1 to 256. Leave as zero for default size.
-        /// </summary>
-        public int PaletteSize { get; set; } = 0;
-
-        /// <summary>
-        /// Gets or sets the transparency threshold.
-        /// </summary>
-        public byte Threshold { get; set; } = 128;
-
         /// <summary>
         /// Gets or sets the quantizer for reducing the color count.
+        /// Defaults to the <see cref="OctreeQuantizer"/>
         /// </summary>
-        public IQuantizer Quantizer { get; set; }
+        public IQuantizer Quantizer { get; set; } = new OctreeQuantizer();
 
         /// <inheritdoc/>
         public void Encode<TPixel>(Image<TPixel> image, Stream stream)
@@ -47,4 +38,4 @@ namespace SixLabors.ImageSharp.Formats.Gif
             encoder.Encode(image, stream);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/ImageSharp/Formats/Gif/GifEncoderCore.cs b/src/ImageSharp/Formats/Gif/GifEncoderCore.cs
index bdb228f52..57bb3d09a 100644
--- a/src/ImageSharp/Formats/Gif/GifEncoderCore.cs
+++ b/src/ImageSharp/Formats/Gif/GifEncoderCore.cs
@@ -25,40 +25,30 @@ namespace SixLabors.ImageSharp.Formats.Gif
         /// </summary>
         private readonly byte[] buffer = new byte[16];
 
-        /// <summary>
-        /// The number of bits requires to store the image palette.
-        /// </summary>
-        private int bitDepth;
-
-        /// <summary>
-        /// Whether the current image has multiple frames.
-        /// </summary>
-        private bool hasFrames;
-
         /// <summary>
         /// Gets the TextEncoding
         /// </summary>
-        private Encoding textEncoding;
+        private readonly Encoding textEncoding;
 
         /// <summary>
         /// Gets or sets the quantizer for reducing the color count.
         /// </summary>
-        private IQuantizer quantizer;
+        private readonly IQuantizer quantizer;
 
         /// <summary>
-        /// Gets or sets the threshold.
+        /// Gets or sets a value indicating whether the metadata should be ignored when the image is being decoded.
         /// </summary>
-        private byte threshold;
+        private readonly bool ignoreMetadata;
 
         /// <summary>
-        /// Gets or sets the size of the color palette to use.
+        /// The number of bits requires to store the image palette.
         /// </summary>
-        private int paletteSize;
+        private int bitDepth;
 
         /// <summary>
-        /// Gets or sets a value indicating whether the metadata should be ignored when the image is being decoded.
+        /// Whether the current image has multiple frames.
         /// </summary>
-        private bool ignoreMetadata;
+        private bool hasFrames;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="GifEncoderCore"/> class.
@@ -69,10 +59,7 @@ namespace SixLabors.ImageSharp.Formats.Gif
         {
             this.memoryManager = memoryManager;
             this.textEncoding = options.TextEncoding ?? GifConstants.DefaultEncoding;
-
             this.quantizer = options.Quantizer;
-            this.threshold = options.Threshold;
-            this.paletteSize = options.PaletteSize;
             this.ignoreMetadata = options.IgnoreMetadata;
         }
 
@@ -88,24 +75,16 @@ namespace SixLabors.ImageSharp.Formats.Gif
             Guard.NotNull(image, nameof(image));
             Guard.NotNull(stream, nameof(stream));
 
-            this.quantizer = this.quantizer ?? new OctreeQuantizer<TPixel>();
-
             // Do not use IDisposable pattern here as we want to preserve the stream.
             var writer = new EndianBinaryWriter(Endianness.LittleEndian, stream);
 
-            // Ensure that pallete size  can be set but has a fallback.
-            int size = this.paletteSize;
-            size = size > 0 ? size.Clamp(1, 256) : 256;
-
-            // Get the number of bits.
-            this.bitDepth = ImageMaths.GetBitsNeededForColorDepth(size);
-
             this.hasFrames = image.Frames.Count > 1;
 
-            var pixelQuantizer = (IQuantizer<TPixel>)this.quantizer;
-
             // Quantize the image returning a palette.
-            QuantizedFrame<TPixel> quantized = pixelQuantizer.Quantize(image.Frames.RootFrame, size);
+            QuantizedFrame<TPixel> quantized = this.quantizer.CreateFrameQuantizer<TPixel>().QuantizeFrame(image.Frames.RootFrame);
+
+            // Get the number of bits.
+            this.bitDepth = ImageMaths.GetBitsNeededForColorDepth(quantized.Palette.Length).Clamp(1, 8);
 
             int index = this.GetTransparentIndex(quantized);
 
@@ -128,7 +107,7 @@ namespace SixLabors.ImageSharp.Formats.Gif
             {
                 if (quantized == null)
                 {
-                    quantized = pixelQuantizer.Quantize(frame, size);
+                    quantized = this.quantizer.CreateFrameQuantizer<TPixel>().QuantizeFrame(frame);
                 }
 
                 this.WriteGraphicalControlExtension(frame.MetaData, writer, this.GetTransparentIndex(quantized));
@@ -136,7 +115,7 @@ namespace SixLabors.ImageSharp.Formats.Gif
                 this.WriteColorTable(quantized, writer);
                 this.WriteImageData(quantized, writer);
 
-                quantized = null; // so next frame can regenerate it
+                quantized = null; // So next frame can regenerate it
             }
 
             // TODO: Write extension etc
diff --git a/src/ImageSharp/Formats/Gif/IGifEncoderOptions.cs b/src/ImageSharp/Formats/Gif/IGifEncoderOptions.cs
index a709b2b9d..1f1875789 100644
--- a/src/ImageSharp/Formats/Gif/IGifEncoderOptions.cs
+++ b/src/ImageSharp/Formats/Gif/IGifEncoderOptions.cs
@@ -21,16 +21,6 @@ namespace SixLabors.ImageSharp.Formats.Gif
         /// </summary>
         Encoding TextEncoding { get; }
 
-        /// <summary>
-        /// Gets the size of the color palette to use. For gifs the value ranges from 1 to 256. Leave as zero for default size.
-        /// </summary>
-        int PaletteSize { get; }
-
-        /// <summary>
-        /// Gets the transparency threshold.
-        /// </summary>
-        byte Threshold { get; }
-
         /// <summary>
         /// Gets the quantizer for reducing the color count.
         /// </summary>
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/OrigJpegDecoderCore.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/OrigJpegDecoderCore.cs
index d3d1efe7f..0125d2703 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/OrigJpegDecoderCore.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/OrigJpegDecoderCore.cs
@@ -3,7 +3,6 @@
 
 using System.Collections.Generic;
 using System.IO;
-
 using SixLabors.ImageSharp.Formats.Jpeg.Common;
 using SixLabors.ImageSharp.Formats.Jpeg.Common.Decoder;
 using SixLabors.ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder;
@@ -11,6 +10,7 @@ using SixLabors.ImageSharp.MetaData;
 using SixLabors.ImageSharp.MetaData.Profiles.Exif;
 using SixLabors.ImageSharp.MetaData.Profiles.Icc;
 using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.ImageSharp.Primitives;
 using SixLabors.Primitives;
 
 namespace SixLabors.ImageSharp.Formats.Jpeg.GolangPort
diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/PdfJsJpegDecoderCore.cs b/src/ImageSharp/Formats/Jpeg/PdfJsPort/PdfJsJpegDecoderCore.cs
index 54e2833b1..a600658b0 100644
--- a/src/ImageSharp/Formats/Jpeg/PdfJsPort/PdfJsJpegDecoderCore.cs
+++ b/src/ImageSharp/Formats/Jpeg/PdfJsPort/PdfJsJpegDecoderCore.cs
@@ -12,6 +12,7 @@ using SixLabors.ImageSharp.MetaData;
 using SixLabors.ImageSharp.MetaData.Profiles.Exif;
 using SixLabors.ImageSharp.MetaData.Profiles.Icc;
 using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.ImageSharp.Primitives;
 
 namespace SixLabors.ImageSharp.Formats.Jpeg.PdfJsPort
 {
diff --git a/src/ImageSharp/Formats/Png/IPngEncoderOptions.cs b/src/ImageSharp/Formats/Png/IPngEncoderOptions.cs
index 28020f260..1bfa4b063 100644
--- a/src/ImageSharp/Formats/Png/IPngEncoderOptions.cs
+++ b/src/ImageSharp/Formats/Png/IPngEncoderOptions.cs
@@ -10,16 +10,6 @@ namespace SixLabors.ImageSharp.Formats.Png
     /// </summary>
     internal interface IPngEncoderOptions
     {
-        /// <summary>
-        /// Gets a value indicating whether the metadata should be ignored when the image is being encoded.
-        /// </summary>
-        bool IgnoreMetadata { get; }
-
-        /// <summary>
-        /// Gets the size of the color palette to use. Set to zero to leav png encoding to use pixel data.
-        /// </summary>
-        int PaletteSize { get; }
-
         /// <summary>
         /// Gets the png color type
         /// </summary>
diff --git a/src/ImageSharp/Formats/Png/PngEncoder.cs b/src/ImageSharp/Formats/Png/PngEncoder.cs
index 2cff18410..993dc6586 100644
--- a/src/ImageSharp/Formats/Png/PngEncoder.cs
+++ b/src/ImageSharp/Formats/Png/PngEncoder.cs
@@ -13,16 +13,6 @@ namespace SixLabors.ImageSharp.Formats.Png
     /// </summary>
     public sealed class PngEncoder : IImageEncoder, IPngEncoderOptions
     {
-        /// <summary>
-        /// Gets or sets a value indicating whether the metadata should be ignored when the image is being encoded.
-        /// </summary>
-        public bool IgnoreMetadata { get; set; }
-
-        /// <summary>
-        /// Gets or sets the size of the color palette to use. Set to zero to leave png encoding to use pixel data.
-        /// </summary>
-        public int PaletteSize { get; set; } = 0;
-
         /// <summary>
         /// Gets or sets the png color type
         /// </summary>
@@ -44,8 +34,9 @@ namespace SixLabors.ImageSharp.Formats.Png
 
         /// <summary>
         /// Gets or sets quantizer for reducing the color count.
+        /// Defaults to the <see cref="WuQuantizer"/>
         /// </summary>
-        public IQuantizer Quantizer { get; set; }
+        public IQuantizer Quantizer { get; set; } = new WuQuantizer();
 
         /// <summary>
         /// Gets or sets the transparency threshold.
@@ -73,4 +64,4 @@ namespace SixLabors.ImageSharp.Formats.Png
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/ImageSharp/Formats/Png/PngEncoderCore.cs b/src/ImageSharp/Formats/Png/PngEncoderCore.cs
index 29c9d2a14..273516499 100644
--- a/src/ImageSharp/Formats/Png/PngEncoderCore.cs
+++ b/src/ImageSharp/Formats/Png/PngEncoderCore.cs
@@ -40,6 +40,36 @@ namespace SixLabors.ImageSharp.Formats.Png
         /// </summary>
         private readonly Crc32 crc = new Crc32();
 
+        /// <summary>
+        /// The png color type.
+        /// </summary>
+        private readonly PngColorType pngColorType;
+
+        /// <summary>
+        /// The quantizer for reducing the color count.
+        /// </summary>
+        private readonly IQuantizer quantizer;
+
+        /// <summary>
+        /// Gets or sets the CompressionLevel value
+        /// </summary>
+        private readonly int compressionLevel;
+
+        /// <summary>
+        /// Gets or sets the Gamma value
+        /// </summary>
+        private readonly float gamma;
+
+        /// <summary>
+        /// Gets or sets the Threshold value
+        /// </summary>
+        private readonly byte threshold;
+
+        /// <summary>
+        /// Gets or sets a value indicating whether to Write Gamma
+        /// </summary>
+        private readonly bool writeGamma;
+
         /// <summary>
         /// Contains the raw pixel data from an indexed image.
         /// </summary>
@@ -101,50 +131,10 @@ namespace SixLabors.ImageSharp.Formats.Png
         private IManagedByteBuffer average;
 
         /// <summary>
-        /// The buffer for the paeth filter
+        /// The buffer for the Paeth filter
         /// </summary>
         private IManagedByteBuffer paeth;
 
-        /// <summary>
-        /// The png color type.
-        /// </summary>
-        private PngColorType pngColorType;
-
-        /// <summary>
-        /// The quantizer for reducing the color count.
-        /// </summary>
-        private IQuantizer quantizer;
-
-        /// <summary>
-        /// Gets or sets a value indicating whether to ignore metadata
-        /// </summary>
-        private bool ignoreMetadata;
-
-        /// <summary>
-        /// Gets or sets the Quality value
-        /// </summary>
-        private int paletteSize;
-
-        /// <summary>
-        /// Gets or sets the CompressionLevel value
-        /// </summary>
-        private int compressionLevel;
-
-        /// <summary>
-        /// Gets or sets the Gamma value
-        /// </summary>
-        private float gamma;
-
-        /// <summary>
-        /// Gets or sets the Threshold value
-        /// </summary>
-        private byte threshold;
-
-        /// <summary>
-        /// Gets or sets a value indicating whether to Write Gamma
-        /// </summary>
-        private bool writeGamma;
-
         /// <summary>
         /// Initializes a new instance of the <see cref="PngEncoderCore"/> class.
         /// </summary>
@@ -153,8 +143,6 @@ namespace SixLabors.ImageSharp.Formats.Png
         public PngEncoderCore(MemoryManager memoryManager, IPngEncoderOptions options)
         {
             this.memoryManager = memoryManager;
-            this.ignoreMetadata = options.IgnoreMetadata;
-            this.paletteSize = options.PaletteSize > 0 ? options.PaletteSize.Clamp(1, int.MaxValue) : int.MaxValue;
             this.pngColorType = options.PngColorType;
             this.compressionLevel = options.CompressionLevel;
             this.gamma = options.Gamma;
@@ -190,28 +178,27 @@ namespace SixLabors.ImageSharp.Formats.Png
 
             stream.Write(this.chunkDataBuffer, 0, 8);
 
-            // Set correct color type if the color count is 256 or less.
-            if (this.paletteSize <= 256)
-            {
-                this.pngColorType = PngColorType.Palette;
-            }
-
-            if (this.pngColorType == PngColorType.Palette && this.paletteSize > 256)
+            QuantizedFrame<TPixel> quantized = null;
+            if (this.pngColorType == PngColorType.Palette)
             {
-                this.paletteSize = 256;
-            }
+                // Create quantized frame returning the palette and set the bit depth.
+                quantized = this.quantizer.CreateFrameQuantizer<TPixel>().QuantizeFrame(image.Frames.RootFrame);
+                this.palettePixelData = quantized.Pixels;
+                byte bits = (byte)ImageMaths.GetBitsNeededForColorDepth(quantized.Palette.Length).Clamp(1, 8);
 
-            // Set correct bit depth.
-            this.bitDepth = this.paletteSize <= 256
-                               ? (byte)ImageMaths.GetBitsNeededForColorDepth(this.paletteSize).Clamp(1, 8)
-                               : (byte)8;
+                // Png only supports in four pixel depths: 1, 2, 4, and 8 bits when using the PLTE chunk
+                if (bits == 3)
+                {
+                    bits = 4;
+                }
+                else if (bits >= 5 || bits <= 7)
+                {
+                    bits = 8;
+                }
 
-            // Png only supports in four pixel depths: 1, 2, 4, and 8 bits when using the PLTE chunk
-            if (this.bitDepth == 3)
-            {
-                this.bitDepth = 4;
+                this.bitDepth = bits;
             }
-            else if (this.bitDepth >= 5 || this.bitDepth <= 7)
+            else
             {
                 this.bitDepth = 8;
             }
@@ -232,9 +219,9 @@ namespace SixLabors.ImageSharp.Formats.Png
             this.WriteHeaderChunk(stream, header);
 
             // Collect the indexed pixel data
-            if (this.pngColorType == PngColorType.Palette)
+            if (quantized != null)
             {
-                this.CollectIndexedBytes(image.Frames.RootFrame, stream, header);
+                this.WritePaletteChunk(stream, header, quantized);
             }
 
             this.WritePhysicalChunk(stream, image);
@@ -296,21 +283,6 @@ namespace SixLabors.ImageSharp.Formats.Png
             stream.Write(buffer, 0, 4);
         }
 
-        /// <summary>
-        /// Collects the indexed pixel data.
-        /// </summary>
-        /// <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<TPixel>(ImageFrame<TPixel> image, Stream stream, PngHeader header)
-            where TPixel : struct, IPixel<TPixel>
-        {
-            // Quantize the image and get the pixels.
-            QuantizedFrame<TPixel> quantized = this.WritePaletteChunk(stream, header, image);
-            this.palettePixelData = quantized.Pixels;
-        }
-
         /// <summary>
         /// Collects a row of grayscale pixels.
         /// </summary>
@@ -496,24 +468,10 @@ namespace SixLabors.ImageSharp.Formats.Png
         /// <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="QuantizedFrame{TPixel}"/></returns>
-        private QuantizedFrame<TPixel> WritePaletteChunk<TPixel>(Stream stream, PngHeader header, ImageFrame<TPixel> image)
+        /// <param name="quantized">The quantized frame.</param>
+        private void WritePaletteChunk<TPixel>(Stream stream, PngHeader header, QuantizedFrame<TPixel> quantized)
             where TPixel : struct, IPixel<TPixel>
         {
-            if (this.paletteSize > 256)
-            {
-                return null;
-            }
-
-            if (this.quantizer == null)
-            {
-                this.quantizer = new WuQuantizer<TPixel>();
-            }
-
-            // Quantize the image returning a palette. This boxing is icky.
-            QuantizedFrame<TPixel> quantized = ((IQuantizer<TPixel>)this.quantizer).Quantize(image, this.paletteSize);
-
             // Grab the palette and write it to the stream.
             TPixel[] palette = quantized.Palette;
             byte pixelCount = palette.Length.ToByte();
@@ -560,8 +518,6 @@ namespace SixLabors.ImageSharp.Formats.Png
                     this.WriteChunk(stream, PngChunkTypes.PaletteAlpha, alphaTable.Array, 0, pixelCount);
                 }
             }
-
-            return quantized;
         }
 
         /// <summary>
diff --git a/src/ImageSharp/MetaData/Profiles/Exif/ExifProfile.cs b/src/ImageSharp/MetaData/Profiles/Exif/ExifProfile.cs
index f72753cc2..7cd2d002d 100644
--- a/src/ImageSharp/MetaData/Profiles/Exif/ExifProfile.cs
+++ b/src/ImageSharp/MetaData/Profiles/Exif/ExifProfile.cs
@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.IO;
 using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.ImageSharp.Primitives;
 
 namespace SixLabors.ImageSharp.MetaData.Profiles.Exif
 {
diff --git a/src/ImageSharp/MetaData/Profiles/Exif/ExifReader.cs b/src/ImageSharp/MetaData/Profiles/Exif/ExifReader.cs
index e247527a6..8a7b1f7d7 100644
--- a/src/ImageSharp/MetaData/Profiles/Exif/ExifReader.cs
+++ b/src/ImageSharp/MetaData/Profiles/Exif/ExifReader.cs
@@ -1,10 +1,12 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
+
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text;
+using SixLabors.ImageSharp.Primitives;
 
 namespace SixLabors.ImageSharp.MetaData.Profiles.Exif
 {
diff --git a/src/ImageSharp/MetaData/Profiles/Exif/ExifValue.cs b/src/ImageSharp/MetaData/Profiles/Exif/ExifValue.cs
index 7ffe9d48f..3c2b23f37 100644
--- a/src/ImageSharp/MetaData/Profiles/Exif/ExifValue.cs
+++ b/src/ImageSharp/MetaData/Profiles/Exif/ExifValue.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Globalization;
 using System.Text;
+using SixLabors.ImageSharp.Primitives;
 
 namespace SixLabors.ImageSharp.MetaData.Profiles.Exif
 {
diff --git a/src/ImageSharp/MetaData/Profiles/Exif/ExifWriter.cs b/src/ImageSharp/MetaData/Profiles/Exif/ExifWriter.cs
index 7f4123225..a4cfc7e13 100644
--- a/src/ImageSharp/MetaData/Profiles/Exif/ExifWriter.cs
+++ b/src/ImageSharp/MetaData/Profiles/Exif/ExifWriter.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Text;
+using SixLabors.ImageSharp.Primitives;
 
 namespace SixLabors.ImageSharp.MetaData.Profiles.Exif
 {
diff --git a/src/ImageSharp/MetaData/Profiles/Exif/LongRational.cs b/src/ImageSharp/Primitives/LongRational.cs
similarity index 99%
rename from src/ImageSharp/MetaData/Profiles/Exif/LongRational.cs
rename to src/ImageSharp/Primitives/LongRational.cs
index f9c16d57d..641a1e5e5 100644
--- a/src/ImageSharp/MetaData/Profiles/Exif/LongRational.cs
+++ b/src/ImageSharp/Primitives/LongRational.cs
@@ -5,7 +5,7 @@ using System;
 using System.Globalization;
 using System.Text;
 
-namespace SixLabors.ImageSharp.MetaData.Profiles.Exif
+namespace SixLabors.ImageSharp.Primitives
 {
     /// <summary>
     /// Represents a number that can be expressed as a fraction
diff --git a/src/ImageSharp/MetaData/Profiles/Exif/Rational.cs b/src/ImageSharp/Primitives/Rational.cs
similarity index 99%
rename from src/ImageSharp/MetaData/Profiles/Exif/Rational.cs
rename to src/ImageSharp/Primitives/Rational.cs
index 0f47870d2..6678eb954 100644
--- a/src/ImageSharp/MetaData/Profiles/Exif/Rational.cs
+++ b/src/ImageSharp/Primitives/Rational.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Globalization;
 
-namespace SixLabors.ImageSharp.MetaData.Profiles.Exif
+namespace SixLabors.ImageSharp.Primitives
 {
     /// <summary>
     /// Represents a number that can be expressed as a fraction.
diff --git a/src/ImageSharp/MetaData/Profiles/Exif/SignedRational.cs b/src/ImageSharp/Primitives/SignedRational.cs
similarity index 99%
rename from src/ImageSharp/MetaData/Profiles/Exif/SignedRational.cs
rename to src/ImageSharp/Primitives/SignedRational.cs
index 17f1b568b..c2a7b3e23 100644
--- a/src/ImageSharp/MetaData/Profiles/Exif/SignedRational.cs
+++ b/src/ImageSharp/Primitives/SignedRational.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Globalization;
 
-namespace SixLabors.ImageSharp.MetaData.Profiles.Exif
+namespace SixLabors.ImageSharp.Primitives
 {
     /// <summary>
     /// Represents a number that can be expressed as a fraction.
diff --git a/src/ImageSharp/Processing/Dithering/DiffuseExtensions.cs b/src/ImageSharp/Processing/Dithering/DiffuseExtensions.cs
index 7ae8ec01e..adb678ee4 100644
--- a/src/ImageSharp/Processing/Dithering/DiffuseExtensions.cs
+++ b/src/ImageSharp/Processing/Dithering/DiffuseExtensions.cs
@@ -21,7 +21,7 @@ namespace SixLabors.ImageSharp.Processing.Dithering
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
         public static IImageProcessingContext<TPixel> Diffuse<TPixel>(this IImageProcessingContext<TPixel> source)
             where TPixel : struct, IPixel<TPixel>
-            => Diffuse(source, DiffuseMode.FloydSteinberg, .5F);
+            => Diffuse(source, KnownDiffusers.FloydSteinberg, .5F);
 
         /// <summary>
         /// Dithers the image reducing it to a web-safe palette using error diffusion.
@@ -32,7 +32,7 @@ namespace SixLabors.ImageSharp.Processing.Dithering
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
         public static IImageProcessingContext<TPixel> Diffuse<TPixel>(this IImageProcessingContext<TPixel> source, float threshold)
             where TPixel : struct, IPixel<TPixel>
-            => Diffuse(source, DiffuseMode.FloydSteinberg, threshold);
+            => Diffuse(source, KnownDiffusers.FloydSteinberg, threshold);
 
         /// <summary>
         /// Dithers the image reducing it to a web-safe palette using error diffusion.
diff --git a/src/ImageSharp/Processing/Dithering/DitherExtensions.cs b/src/ImageSharp/Processing/Dithering/DitherExtensions.cs
index 31ef12a0a..48dd87a3b 100644
--- a/src/ImageSharp/Processing/Dithering/DitherExtensions.cs
+++ b/src/ImageSharp/Processing/Dithering/DitherExtensions.cs
@@ -21,7 +21,7 @@ namespace SixLabors.ImageSharp.Processing.Dithering
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
         public static IImageProcessingContext<TPixel> Dither<TPixel>(this IImageProcessingContext<TPixel> source)
             where TPixel : struct, IPixel<TPixel>
-            => Dither(source, DitherMode.BayerDither4x4);
+            => Dither(source, KnownDitherers.BayerDither4x4);
 
         /// <summary>
         /// Dithers the image reducing it to a web-safe palette using ordered dithering.
diff --git a/src/ImageSharp/Processing/Dithering/DiffuseMode.cs b/src/ImageSharp/Processing/Dithering/KnownDiffusers.cs
similarity index 98%
rename from src/ImageSharp/Processing/Dithering/DiffuseMode.cs
rename to src/ImageSharp/Processing/Dithering/KnownDiffusers.cs
index cc74f1230..250a543ec 100644
--- a/src/ImageSharp/Processing/Dithering/DiffuseMode.cs
+++ b/src/ImageSharp/Processing/Dithering/KnownDiffusers.cs
@@ -8,7 +8,7 @@ namespace SixLabors.ImageSharp.Processing.Dithering
     /// <summary>
     /// Contains reusable static instances of known error diffusion algorithms
     /// </summary>
-    public static class DiffuseMode
+    public static class KnownDiffusers
     {
         /// <summary>
         /// Gets the error diffuser that implements the Atkinson algorithm.
diff --git a/src/ImageSharp/Processing/Dithering/DitherMode.cs b/src/ImageSharp/Processing/Dithering/KnownDitherers.cs
similarity index 97%
rename from src/ImageSharp/Processing/Dithering/DitherMode.cs
rename to src/ImageSharp/Processing/Dithering/KnownDitherers.cs
index f5122608c..b268ae12c 100644
--- a/src/ImageSharp/Processing/Dithering/DitherMode.cs
+++ b/src/ImageSharp/Processing/Dithering/KnownDitherers.cs
@@ -8,7 +8,7 @@ namespace SixLabors.ImageSharp.Processing.Dithering
     /// <summary>
     /// Contains reusable static instances of known ordered dither matrices
     /// </summary>
-    public class DitherMode
+    public class KnownDitherers
     {
         /// <summary>
         /// Gets the order ditherer using the 2x2 Bayer dithering matrix
diff --git a/src/ImageSharp/Processing/Filters/ColorBlindnessExtensions.cs b/src/ImageSharp/Processing/Filters/ColorBlindnessExtensions.cs
index b7dc87150..d70064097 100644
--- a/src/ImageSharp/Processing/Filters/ColorBlindnessExtensions.cs
+++ b/src/ImageSharp/Processing/Filters/ColorBlindnessExtensions.cs
@@ -20,7 +20,7 @@ namespace SixLabors.ImageSharp.Processing.Filters
         /// <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{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> ColorBlindness<TPixel>(this IImageProcessingContext<TPixel> source, ColorBlindness colorBlindness)
+        public static IImageProcessingContext<TPixel> ColorBlindness<TPixel>(this IImageProcessingContext<TPixel> source, ColorBlindnessMode colorBlindness)
             where TPixel : struct, IPixel<TPixel>
             => source.ApplyProcessor(GetProcessor<TPixel>(colorBlindness));
 
@@ -29,33 +29,33 @@ namespace SixLabors.ImageSharp.Processing.Filters
         /// </summary>
         /// <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="colorBlindnessMode">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{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> ColorBlindness<TPixel>(this IImageProcessingContext<TPixel> source, ColorBlindness colorBlindness, Rectangle rectangle)
+        public static IImageProcessingContext<TPixel> ColorBlindness<TPixel>(this IImageProcessingContext<TPixel> source, ColorBlindnessMode colorBlindnessMode, Rectangle rectangle)
             where TPixel : struct, IPixel<TPixel>
-            => source.ApplyProcessor(GetProcessor<TPixel>(colorBlindness), rectangle);
+            => source.ApplyProcessor(GetProcessor<TPixel>(colorBlindnessMode), rectangle);
 
-        private static IImageProcessor<TPixel> GetProcessor<TPixel>(ColorBlindness colorBlindness)
+        private static IImageProcessor<TPixel> GetProcessor<TPixel>(ColorBlindnessMode colorBlindness)
             where TPixel : struct, IPixel<TPixel>
         {
             switch (colorBlindness)
             {
-                case Filters.ColorBlindness.Achromatomaly:
+                case ColorBlindnessMode.Achromatomaly:
                     return new AchromatomalyProcessor<TPixel>();
-                case Filters.ColorBlindness.Achromatopsia:
+                case ColorBlindnessMode.Achromatopsia:
                     return new AchromatopsiaProcessor<TPixel>();
-                case Filters.ColorBlindness.Deuteranomaly:
+                case ColorBlindnessMode.Deuteranomaly:
                     return new DeuteranomalyProcessor<TPixel>();
-                case Filters.ColorBlindness.Deuteranopia:
+                case ColorBlindnessMode.Deuteranopia:
                     return new DeuteranopiaProcessor<TPixel>();
-                case Filters.ColorBlindness.Protanomaly:
+                case ColorBlindnessMode.Protanomaly:
                     return new ProtanomalyProcessor<TPixel>();
-                case Filters.ColorBlindness.Protanopia:
+                case ColorBlindnessMode.Protanopia:
                     return new ProtanopiaProcessor<TPixel>();
-                case Filters.ColorBlindness.Tritanomaly:
+                case ColorBlindnessMode.Tritanomaly:
                     return new TritanomalyProcessor<TPixel>();
                 default:
                     return new TritanopiaProcessor<TPixel>();
diff --git a/src/ImageSharp/Processing/Filters/ColorBlindness.cs b/src/ImageSharp/Processing/Filters/ColorBlindnessMode.cs
similarity index 96%
rename from src/ImageSharp/Processing/Filters/ColorBlindness.cs
rename to src/ImageSharp/Processing/Filters/ColorBlindnessMode.cs
index 41d468f34..584c9fa08 100644
--- a/src/ImageSharp/Processing/Filters/ColorBlindness.cs
+++ b/src/ImageSharp/Processing/Filters/ColorBlindnessMode.cs
@@ -6,7 +6,7 @@ namespace SixLabors.ImageSharp.Processing.Filters
     /// <summary>
     /// Enumerates the various types of defined color blindness filters.
     /// </summary>
-    public enum ColorBlindness
+    public enum ColorBlindnessMode
     {
         /// <summary>
         /// Partial color desensitivity.
diff --git a/src/ImageSharp/Processing/Filters/MatrixFilters.cs b/src/ImageSharp/Processing/Filters/KnownFilterMatrices.cs
similarity index 99%
rename from src/ImageSharp/Processing/Filters/MatrixFilters.cs
rename to src/ImageSharp/Processing/Filters/KnownFilterMatrices.cs
index 2f5883fc9..9da4aaa65 100644
--- a/src/ImageSharp/Processing/Filters/MatrixFilters.cs
+++ b/src/ImageSharp/Processing/Filters/KnownFilterMatrices.cs
@@ -9,7 +9,7 @@ namespace SixLabors.ImageSharp.Processing.Filters
     /// <summary>
     /// A collection of known <see cref="Matrix4x4"/> values for composing filters
     /// </summary>
-    public static class MatrixFilters
+    public static class KnownFilterMatrices
     {
         /// <summary>
         /// Gets a filter recreating Achromatomaly (Color desensitivity) color blindness
diff --git a/src/ImageSharp/Processing/Filters/Processors/AchromatomalyProcessor.cs b/src/ImageSharp/Processing/Filters/Processors/AchromatomalyProcessor.cs
index 55c622030..e7238c68c 100644
--- a/src/ImageSharp/Processing/Filters/Processors/AchromatomalyProcessor.cs
+++ b/src/ImageSharp/Processing/Filters/Processors/AchromatomalyProcessor.cs
@@ -16,7 +16,7 @@ namespace SixLabors.ImageSharp.Processing.Filters.Processors
         /// Initializes a new instance of the <see cref="AchromatomalyProcessor{TPixel}"/> class.
         /// </summary>
         public AchromatomalyProcessor()
-            : base(MatrixFilters.AchromatomalyFilter)
+            : base(KnownFilterMatrices.AchromatomalyFilter)
         {
         }
     }
diff --git a/src/ImageSharp/Processing/Filters/Processors/AchromatopsiaProcessor.cs b/src/ImageSharp/Processing/Filters/Processors/AchromatopsiaProcessor.cs
index 95f9e893b..b581f8925 100644
--- a/src/ImageSharp/Processing/Filters/Processors/AchromatopsiaProcessor.cs
+++ b/src/ImageSharp/Processing/Filters/Processors/AchromatopsiaProcessor.cs
@@ -16,7 +16,7 @@ namespace SixLabors.ImageSharp.Processing.Filters.Processors
         /// Initializes a new instance of the <see cref="AchromatopsiaProcessor{TPixel}"/> class.
         /// </summary>
         public AchromatopsiaProcessor()
-            : base(MatrixFilters.AchromatopsiaFilter)
+            : base(KnownFilterMatrices.AchromatopsiaFilter)
         {
         }
     }
diff --git a/src/ImageSharp/Processing/Filters/Processors/BlackWhiteProcessor.cs b/src/ImageSharp/Processing/Filters/Processors/BlackWhiteProcessor.cs
index f6a420257..428b9d4dd 100644
--- a/src/ImageSharp/Processing/Filters/Processors/BlackWhiteProcessor.cs
+++ b/src/ImageSharp/Processing/Filters/Processors/BlackWhiteProcessor.cs
@@ -16,7 +16,7 @@ namespace SixLabors.ImageSharp.Processing.Filters.Processors
         /// Initializes a new instance of the <see cref="BlackWhiteProcessor{TPixel}"/> class.
         /// </summary>
         public BlackWhiteProcessor()
-            : base(MatrixFilters.BlackWhiteFilter)
+            : base(KnownFilterMatrices.BlackWhiteFilter)
         {
         }
     }
diff --git a/src/ImageSharp/Processing/Filters/Processors/BrightnessProcessor.cs b/src/ImageSharp/Processing/Filters/Processors/BrightnessProcessor.cs
index c6f758634..e5c43bd8a 100644
--- a/src/ImageSharp/Processing/Filters/Processors/BrightnessProcessor.cs
+++ b/src/ImageSharp/Processing/Filters/Processors/BrightnessProcessor.cs
@@ -21,7 +21,7 @@ namespace SixLabors.ImageSharp.Processing.Filters.Processors
         /// </remarks>
         /// <param name="amount">The proportion of the conversion. Must be greater than or equal to 0.</param>
         public BrightnessProcessor(float amount)
-            : base(MatrixFilters.CreateBrightnessFilter(amount))
+            : base(KnownFilterMatrices.CreateBrightnessFilter(amount))
         {
             this.Amount = amount;
         }
diff --git a/src/ImageSharp/Processing/Filters/Processors/ContrastProcessor.cs b/src/ImageSharp/Processing/Filters/Processors/ContrastProcessor.cs
index 3a8022703..51f8ba6b1 100644
--- a/src/ImageSharp/Processing/Filters/Processors/ContrastProcessor.cs
+++ b/src/ImageSharp/Processing/Filters/Processors/ContrastProcessor.cs
@@ -21,7 +21,7 @@ namespace SixLabors.ImageSharp.Processing.Filters.Processors
         /// </remarks>
         /// <param name="amount">The proportion of the conversion. Must be greater than or equal to 0.</param>
         public ContrastProcessor(float amount)
-            : base(MatrixFilters.CreateContrastFilter(amount))
+            : base(KnownFilterMatrices.CreateContrastFilter(amount))
         {
             this.Amount = amount;
         }
diff --git a/src/ImageSharp/Processing/Filters/Processors/DeuteranomalyProcessor.cs b/src/ImageSharp/Processing/Filters/Processors/DeuteranomalyProcessor.cs
index 31ea79afe..d93068c8c 100644
--- a/src/ImageSharp/Processing/Filters/Processors/DeuteranomalyProcessor.cs
+++ b/src/ImageSharp/Processing/Filters/Processors/DeuteranomalyProcessor.cs
@@ -16,7 +16,7 @@ namespace SixLabors.ImageSharp.Processing.Filters.Processors
         /// Initializes a new instance of the <see cref="DeuteranomalyProcessor{TPixel}"/> class.
         /// </summary>
         public DeuteranomalyProcessor()
-            : base(MatrixFilters.DeuteranomalyFilter)
+            : base(KnownFilterMatrices.DeuteranomalyFilter)
         {
         }
     }
diff --git a/src/ImageSharp/Processing/Filters/Processors/DeuteranopiaProcessor.cs b/src/ImageSharp/Processing/Filters/Processors/DeuteranopiaProcessor.cs
index 5ed7e8540..4b57a1fa4 100644
--- a/src/ImageSharp/Processing/Filters/Processors/DeuteranopiaProcessor.cs
+++ b/src/ImageSharp/Processing/Filters/Processors/DeuteranopiaProcessor.cs
@@ -16,7 +16,7 @@ namespace SixLabors.ImageSharp.Processing.Filters.Processors
         /// Initializes a new instance of the <see cref="DeuteranopiaProcessor{TPixel}"/> class.
         /// </summary>
         public DeuteranopiaProcessor()
-            : base(MatrixFilters.DeuteranopiaFilter)
+            : base(KnownFilterMatrices.DeuteranopiaFilter)
         {
         }
     }
diff --git a/src/ImageSharp/Processing/Filters/Processors/GrayscaleBt601Processor.cs b/src/ImageSharp/Processing/Filters/Processors/GrayscaleBt601Processor.cs
index fa483752c..b4ea8ac6b 100644
--- a/src/ImageSharp/Processing/Filters/Processors/GrayscaleBt601Processor.cs
+++ b/src/ImageSharp/Processing/Filters/Processors/GrayscaleBt601Processor.cs
@@ -17,7 +17,7 @@ namespace SixLabors.ImageSharp.Processing.Filters.Processors
         /// </summary>
         /// <param name="amount">The proportion of the conversion. Must be between 0 and 1.</param>
         public GrayscaleBt601Processor(float amount)
-            : base(MatrixFilters.CreateGrayscaleBt601Filter(amount))
+            : base(KnownFilterMatrices.CreateGrayscaleBt601Filter(amount))
         {
             this.Amount = amount;
         }
diff --git a/src/ImageSharp/Processing/Filters/Processors/GrayscaleBt709Processor.cs b/src/ImageSharp/Processing/Filters/Processors/GrayscaleBt709Processor.cs
index 396ad7d90..480b134d3 100644
--- a/src/ImageSharp/Processing/Filters/Processors/GrayscaleBt709Processor.cs
+++ b/src/ImageSharp/Processing/Filters/Processors/GrayscaleBt709Processor.cs
@@ -17,7 +17,7 @@ namespace SixLabors.ImageSharp.Processing.Filters.Processors
         /// </summary>
         /// <param name="amount">The proportion of the conversion. Must be between 0 and 1.</param>
         public GrayscaleBt709Processor(float amount)
-            : base(MatrixFilters.CreateGrayscaleBt709Filter(amount))
+            : base(KnownFilterMatrices.CreateGrayscaleBt709Filter(amount))
         {
             this.Amount = amount;
         }
diff --git a/src/ImageSharp/Processing/Filters/Processors/HueProcessor.cs b/src/ImageSharp/Processing/Filters/Processors/HueProcessor.cs
index 31adf2125..95ae98e78 100644
--- a/src/ImageSharp/Processing/Filters/Processors/HueProcessor.cs
+++ b/src/ImageSharp/Processing/Filters/Processors/HueProcessor.cs
@@ -16,7 +16,7 @@ namespace SixLabors.ImageSharp.Processing.Filters.Processors
         /// </summary>
         /// <param name="degrees">The angle of rotation in degrees</param>
         public HueProcessor(float degrees)
-            : base(MatrixFilters.CreateHueFilter(degrees))
+            : base(KnownFilterMatrices.CreateHueFilter(degrees))
         {
             this.Degrees = degrees;
         }
diff --git a/src/ImageSharp/Processing/Filters/Processors/InvertProcessor.cs b/src/ImageSharp/Processing/Filters/Processors/InvertProcessor.cs
index e5175ca69..7b8ed2a03 100644
--- a/src/ImageSharp/Processing/Filters/Processors/InvertProcessor.cs
+++ b/src/ImageSharp/Processing/Filters/Processors/InvertProcessor.cs
@@ -17,7 +17,7 @@ namespace SixLabors.ImageSharp.Processing.Filters.Processors
         /// </summary>
         /// <param name="amount">The proportion of the conversion. Must be between 0 and 1.</param>
         public InvertProcessor(float amount)
-            : base(MatrixFilters.CreateInvertFilter(amount))
+            : base(KnownFilterMatrices.CreateInvertFilter(amount))
         {
             this.Amount = amount;
         }
diff --git a/src/ImageSharp/Processing/Filters/Processors/KodachromeProcessor.cs b/src/ImageSharp/Processing/Filters/Processors/KodachromeProcessor.cs
index 19f55507c..cc3fa42f6 100644
--- a/src/ImageSharp/Processing/Filters/Processors/KodachromeProcessor.cs
+++ b/src/ImageSharp/Processing/Filters/Processors/KodachromeProcessor.cs
@@ -16,7 +16,7 @@ namespace SixLabors.ImageSharp.Processing.Filters.Processors
         /// Initializes a new instance of the <see cref="KodachromeProcessor{TPixel}"/> class.
         /// </summary>
         public KodachromeProcessor()
-            : base(MatrixFilters.KodachromeFilter)
+            : base(KnownFilterMatrices.KodachromeFilter)
         {
         }
     }
diff --git a/src/ImageSharp/Processing/Filters/Processors/LomographProcessor.cs b/src/ImageSharp/Processing/Filters/Processors/LomographProcessor.cs
index 5e3d73fd1..d97bf57dd 100644
--- a/src/ImageSharp/Processing/Filters/Processors/LomographProcessor.cs
+++ b/src/ImageSharp/Processing/Filters/Processors/LomographProcessor.cs
@@ -20,7 +20,7 @@ namespace SixLabors.ImageSharp.Processing.Filters.Processors
         /// Initializes a new instance of the <see cref="LomographProcessor{TPixel}" /> class.
         /// </summary>
         public LomographProcessor()
-            : base(MatrixFilters.LomographFilter)
+            : base(KnownFilterMatrices.LomographFilter)
         {
         }
 
diff --git a/src/ImageSharp/Processing/Filters/Processors/OpacityProcessor.cs b/src/ImageSharp/Processing/Filters/Processors/OpacityProcessor.cs
index db9af9546..f50d27ae0 100644
--- a/src/ImageSharp/Processing/Filters/Processors/OpacityProcessor.cs
+++ b/src/ImageSharp/Processing/Filters/Processors/OpacityProcessor.cs
@@ -17,7 +17,7 @@ namespace SixLabors.ImageSharp.Processing.Filters.Processors
         /// </summary>
         /// <param name="amount">The proportion of the conversion. Must be between 0 and 1.</param>
         public OpacityProcessor(float amount)
-            : base(MatrixFilters.CreateOpacityFilter(amount))
+            : base(KnownFilterMatrices.CreateOpacityFilter(amount))
         {
             this.Amount = amount;
         }
diff --git a/src/ImageSharp/Processing/Filters/Processors/PolaroidProcessor.cs b/src/ImageSharp/Processing/Filters/Processors/PolaroidProcessor.cs
index 0e90efc7e..b6aa56223 100644
--- a/src/ImageSharp/Processing/Filters/Processors/PolaroidProcessor.cs
+++ b/src/ImageSharp/Processing/Filters/Processors/PolaroidProcessor.cs
@@ -21,7 +21,7 @@ namespace SixLabors.ImageSharp.Processing.Filters.Processors
         /// Initializes a new instance of the <see cref="PolaroidProcessor{TPixel}" /> class.
         /// </summary>
         public PolaroidProcessor()
-            : base(MatrixFilters.PolaroidFilter)
+            : base(KnownFilterMatrices.PolaroidFilter)
         {
         }
 
diff --git a/src/ImageSharp/Processing/Filters/Processors/ProtanomalyProcessor.cs b/src/ImageSharp/Processing/Filters/Processors/ProtanomalyProcessor.cs
index 480139122..88e2ee3c3 100644
--- a/src/ImageSharp/Processing/Filters/Processors/ProtanomalyProcessor.cs
+++ b/src/ImageSharp/Processing/Filters/Processors/ProtanomalyProcessor.cs
@@ -16,7 +16,7 @@ namespace SixLabors.ImageSharp.Processing.Filters.Processors
         /// Initializes a new instance of the <see cref="ProtanomalyProcessor{TPixel}"/> class.
         /// </summary>
         public ProtanomalyProcessor()
-            : base(MatrixFilters.ProtanomalyFilter)
+            : base(KnownFilterMatrices.ProtanomalyFilter)
         {
         }
     }
diff --git a/src/ImageSharp/Processing/Filters/Processors/ProtanopiaProcessor.cs b/src/ImageSharp/Processing/Filters/Processors/ProtanopiaProcessor.cs
index 43f1c14ea..17020bbe2 100644
--- a/src/ImageSharp/Processing/Filters/Processors/ProtanopiaProcessor.cs
+++ b/src/ImageSharp/Processing/Filters/Processors/ProtanopiaProcessor.cs
@@ -16,7 +16,7 @@ namespace SixLabors.ImageSharp.Processing.Filters.Processors
         /// Initializes a new instance of the <see cref="ProtanopiaProcessor{TPixel}"/> class.
         /// </summary>
         public ProtanopiaProcessor()
-            : base(MatrixFilters.ProtanopiaFilter)
+            : base(KnownFilterMatrices.ProtanopiaFilter)
         {
         }
     }
diff --git a/src/ImageSharp/Processing/Filters/Processors/SaturateProcessor.cs b/src/ImageSharp/Processing/Filters/Processors/SaturateProcessor.cs
index 9a48cb2b5..d4b28a894 100644
--- a/src/ImageSharp/Processing/Filters/Processors/SaturateProcessor.cs
+++ b/src/ImageSharp/Processing/Filters/Processors/SaturateProcessor.cs
@@ -21,7 +21,7 @@ namespace SixLabors.ImageSharp.Processing.Filters.Processors
         /// </remarks>
         /// <param name="amount">The proportion of the conversion. Must be greater than or equal to 0.</param>
         public SaturateProcessor(float amount)
-            : base(MatrixFilters.CreateSaturateFilter(amount))
+            : base(KnownFilterMatrices.CreateSaturateFilter(amount))
         {
             this.Amount = amount;
         }
diff --git a/src/ImageSharp/Processing/Filters/Processors/SepiaProcessor.cs b/src/ImageSharp/Processing/Filters/Processors/SepiaProcessor.cs
index 2b3bf105b..7295cee99 100644
--- a/src/ImageSharp/Processing/Filters/Processors/SepiaProcessor.cs
+++ b/src/ImageSharp/Processing/Filters/Processors/SepiaProcessor.cs
@@ -17,7 +17,7 @@ namespace SixLabors.ImageSharp.Processing.Filters.Processors
         /// </summary>
         /// <param name="amount">The proportion of the conversion. Must be between 0 and 1.</param>
         public SepiaProcessor(float amount)
-            : base(MatrixFilters.CreateSepiaFilter(amount))
+            : base(KnownFilterMatrices.CreateSepiaFilter(amount))
         {
             this.Amount = amount;
         }
diff --git a/src/ImageSharp/Processing/Filters/Processors/TritanomalyProcessor.cs b/src/ImageSharp/Processing/Filters/Processors/TritanomalyProcessor.cs
index cd2e38217..6991506e6 100644
--- a/src/ImageSharp/Processing/Filters/Processors/TritanomalyProcessor.cs
+++ b/src/ImageSharp/Processing/Filters/Processors/TritanomalyProcessor.cs
@@ -16,7 +16,7 @@ namespace SixLabors.ImageSharp.Processing.Filters.Processors
         /// Initializes a new instance of the <see cref="TritanomalyProcessor{TPixel}"/> class.
         /// </summary>
         public TritanomalyProcessor()
-            : base(MatrixFilters.TritanomalyFilter)
+            : base(KnownFilterMatrices.TritanomalyFilter)
         {
         }
     }
diff --git a/src/ImageSharp/Processing/Filters/Processors/TritanopiaProcessor.cs b/src/ImageSharp/Processing/Filters/Processors/TritanopiaProcessor.cs
index ce4a079a2..95c6cb542 100644
--- a/src/ImageSharp/Processing/Filters/Processors/TritanopiaProcessor.cs
+++ b/src/ImageSharp/Processing/Filters/Processors/TritanopiaProcessor.cs
@@ -16,7 +16,7 @@ namespace SixLabors.ImageSharp.Processing.Filters.Processors
         /// Initializes a new instance of the <see cref="TritanopiaProcessor{TPixel}"/> class.
         /// </summary>
         public TritanopiaProcessor()
-            : base(MatrixFilters.TritanopiaFilter)
+            : base(KnownFilterMatrices.TritanopiaFilter)
         {
         }
     }
diff --git a/src/ImageSharp/Processing/Quantization/Box.cs b/src/ImageSharp/Processing/Quantization/Box.cs
deleted file mode 100644
index e6e1166f8..000000000
--- a/src/ImageSharp/Processing/Quantization/Box.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright (c) Six Labors and contributors.
-// Licensed under the Apache License, Version 2.0.
-
-namespace SixLabors.ImageSharp.Processing.Quantization
-{
-    /// <summary>
-    /// Represents a box color cube.
-    /// </summary>
-    internal struct Box
-    {
-        /// <summary>
-        /// Gets or sets the min red value, exclusive.
-        /// </summary>
-        public int R0 { get; set; }
-
-        /// <summary>
-        /// Gets or sets the max red value, inclusive.
-        /// </summary>
-        public int R1 { get; set; }
-
-        /// <summary>
-        /// Gets or sets the min green value, exclusive.
-        /// </summary>
-        public int G0 { get; set; }
-
-        /// <summary>
-        /// Gets or sets the max green value, inclusive.
-        /// </summary>
-        public int G1 { get; set; }
-
-        /// <summary>
-        /// Gets or sets the min blue value, exclusive.
-        /// </summary>
-        public int B0 { get; set; }
-
-        /// <summary>
-        /// Gets or sets the max blue value, inclusive.
-        /// </summary>
-        public int B1 { get; set; }
-
-        /// <summary>
-        /// Gets or sets the min alpha value, exclusive.
-        /// </summary>
-        public int A0 { get; set; }
-
-        /// <summary>
-        /// Gets or sets the max alpha value, inclusive.
-        /// </summary>
-        public int A1 { get; set; }
-
-        /// <summary>
-        /// Gets or sets the volume.
-        /// </summary>
-        public int Volume { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp/Processing/Quantization/QuantizerBase{TPixel}.cs b/src/ImageSharp/Processing/Quantization/FrameQuantizers/FrameQuantizerBase{TPixel}.cs
similarity index 82%
rename from src/ImageSharp/Processing/Quantization/QuantizerBase{TPixel}.cs
rename to src/ImageSharp/Processing/Quantization/FrameQuantizers/FrameQuantizerBase{TPixel}.cs
index 96763195d..bf0d80b07 100644
--- a/src/ImageSharp/Processing/Quantization/QuantizerBase{TPixel}.cs
+++ b/src/ImageSharp/Processing/Quantization/FrameQuantizers/FrameQuantizerBase{TPixel}.cs
@@ -6,16 +6,15 @@ using System.Collections.Generic;
 using System.Numerics;
 using System.Runtime.CompilerServices;
 using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Dithering;
 using SixLabors.ImageSharp.Processing.Dithering.ErrorDiffusion;
 
-namespace SixLabors.ImageSharp.Processing.Quantization
+namespace SixLabors.ImageSharp.Processing.Quantization.FrameQuantizers
 {
     /// <summary>
-    /// Encapsulates methods to calculate the color palette of an image.
+    /// The base class for all <see cref="IFrameQuantizer{TPixel}"/> implementations
     /// </summary>
     /// <typeparam name="TPixel">The pixel format.</typeparam>
-    public abstract class QuantizerBase<TPixel> : IQuantizer<TPixel>
+    public abstract class FrameQuantizerBase<TPixel> : IFrameQuantizer<TPixel>
         where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
@@ -24,29 +23,35 @@ namespace SixLabors.ImageSharp.Processing.Quantization
         private readonly bool singlePass;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="QuantizerBase{TPixel}"/> class.
+        /// Initializes a new instance of the <see cref="FrameQuantizerBase{TPixel}"/> class.
         /// </summary>
+        /// <param name="quantizer">The quantizer</param>
         /// <param name="singlePass">
-        /// If true, the quantization only needs to loop through the source pixels once
+        /// If true, the quantization process only needs to loop through the source pixels once
         /// </param>
         /// <remarks>
         /// If you construct this class with a true value for singlePass, then the code will, when quantizing your image,
-        /// only call the 'QuantizeImage' function. If two passes are required, the code will call 'InitialQuantizeImage'
+        /// only call the <see cref="FirstPass(ImageFrame{TPixel}, int, int)"/> methods.
+        /// If two passes are required, the code will also call <see cref="SecondPass(ImageFrame{TPixel}, byte[], int, int)"/>
         /// and then 'QuantizeImage'.
         /// </remarks>
-        protected QuantizerBase(bool singlePass)
+        protected FrameQuantizerBase(IQuantizer quantizer, bool singlePass)
         {
+            Guard.NotNull(quantizer, nameof(quantizer));
+
+            this.Diffuser = quantizer.Diffuser;
+            this.Dither = this.Diffuser != null;
             this.singlePass = singlePass;
         }
 
         /// <inheritdoc />
-        public bool Dither { get; set; } = true;
+        public bool Dither { get; }
 
         /// <inheritdoc />
-        public IErrorDiffuser DitherType { get; set; } = DiffuseMode.FloydSteinberg;
+        public IErrorDiffuser Diffuser { get; }
 
         /// <inheritdoc/>
-        public virtual QuantizedFrame<TPixel> Quantize(ImageFrame<TPixel> image, int maxColors)
+        public virtual QuantizedFrame<TPixel> QuantizeFrame(ImageFrame<TPixel> image)
         {
             Guard.NotNull(image, nameof(image));
 
diff --git a/src/ImageSharp/Processing/Quantization/FrameQuantizers/IFrameQuantizer{TPixel}.cs b/src/ImageSharp/Processing/Quantization/FrameQuantizers/IFrameQuantizer{TPixel}.cs
new file mode 100644
index 000000000..435302bd3
--- /dev/null
+++ b/src/ImageSharp/Processing/Quantization/FrameQuantizers/IFrameQuantizer{TPixel}.cs
@@ -0,0 +1,35 @@
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.ImageSharp.Processing.Dithering.ErrorDiffusion;
+
+namespace SixLabors.ImageSharp.Processing.Quantization.FrameQuantizers
+{
+    /// <summary>
+    /// Provides methods to allow the execution of the quantization process on an image frame.
+    /// </summary>
+    /// <typeparam name="TPixel">The pixel format.</typeparam>
+    public interface IFrameQuantizer<TPixel>
+        where TPixel : struct, IPixel<TPixel>
+    {
+        /// <summary>
+        /// Gets a value indicating whether to apply dithering to the output image.
+        /// </summary>
+        bool Dither { get; }
+
+        /// <summary>
+        /// Gets the error diffusion algorithm to apply to the output image.
+        /// </summary>
+        IErrorDiffuser Diffuser { get; }
+
+        /// <summary>
+        /// Quantize an image frame and return the resulting output pixels.
+        /// </summary>
+        /// <param name="image">The image to quantize.</param>
+        /// <returns>
+        /// A <see cref="QuantizedFrame{TPixel}"/> representing a quantized version of the image pixels.
+        /// </returns>
+        QuantizedFrame<TPixel> QuantizeFrame(ImageFrame<TPixel> image);
+    }
+}
\ No newline at end of file
diff --git a/src/ImageSharp/Processing/Quantization/OctreeQuantizer{TPixel}.cs b/src/ImageSharp/Processing/Quantization/FrameQuantizers/OctreeFrameQuantizer{TPixel}.cs
similarity index 96%
rename from src/ImageSharp/Processing/Quantization/OctreeQuantizer{TPixel}.cs
rename to src/ImageSharp/Processing/Quantization/FrameQuantizers/OctreeFrameQuantizer{TPixel}.cs
index 5d8104937..431064f22 100644
--- a/src/ImageSharp/Processing/Quantization/OctreeQuantizer{TPixel}.cs
+++ b/src/ImageSharp/Processing/Quantization/FrameQuantizers/OctreeFrameQuantizer{TPixel}.cs
@@ -8,14 +8,14 @@ using System.Runtime.InteropServices;
 using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Processing.Quantization
+namespace SixLabors.ImageSharp.Processing.Quantization.FrameQuantizers
 {
     /// <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="TPixel">The pixel format.</typeparam>
-    public sealed class OctreeQuantizer<TPixel> : QuantizerBase<TPixel>
+    internal sealed class OctreeFrameQuantizer<TPixel> : FrameQuantizerBase<TPixel>
         where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
@@ -24,14 +24,14 @@ namespace SixLabors.ImageSharp.Processing.Quantization
         private readonly Dictionary<TPixel, byte> colorMap = new Dictionary<TPixel, byte>();
 
         /// <summary>
-        /// Stores the tree
+        /// Maximum allowed color depth
         /// </summary>
-        private Octree octree;
+        private readonly byte colors;
 
         /// <summary>
-        /// Maximum allowed color depth
+        /// Stores the tree
         /// </summary>
-        private byte colors;
+        private readonly Octree octree;
 
         /// <summary>
         /// The reduced image palette
@@ -44,26 +44,18 @@ namespace SixLabors.ImageSharp.Processing.Quantization
         private byte transparentIndex;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="OctreeQuantizer{TPixel}"/> class.
+        /// Initializes a new instance of the <see cref="OctreeFrameQuantizer{TPixel}"/> class.
         /// </summary>
+        /// <param name="quantizer">The octree quantizer</param>
         /// <remarks>
         /// The Octree quantizer is a two pass algorithm. The initial pass sets up the Octree,
         /// the second pass quantizes a color based on the nodes in the tree
         /// </remarks>
-        public OctreeQuantizer()
-            : base(false)
+        public OctreeFrameQuantizer(OctreeQuantizer quantizer)
+            : base(quantizer, false)
         {
-        }
-
-        /// <inheritdoc/>
-        public override QuantizedFrame<TPixel> Quantize(ImageFrame<TPixel> image, int maxColors)
-        {
-            this.colors = (byte)maxColors.Clamp(1, 255);
+            this.colors = (byte)quantizer.MaxColors;
             this.octree = new Octree(this.GetBitsNeededForColorDepth(this.colors));
-            this.palette = null;
-            this.colorMap.Clear();
-
-            return base.Quantize(image, this.colors);
         }
 
         /// <inheritdoc/>
@@ -129,7 +121,7 @@ namespace SixLabors.ImageSharp.Processing.Quantization
                     if (this.Dither)
                     {
                         // Apply the dithering matrix. We have to reapply the value now as the original has changed.
-                        this.DitherType.Dither(source, sourcePixel, transformedPixel, x, y, 0, 0, width, height);
+                        this.Diffuser.Dither(source, sourcePixel, transformedPixel, x, y, 0, 0, width, height);
                     }
 
                     output[(y * source.Width) + x] = pixelValue;
@@ -322,7 +314,7 @@ namespace SixLabors.ImageSharp.Processing.Quantization
                 }
 
                 // Now palletize the nodes
-                TPixel[] palette = new TPixel[colorCount + 1];
+                var palette = new TPixel[colorCount + 1];
 
                 int paletteIndex = 0;
                 this.root.ConstructPalette(palette, ref paletteIndex);
diff --git a/src/ImageSharp/Processing/Quantization/PaletteQuantizer{TPixel}.cs b/src/ImageSharp/Processing/Quantization/FrameQuantizers/PaletteFrameQuantizer{TPixel}.cs
similarity index 74%
rename from src/ImageSharp/Processing/Quantization/PaletteQuantizer{TPixel}.cs
rename to src/ImageSharp/Processing/Quantization/FrameQuantizers/PaletteFrameQuantizer{TPixel}.cs
index 8955e14dd..b3a3eee63 100644
--- a/src/ImageSharp/Processing/Quantization/PaletteQuantizer{TPixel}.cs
+++ b/src/ImageSharp/Processing/Quantization/FrameQuantizers/PaletteFrameQuantizer{TPixel}.cs
@@ -7,15 +7,14 @@ using System.Runtime.CompilerServices;
 using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Processing.Quantization
+namespace SixLabors.ImageSharp.Processing.Quantization.FrameQuantizers
 {
     /// <summary>
     /// Encapsulates methods to create a quantized image based upon the given palette.
-    /// If no palette is given this will default to the web safe colors defined in the CSS Color Module Level 4.
     /// <see href="http://msdn.microsoft.com/en-us/library/aa479306.aspx"/>
     /// </summary>
     /// <typeparam name="TPixel">The pixel format.</typeparam>
-    public sealed class PaletteQuantizer<TPixel> : QuantizerBase<TPixel>
+    internal sealed class PaletteFrameQuantizer<TPixel> : FrameQuantizerBase<TPixel>
         where TPixel : struct, IPixel<TPixel>
     {
         /// <summary>
@@ -26,33 +25,16 @@ namespace SixLabors.ImageSharp.Processing.Quantization
         /// <summary>
         /// List of all colors in the palette
         /// </summary>
-        private TPixel[] colors;
+        private readonly TPixel[] colors;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="PaletteQuantizer{TPixel}"/> class.
+        /// Initializes a new instance of the <see cref="PaletteFrameQuantizer{TPixel}"/> class.
         /// </summary>
-        public PaletteQuantizer()
-            : this(NamedColors<TPixel>.WebSafePalette)
+        /// <param name="quantizer">The palette quantizer</param>
+        public PaletteFrameQuantizer(PaletteQuantizer quantizer)
+            : base(quantizer, true)
         {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PaletteQuantizer{TPixel}"/> class.
-        /// </summary>
-        /// <param name="palette">The palette to select substitute colors from.</param>
-        public PaletteQuantizer(TPixel[] palette = null)
-            : base(true)
-        {
-            Guard.NotNull(palette, nameof(palette));
-            this.colors = palette;
-        }
-
-        /// <inheritdoc/>
-        public override QuantizedFrame<TPixel> Quantize(ImageFrame<TPixel> image, int maxColors)
-        {
-            Array.Resize(ref this.colors, maxColors.Clamp(1, 255));
-            this.colorMap.Clear();
-            return base.Quantize(image, maxColors);
+            this.colors = quantizer.GetPalette<TPixel>();
         }
 
         /// <inheritdoc/>
@@ -95,7 +77,7 @@ namespace SixLabors.ImageSharp.Processing.Quantization
                     if (this.Dither)
                     {
                         // Apply the dithering matrix. We have to reapply the value now as the original has changed.
-                        this.DitherType.Dither(source, sourcePixel, transformedPixel, x, y, 0, 0, width, height);
+                        this.Diffuser.Dither(source, sourcePixel, transformedPixel, x, y, 0, 0, width, height);
                     }
 
                     output[(y * source.Width) + x] = pixelValue;
diff --git a/src/ImageSharp/Processing/Quantization/WuQuantizer{TPixel}.cs b/src/ImageSharp/Processing/Quantization/FrameQuantizers/WuFrameQuantizer{TPixel}.cs
similarity index 94%
rename from src/ImageSharp/Processing/Quantization/WuQuantizer{TPixel}.cs
rename to src/ImageSharp/Processing/Quantization/FrameQuantizers/WuFrameQuantizer{TPixel}.cs
index 0c2371cf3..fbc40dc8a 100644
--- a/src/ImageSharp/Processing/Quantization/WuQuantizer{TPixel}.cs
+++ b/src/ImageSharp/Processing/Quantization/FrameQuantizers/WuFrameQuantizer{TPixel}.cs
@@ -10,7 +10,7 @@ using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Processing.Quantization
+namespace SixLabors.ImageSharp.Processing.Quantization.FrameQuantizers
 {
     /// <summary>
     /// An implementation of Wu's color quantizer with alpha channel.
@@ -32,10 +32,10 @@ namespace SixLabors.ImageSharp.Processing.Quantization
     /// </para>
     /// </remarks>
     /// <typeparam name="TPixel">The pixel format.</typeparam>
-    public class WuQuantizer<TPixel> : QuantizerBase<TPixel>
+    internal sealed class WuFrameQuantizer<TPixel> : FrameQuantizerBase<TPixel>
         where TPixel : struct, IPixel<TPixel>
     {
-        // TODO: The WuQuantizer<TPixel> code is rising several questions:
+        // TODO: The WuFrameQuantizer<TPixel> code is rising several questions:
         // - Do we really need to ALWAYS allocate the whole table of size TableLength? (~ 2471625 * sizeof(long) * 5 bytes )
         // - Isn't an AOS ("array of structures") layout more efficient & more readable than SOA ("structure of arrays") for this particular use case?
         //   (T, R, G, B, A, M2) could be grouped together!
@@ -124,26 +124,23 @@ namespace SixLabors.ImageSharp.Processing.Quantization
         private Box[] colorCube;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="WuQuantizer{TPixel}"/> class.
+        /// Initializes a new instance of the <see cref="WuFrameQuantizer{TPixel}"/> class.
         /// </summary>
+        /// <param name="quantizer">The wu quantizer</param>
         /// <remarks>
         /// The Wu quantizer is a two pass algorithm. The initial pass sets up the 3-D color histogram,
         /// the second pass quantizes a color based on the position in the histogram.
         /// </remarks>
-        public WuQuantizer()
-            : base(false)
+        public WuFrameQuantizer(WuQuantizer quantizer)
+            : base(quantizer, false)
         {
+            this.colors = quantizer.MaxColors;
         }
 
         /// <inheritdoc/>
-        public override QuantizedFrame<TPixel> Quantize(ImageFrame<TPixel> image, int maxColors)
+        public override QuantizedFrame<TPixel> QuantizeFrame(ImageFrame<TPixel> image)
         {
             Guard.NotNull(image, nameof(image));
-
-            this.colors = maxColors.Clamp(1, 255);
-            this.palette = null;
-            this.colorMap.Clear();
-
             MemoryManager memoryManager = image.MemoryManager;
 
             try
@@ -156,7 +153,7 @@ namespace SixLabors.ImageSharp.Processing.Quantization
                 this.m2 = memoryManager.AllocateClean<float>(TableLength);
                 this.tag = memoryManager.AllocateClean<byte>(TableLength);
 
-                return base.Quantize(image, this.colors);
+                return base.QuantizeFrame(image);
             }
             finally
             {
@@ -293,7 +290,7 @@ namespace SixLabors.ImageSharp.Processing.Quantization
                     if (this.Dither)
                     {
                         // Apply the dithering matrix. We have to reapply the value now as the original has changed.
-                        this.DitherType.Dither(source, sourcePixel, transformedPixel, x, y, 0, 0, width, height);
+                        this.Diffuser.Dither(source, sourcePixel, transformedPixel, x, y, 0, 0, width, height);
                     }
 
                     output[(y * source.Width) + x] = pixelValue;
@@ -873,5 +870,56 @@ namespace SixLabors.ImageSharp.Processing.Quantization
 
             return tagSpan[GetPaletteIndex(r + 1, g + 1, b + 1, a + 1)];
         }
+
+        /// <summary>
+        /// Represents a box color cube.
+        /// </summary>
+        private struct Box
+        {
+            /// <summary>
+            /// Gets or sets the min red value, exclusive.
+            /// </summary>
+            public int R0;
+
+            /// <summary>
+            /// Gets or sets the max red value, inclusive.
+            /// </summary>
+            public int R1;
+
+            /// <summary>
+            /// Gets or sets the min green value, exclusive.
+            /// </summary>
+            public int G0;
+
+            /// <summary>
+            /// Gets or sets the max green value, inclusive.
+            /// </summary>
+            public int G1;
+
+            /// <summary>
+            /// Gets or sets the min blue value, exclusive.
+            /// </summary>
+            public int B0;
+
+            /// <summary>
+            /// Gets or sets the max blue value, inclusive.
+            /// </summary>
+            public int B1;
+
+            /// <summary>
+            /// Gets or sets the min alpha value, exclusive.
+            /// </summary>
+            public int A0;
+
+            /// <summary>
+            /// Gets or sets the max alpha value, inclusive.
+            /// </summary>
+            public int A1;
+
+            /// <summary>
+            /// Gets or sets the volume.
+            /// </summary>
+            public int Volume;
+        }
     }
 }
\ No newline at end of file
diff --git a/src/ImageSharp/Processing/Quantization/IQuantizer.cs b/src/ImageSharp/Processing/Quantization/IQuantizer.cs
new file mode 100644
index 000000000..e00b865ac
--- /dev/null
+++ b/src/ImageSharp/Processing/Quantization/IQuantizer.cs
@@ -0,0 +1,28 @@
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.ImageSharp.Processing.Dithering.ErrorDiffusion;
+using SixLabors.ImageSharp.Processing.Quantization.FrameQuantizers;
+
+namespace SixLabors.ImageSharp.Processing.Quantization
+{
+    /// <summary>
+    /// Provides methods for allowing quantization of images pixels with configurable dithering.
+    /// </summary>
+    public interface IQuantizer
+    {
+        /// <summary>
+        /// Gets the error diffusion algorithm to apply to the output image.
+        /// </summary>
+        IErrorDiffuser Diffuser { get; }
+
+        /// <summary>
+        /// Creates the generic frame quantizer
+        /// </summary>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
+        /// <returns>The <see cref="IFrameQuantizer{TPixel}"/></returns>
+        IFrameQuantizer<TPixel> CreateFrameQuantizer<TPixel>()
+            where TPixel : struct, IPixel<TPixel>;
+    }
+}
\ No newline at end of file
diff --git a/src/ImageSharp/Processing/Quantization/IQuantizer{TPixel}.cs b/src/ImageSharp/Processing/Quantization/IQuantizer{TPixel}.cs
deleted file mode 100644
index 841b84496..000000000
--- a/src/ImageSharp/Processing/Quantization/IQuantizer{TPixel}.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright (c) Six Labors and contributors.
-// Licensed under the Apache License, Version 2.0.
-
-using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing.Dithering.ErrorDiffusion;
-
-namespace SixLabors.ImageSharp.Processing.Quantization
-{
-    /// <summary>
-    /// Provides methods for for allowing quantization of images pixels with configurable dithering.
-    /// </summary>
-    /// <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.
-        /// </summary>
-        /// <param name="image">The image to quantize.</param>
-        /// <param name="maxColors">The maximum number of colors to return.</param>
-        /// <returns>
-        /// A <see cref="T:QuantizedImage"/> representing a quantized version of the image pixels.
-        /// </returns>
-        QuantizedFrame<TPixel> Quantize(ImageFrame<TPixel> image, int maxColors);
-    }
-
-    /// <summary>
-    /// Provides methods for allowing quantization of images pixels with configurable dithering.
-    /// </summary>
-    public interface IQuantizer
-    {
-        /// <summary>
-        /// Gets or sets a value indicating whether to apply dithering to the output image.
-        /// </summary>
-        bool Dither { get; set; }
-
-        /// <summary>
-        /// Gets or sets the dithering algorithm to apply to the output image.
-        /// </summary>
-        IErrorDiffuser DitherType { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp/Processing/Quantization/KnownQuantizers.cs b/src/ImageSharp/Processing/Quantization/KnownQuantizers.cs
new file mode 100644
index 000000000..357cd5676
--- /dev/null
+++ b/src/ImageSharp/Processing/Quantization/KnownQuantizers.cs
@@ -0,0 +1,29 @@
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+namespace SixLabors.ImageSharp.Processing.Quantization
+{
+    /// <summary>
+    /// Contains reusable static instances of known quantizing algorithms
+    /// </summary>
+    public static class KnownQuantizers
+    {
+        /// <summary>
+        /// Gets the adaptive Octree quantizer. Fast with good quality.
+        /// The quantizer only supports a single alpha value.
+        /// </summary>
+        public static IQuantizer Octree { get; } = new OctreeQuantizer();
+
+        /// <summary>
+        /// Gets the Xiaolin Wu's Color Quantizer which generates high quality output.
+        /// The quantizer supports multiple alpha values.
+        /// </summary>
+        public static IQuantizer Wu { get; } = new WuQuantizer();
+
+        /// <summary>
+        /// Gets the palette based, Using the collection of web-safe colors.
+        /// The quantizer supports multiple alpha values.
+        /// </summary>
+        public static IQuantizer Palette { get; } = new PaletteQuantizer();
+    }
+}
\ No newline at end of file
diff --git a/src/ImageSharp/Processing/Quantization/OctreeQuantizer.cs b/src/ImageSharp/Processing/Quantization/OctreeQuantizer.cs
new file mode 100644
index 000000000..385ddceec
--- /dev/null
+++ b/src/ImageSharp/Processing/Quantization/OctreeQuantizer.cs
@@ -0,0 +1,83 @@
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.ImageSharp.Processing.Dithering;
+using SixLabors.ImageSharp.Processing.Dithering.ErrorDiffusion;
+using SixLabors.ImageSharp.Processing.Quantization.FrameQuantizers;
+
+namespace SixLabors.ImageSharp.Processing.Quantization
+{
+    /// <summary>
+    /// Allows the quantization of images pixels using Octrees.
+    /// <see href="http://msdn.microsoft.com/en-us/library/aa479306.aspx"/>
+    /// <para>
+    /// By default the quantizer uses <see cref="KnownDiffusers.FloydSteinberg"/> dithering and a color palette of a maximum length of <value>255</value>
+    /// </para>
+    /// </summary>
+    public class OctreeQuantizer : IQuantizer
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="OctreeQuantizer"/> class.
+        /// </summary>
+        public OctreeQuantizer()
+            : this(true)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="OctreeQuantizer"/> class.
+        /// </summary>
+        /// <param name="maxColors">The maximum number of colors to hold in the color palette</param>
+        public OctreeQuantizer(int maxColors)
+            : this(GetDiffuser(true), maxColors)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="OctreeQuantizer"/> class.
+        /// </summary>
+        /// <param name="dither">Whether to apply dithering to the output image</param>
+        public OctreeQuantizer(bool dither)
+            : this(GetDiffuser(dither), 255)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="OctreeQuantizer"/> class.
+        /// </summary>
+        /// <param name="diffuser">The error diffusion algorithm, if any, to apply to the output image</param>
+        public OctreeQuantizer(IErrorDiffuser diffuser)
+            : this(diffuser, 255)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="OctreeQuantizer"/> class.
+        /// </summary>
+        /// <param name="diffuser">The error diffusion algorithm, if any, to apply to the output image</param>
+        /// <param name="maxColors">The maximum number of colors to hold in the color palette</param>
+        public OctreeQuantizer(IErrorDiffuser diffuser, int maxColors)
+        {
+            Guard.MustBeBetweenOrEqualTo(maxColors, 1, 255, nameof(maxColors));
+
+            this.Diffuser = diffuser;
+            this.MaxColors = maxColors;
+        }
+
+        /// <inheritdoc />
+        public IErrorDiffuser Diffuser { get; }
+
+        /// <summary>
+        /// Gets the maximum number of colors to hold in the color palette.
+        /// </summary>
+        public int MaxColors { get; }
+
+        /// <inheritdoc />
+        public IFrameQuantizer<TPixel> CreateFrameQuantizer<TPixel>()
+            where TPixel : struct, IPixel<TPixel>
+            => new OctreeFrameQuantizer<TPixel>(this);
+
+        private static IErrorDiffuser GetDiffuser(bool dither) => dither ? KnownDiffusers.FloydSteinberg : null;
+    }
+}
\ No newline at end of file
diff --git a/src/ImageSharp/Processing/Quantization/PaletteQuantizer.cs b/src/ImageSharp/Processing/Quantization/PaletteQuantizer.cs
new file mode 100644
index 000000000..8f790dfc9
--- /dev/null
+++ b/src/ImageSharp/Processing/Quantization/PaletteQuantizer.cs
@@ -0,0 +1,65 @@
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.ImageSharp.Processing.Dithering;
+using SixLabors.ImageSharp.Processing.Dithering.ErrorDiffusion;
+using SixLabors.ImageSharp.Processing.Quantization.FrameQuantizers;
+
+namespace SixLabors.ImageSharp.Processing.Quantization
+{
+    /// <summary>
+    /// Allows the quantization of images pixels using web safe colors defined in the CSS Color Module Level 4.
+    /// <see href="http://msdn.microsoft.com/en-us/library/aa479306.aspx"/> Override this class to provide your own palette.
+    /// <para>
+    /// By default the quantizer uses <see cref="KnownDiffusers.FloydSteinberg"/> dithering and the <see cref="NamedColors{TPixel}.WebSafePalette"/>
+    /// </para>
+    /// </summary>
+    public class PaletteQuantizer : IQuantizer
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PaletteQuantizer"/> class.
+        /// </summary>
+        public PaletteQuantizer()
+             : this(true)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PaletteQuantizer"/> class.
+        /// </summary>
+        /// <param name="dither">Whether to apply dithering to the output image</param>
+        public PaletteQuantizer(bool dither)
+            : this(GetDiffuser(dither))
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PaletteQuantizer"/> class.
+        /// </summary>
+        /// <param name="diffuser">The error diffusion algorithm, if any, to apply to the output image</param>
+        public PaletteQuantizer(IErrorDiffuser diffuser)
+        {
+            this.Diffuser = diffuser;
+        }
+
+        /// <inheritdoc />
+        public IErrorDiffuser Diffuser { get; }
+
+        /// <summary>
+        /// Gets the palette to use to quantize the image.
+        /// </summary>
+        /// <typeparam name="TPixel">The pixel format.</typeparam>
+        /// <returns>The <see cref="T:TPixel[]"/></returns>
+        public virtual TPixel[] GetPalette<TPixel>()
+            where TPixel : struct, IPixel<TPixel>
+            => NamedColors<TPixel>.WebSafePalette;
+
+        /// <inheritdoc />
+        public IFrameQuantizer<TPixel> CreateFrameQuantizer<TPixel>()
+            where TPixel : struct, IPixel<TPixel>
+            => new PaletteFrameQuantizer<TPixel>(this);
+
+        private static IErrorDiffuser GetDiffuser(bool dither) => dither ? KnownDiffusers.FloydSteinberg : null;
+    }
+}
\ No newline at end of file
diff --git a/src/ImageSharp/Processing/Quantization/Processors/QuantizeProcessor.cs b/src/ImageSharp/Processing/Quantization/Processors/QuantizeProcessor.cs
index e6b109993..951e47127 100644
--- a/src/ImageSharp/Processing/Quantization/Processors/QuantizeProcessor.cs
+++ b/src/ImageSharp/Processing/Quantization/Processors/QuantizeProcessor.cs
@@ -2,16 +2,16 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System;
-using System.Threading.Tasks;
-using SixLabors.ImageSharp.Memory;
+using SixLabors.ImageSharp.Advanced;
 using SixLabors.ImageSharp.PixelFormats;
 using SixLabors.ImageSharp.Processing.Processors;
+using SixLabors.ImageSharp.Processing.Quantization.FrameQuantizers;
 using SixLabors.Primitives;
 
 namespace SixLabors.ImageSharp.Processing.Quantization.Processors
 {
     /// <summary>
-    /// Enables the quantization of images to remove the number of colors used in the image palette.
+    /// Enables the quantization of images to reduce the number of colors used in the image palette.
     /// </summary>
     /// <typeparam name="TPixel">The pixel format.</typeparam>
     internal class QuantizeProcessor<TPixel> : ImageProcessor<TPixel>
@@ -21,51 +21,38 @@ namespace SixLabors.ImageSharp.Processing.Quantization.Processors
         /// Initializes a new instance of the <see cref="QuantizeProcessor{TPixel}"/> class.
         /// </summary>
         /// <param name="quantizer">The quantizer used to reduce the color palette</param>
-        /// <param name="maxColors">The maximum number of colors to reduce the palette to</param>
-        public QuantizeProcessor(IQuantizer<TPixel> quantizer, int maxColors)
+        public QuantizeProcessor(IQuantizer quantizer)
         {
             Guard.NotNull(quantizer, nameof(quantizer));
-            Guard.MustBeGreaterThan(maxColors, 0, nameof(maxColors));
-
             this.Quantizer = quantizer;
-            this.MaxColors = maxColors;
         }
 
         /// <summary>
         /// Gets the quantizer
         /// </summary>
-        public IQuantizer<TPixel> Quantizer { get; }
-
-        /// <summary>
-        /// Gets the maximum number of palette colors
-        /// </summary>
-        public int MaxColors { get; }
+        public IQuantizer Quantizer { get; }
 
         /// <inheritdoc />
         protected override void OnFrameApply(ImageFrame<TPixel> source, Rectangle sourceRectangle, Configuration configuration)
         {
-            QuantizedFrame<TPixel> quantized = this.Quantizer.Quantize(source, this.MaxColors);
+            IFrameQuantizer<TPixel> executor = this.Quantizer.CreateFrameQuantizer<TPixel>();
+            QuantizedFrame<TPixel> quantized = executor.QuantizeFrame(source);
             int paletteCount = quantized.Palette.Length - 1;
 
-            using (Buffer2D<TPixel> pixels = source.MemoryManager.Allocate2D<TPixel>(quantized.Width, quantized.Height))
+            // Not parallel to remove "quantized" closure allocation.
+            // We can operate directly on the source here as we've already read it to get the
+            // quantized result
+            for (int y = 0; y < source.Height; y++)
             {
-                Parallel.For(
-                    0,
-                    pixels.Height,
-                    configuration.ParallelOptions,
-                    y =>
-                        {
-                            Span<TPixel> row = pixels.GetRowSpan(y);
-                            int yy = y * pixels.Width;
-                            for (int x = 0; x < pixels.Width; x++)
-                            {
-                                int i = x + yy;
-                                TPixel color = quantized.Palette[Math.Min(paletteCount, quantized.Pixels[i])];
-                                row[x] = color;
-                            }
-                        });
-
-                Buffer2D<TPixel>.SwapContents(source.PixelBuffer, pixels);
+                Span<TPixel> row = source.GetPixelRowSpan(y);
+                int yy = y * source.Width;
+
+                for (int x = 0; x < source.Width; x++)
+                {
+                    int i = x + yy;
+                    TPixel color = quantized.Palette[Math.Min(paletteCount, quantized.Pixels[i])];
+                    row[x] = color;
+                }
             }
         }
     }
diff --git a/src/ImageSharp/Processing/Quantization/QuantizationMode.cs b/src/ImageSharp/Processing/Quantization/QuantizationMode.cs
deleted file mode 100644
index 69857b384..000000000
--- a/src/ImageSharp/Processing/Quantization/QuantizationMode.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) Six Labors and contributors.
-// Licensed under the Apache License, Version 2.0.
-
-namespace SixLabors.ImageSharp.Processing.Quantization
-{
-    /// <summary>
-    /// Provides enumeration over how an image should be quantized.
-    /// </summary>
-    public enum QuantizationMode
-    {
-        /// <summary>
-        /// An adaptive Octree quantizer. Fast with good quality.
-        /// The quantizer only supports a single alpha value.
-        /// </summary>
-        Octree,
-
-        /// <summary>
-        /// Xiaolin Wu's Color Quantizer which generates high quality output.
-        /// The quantizer supports multiple alpha values.
-        /// </summary>
-        Wu,
-
-        /// <summary>
-        /// Palette based, Uses the collection of web-safe colors by default.
-        /// The quantizer supports multiple alpha values.
-        /// </summary>
-        Palette
-    }
-}
\ No newline at end of file
diff --git a/src/ImageSharp/Processing/Quantization/QuantizeExtensions.cs b/src/ImageSharp/Processing/Quantization/QuantizeExtensions.cs
index 2b367ffe9..bf49c765a 100644
--- a/src/ImageSharp/Processing/Quantization/QuantizeExtensions.cs
+++ b/src/ImageSharp/Processing/Quantization/QuantizeExtensions.cs
@@ -12,34 +12,14 @@ namespace SixLabors.ImageSharp.Processing.Quantization
     public static class QuantizeExtensions
     {
         /// <summary>
-        /// Applies quantization to the image.
+        /// Applies quantization to the image using the <see cref="OctreeQuantizer"/>.
         /// </summary>
         /// <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{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> Quantize<TPixel>(this IImageProcessingContext<TPixel> source, QuantizationMode mode = QuantizationMode.Octree, int maxColors = 256)
+        public static IImageProcessingContext<TPixel> Quantize<TPixel>(this IImageProcessingContext<TPixel> source)
             where TPixel : struct, IPixel<TPixel>
-        {
-            IQuantizer<TPixel> quantizer;
-            switch (mode)
-            {
-                case QuantizationMode.Wu:
-                    quantizer = new WuQuantizer<TPixel>();
-                    break;
-
-                case QuantizationMode.Palette:
-                    quantizer = new PaletteQuantizer<TPixel>();
-                    break;
-
-                default:
-                    quantizer = new OctreeQuantizer<TPixel>();
-                    break;
-            }
-
-            return Quantize(source, quantizer, maxColors);
-        }
+            => Quantize(source, KnownQuantizers.Octree);
 
         /// <summary>
         /// Applies quantization to the image.
@@ -47,10 +27,9 @@ namespace SixLabors.ImageSharp.Processing.Quantization
         /// <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{TPixel}"/>.</returns>
-        public static IImageProcessingContext<TPixel> Quantize<TPixel>(this IImageProcessingContext<TPixel> source, IQuantizer<TPixel> quantizer, int maxColors)
+        public static IImageProcessingContext<TPixel> Quantize<TPixel>(this IImageProcessingContext<TPixel> source, IQuantizer quantizer)
             where TPixel : struct, IPixel<TPixel>
-            => source.ApplyProcessor(new QuantizeProcessor<TPixel>(quantizer, maxColors));
+            => source.ApplyProcessor(new QuantizeProcessor<TPixel>(quantizer));
     }
 }
\ No newline at end of file
diff --git a/src/ImageSharp/Processing/Quantization/WuQuantizer.cs b/src/ImageSharp/Processing/Quantization/WuQuantizer.cs
new file mode 100644
index 000000000..f46cddfe6
--- /dev/null
+++ b/src/ImageSharp/Processing/Quantization/WuQuantizer.cs
@@ -0,0 +1,82 @@
+// Copyright (c) Six Labors and contributors.
+// Licensed under the Apache License, Version 2.0.
+
+using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.ImageSharp.Processing.Dithering;
+using SixLabors.ImageSharp.Processing.Dithering.ErrorDiffusion;
+using SixLabors.ImageSharp.Processing.Quantization.FrameQuantizers;
+
+namespace SixLabors.ImageSharp.Processing.Quantization
+{
+    /// <summary>
+    /// Allows the quantization of images pixels using Xiaolin Wu's Color Quantizer <see href="http://www.ece.mcmaster.ca/~xwu/cq.c"/>
+    /// <para>
+    /// By default the quantizer uses <see cref="KnownDiffusers.FloydSteinberg"/> dithering and a color palette of a maximum length of <value>255</value>
+    /// </para>
+    /// </summary>
+    public class WuQuantizer : IQuantizer
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="WuQuantizer"/> class.
+        /// </summary>
+        public WuQuantizer()
+            : this(true)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="WuQuantizer"/> class.
+        /// </summary>
+        /// <param name="maxColors">The maximum number of colors to hold in the color palette</param>
+        public WuQuantizer(int maxColors)
+            : this(GetDiffuser(true), maxColors)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="WuQuantizer"/> class.
+        /// </summary>
+        /// <param name="dither">Whether to apply dithering to the output image</param>
+        public WuQuantizer(bool dither)
+            : this(GetDiffuser(dither), 255)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="WuQuantizer"/> class.
+        /// </summary>
+        /// <param name="diffuser">The error diffusion algorithm, if any, to apply to the output image</param>
+        public WuQuantizer(IErrorDiffuser diffuser)
+            : this(diffuser, 255)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="WuQuantizer"/> class.
+        /// </summary>
+        /// <param name="diffuser">The error diffusion algorithm, if any, to apply to the output image</param>
+        /// <param name="maxColors">The maximum number of colors to hold in the color palette</param>
+        public WuQuantizer(IErrorDiffuser diffuser, int maxColors)
+        {
+            Guard.MustBeBetweenOrEqualTo(maxColors, 1, 255, nameof(maxColors));
+
+            this.Diffuser = diffuser;
+            this.MaxColors = maxColors;
+        }
+
+        /// <inheritdoc />
+        public IErrorDiffuser Diffuser { get; }
+
+        /// <summary>
+        /// Gets the maximum number of colors to hold in the color palette.
+        /// </summary>
+        public int MaxColors { get; }
+
+        /// <inheritdoc />
+        public IFrameQuantizer<TPixel> CreateFrameQuantizer<TPixel>()
+            where TPixel : struct, IPixel<TPixel>
+            => new WuFrameQuantizer<TPixel>(this);
+
+        private static IErrorDiffuser GetDiffuser(bool dither) => dither ? KnownDiffusers.FloydSteinberg : null;
+    }
+}
\ No newline at end of file
diff --git a/src/ImageSharp/Processing/Transforms/AnchorPosition.cs b/src/ImageSharp/Processing/Transforms/AnchorPositionMode.cs
similarity index 97%
rename from src/ImageSharp/Processing/Transforms/AnchorPosition.cs
rename to src/ImageSharp/Processing/Transforms/AnchorPositionMode.cs
index 4519f90f9..793fc0dfc 100644
--- a/src/ImageSharp/Processing/Transforms/AnchorPosition.cs
+++ b/src/ImageSharp/Processing/Transforms/AnchorPositionMode.cs
@@ -6,7 +6,7 @@ namespace SixLabors.ImageSharp.Processing.Transforms
     /// <summary>
     /// Enumerated anchor positions to apply to resized images.
     /// </summary>
-    public enum AnchorPosition
+    public enum AnchorPositionMode
     {
         /// <summary>
         /// Anchors the position of the image to the center of it's bounding container.
diff --git a/src/ImageSharp/Processing/Transforms/FlipExtensions.cs b/src/ImageSharp/Processing/Transforms/FlipExtensions.cs
index e88074c13..0cbbdd95f 100644
--- a/src/ImageSharp/Processing/Transforms/FlipExtensions.cs
+++ b/src/ImageSharp/Processing/Transforms/FlipExtensions.cs
@@ -16,10 +16,10 @@ namespace SixLabors.ImageSharp.Processing.Transforms
         /// </summary>
         /// <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>
+        /// <param name="flipMode">The <see cref="FlipMode"/> to perform the flip.</param>
         /// <returns>The <see cref="Image{TPixel}"/></returns>
-        public static IImageProcessingContext<TPixel> Flip<TPixel>(this IImageProcessingContext<TPixel> source, FlipType flipType)
+        public static IImageProcessingContext<TPixel> Flip<TPixel>(this IImageProcessingContext<TPixel> source, FlipMode flipMode)
             where TPixel : struct, IPixel<TPixel>
-            => source.ApplyProcessor(new FlipProcessor<TPixel>(flipType));
+            => source.ApplyProcessor(new FlipProcessor<TPixel>(flipMode));
     }
 }
\ No newline at end of file
diff --git a/src/ImageSharp/Processing/Transforms/FlipType.cs b/src/ImageSharp/Processing/Transforms/FlipMode.cs
similarity index 95%
rename from src/ImageSharp/Processing/Transforms/FlipType.cs
rename to src/ImageSharp/Processing/Transforms/FlipMode.cs
index 71a4e6fc8..32c910c80 100644
--- a/src/ImageSharp/Processing/Transforms/FlipType.cs
+++ b/src/ImageSharp/Processing/Transforms/FlipMode.cs
@@ -6,7 +6,7 @@ namespace SixLabors.ImageSharp.Processing.Transforms
     /// <summary>
     /// Provides enumeration over how a image should be flipped.
     /// </summary>
-    public enum FlipType
+    public enum FlipMode
     {
         /// <summary>
         /// Don't flip the image.
diff --git a/src/ImageSharp/Processing/Transforms/ResampleMode.cs b/src/ImageSharp/Processing/Transforms/KnownResamplers.cs
similarity index 99%
rename from src/ImageSharp/Processing/Transforms/ResampleMode.cs
rename to src/ImageSharp/Processing/Transforms/KnownResamplers.cs
index bbbdc3b26..2b589d461 100644
--- a/src/ImageSharp/Processing/Transforms/ResampleMode.cs
+++ b/src/ImageSharp/Processing/Transforms/KnownResamplers.cs
@@ -8,7 +8,7 @@ namespace SixLabors.ImageSharp.Processing.Transforms
     /// <summary>
     /// Contains reusable static instances of known resampling algorithms
     /// </summary>
-    public static class ResampleMode
+    public static class KnownResamplers
     {
         /// <summary>
         /// Gets the Bicubic sampler that implements the bicubic kernel algorithm W(x)
diff --git a/src/ImageSharp/Processing/Transforms/OrientationType.cs b/src/ImageSharp/Processing/Transforms/OrientationMode.cs
similarity index 97%
rename from src/ImageSharp/Processing/Transforms/OrientationType.cs
rename to src/ImageSharp/Processing/Transforms/OrientationMode.cs
index 752ac9fe6..c6f05380b 100644
--- a/src/ImageSharp/Processing/Transforms/OrientationType.cs
+++ b/src/ImageSharp/Processing/Transforms/OrientationMode.cs
@@ -6,7 +6,7 @@ namespace SixLabors.ImageSharp.Processing.Transforms
     /// <summary>
     /// Enumerates the available orientation values supplied by EXIF metadata.
     /// </summary>
-    internal enum OrientationType : ushort
+    internal enum OrientationMode : ushort
     {
         /// <summary>
         /// Unknown rotation.
diff --git a/src/ImageSharp/Processing/Transforms/PadExtensions.cs b/src/ImageSharp/Processing/Transforms/PadExtensions.cs
index 23e9d5d27..a231088dd 100644
--- a/src/ImageSharp/Processing/Transforms/PadExtensions.cs
+++ b/src/ImageSharp/Processing/Transforms/PadExtensions.cs
@@ -26,7 +26,7 @@ namespace SixLabors.ImageSharp.Processing.Transforms
             {
                 Size = new Size(width, height),
                 Mode = ResizeMode.BoxPad,
-                Sampler = ResampleMode.NearestNeighbor
+                Sampler = KnownResamplers.NearestNeighbor
             };
 
             return source.Resize(options);
diff --git a/src/ImageSharp/Processing/Transforms/Processors/AutoOrientProcessor.cs b/src/ImageSharp/Processing/Transforms/Processors/AutoOrientProcessor.cs
index fdb58918a..68dc7f0ad 100644
--- a/src/ImageSharp/Processing/Transforms/Processors/AutoOrientProcessor.cs
+++ b/src/ImageSharp/Processing/Transforms/Processors/AutoOrientProcessor.cs
@@ -19,42 +19,42 @@ namespace SixLabors.ImageSharp.Processing.Transforms.Processors
         /// <inheritdoc/>
         protected override void BeforeImageApply(Image<TPixel> source, Rectangle sourceRectangle)
         {
-            OrientationType orientation = GetExifOrientation(source);
+            OrientationMode orientation = GetExifOrientation(source);
             Size size = sourceRectangle.Size;
             switch (orientation)
             {
-                case OrientationType.TopRight:
-                    new FlipProcessor<TPixel>(FlipType.Horizontal).Apply(source, sourceRectangle);
+                case OrientationMode.TopRight:
+                    new FlipProcessor<TPixel>(FlipMode.Horizontal).Apply(source, sourceRectangle);
                     break;
 
-                case OrientationType.BottomRight:
-                    new RotateProcessor<TPixel>((int)RotateType.Rotate180, size).Apply(source, sourceRectangle);
+                case OrientationMode.BottomRight:
+                    new RotateProcessor<TPixel>((int)RotateMode.Rotate180, size).Apply(source, sourceRectangle);
                     break;
 
-                case OrientationType.BottomLeft:
-                    new FlipProcessor<TPixel>(FlipType.Vertical).Apply(source, sourceRectangle);
+                case OrientationMode.BottomLeft:
+                    new FlipProcessor<TPixel>(FlipMode.Vertical).Apply(source, sourceRectangle);
                     break;
 
-                case OrientationType.LeftTop:
-                    new RotateProcessor<TPixel>((int)RotateType.Rotate90, size).Apply(source, sourceRectangle);
-                    new FlipProcessor<TPixel>(FlipType.Horizontal).Apply(source, sourceRectangle);
+                case OrientationMode.LeftTop:
+                    new RotateProcessor<TPixel>((int)RotateMode.Rotate90, size).Apply(source, sourceRectangle);
+                    new FlipProcessor<TPixel>(FlipMode.Horizontal).Apply(source, sourceRectangle);
                     break;
 
-                case OrientationType.RightTop:
-                    new RotateProcessor<TPixel>((int)RotateType.Rotate90, size).Apply(source, sourceRectangle);
+                case OrientationMode.RightTop:
+                    new RotateProcessor<TPixel>((int)RotateMode.Rotate90, size).Apply(source, sourceRectangle);
                     break;
 
-                case OrientationType.RightBottom:
-                    new FlipProcessor<TPixel>(FlipType.Vertical).Apply(source, sourceRectangle);
-                    new RotateProcessor<TPixel>((int)RotateType.Rotate270, size).Apply(source, sourceRectangle);
+                case OrientationMode.RightBottom:
+                    new FlipProcessor<TPixel>(FlipMode.Vertical).Apply(source, sourceRectangle);
+                    new RotateProcessor<TPixel>((int)RotateMode.Rotate270, size).Apply(source, sourceRectangle);
                     break;
 
-                case OrientationType.LeftBottom:
-                    new RotateProcessor<TPixel>((int)RotateType.Rotate270, size).Apply(source, sourceRectangle);
+                case OrientationMode.LeftBottom:
+                    new RotateProcessor<TPixel>((int)RotateMode.Rotate270, size).Apply(source, sourceRectangle);
                     break;
 
-                case OrientationType.Unknown:
-                case OrientationType.TopLeft:
+                case OrientationMode.Unknown:
+                case OrientationMode.TopLeft:
                 default:
                     break;
             }
@@ -70,32 +70,32 @@ namespace SixLabors.ImageSharp.Processing.Transforms.Processors
         /// Returns the current EXIF orientation
         /// </summary>
         /// <param name="source">The image to auto rotate.</param>
-        /// <returns>The <see cref="OrientationType"/></returns>
-        private static OrientationType GetExifOrientation(Image<TPixel> source)
+        /// <returns>The <see cref="OrientationMode"/></returns>
+        private static OrientationMode GetExifOrientation(Image<TPixel> source)
         {
             if (source.MetaData.ExifProfile == null)
             {
-                return OrientationType.Unknown;
+                return OrientationMode.Unknown;
             }
 
             ExifValue value = source.MetaData.ExifProfile.GetValue(ExifTag.Orientation);
             if (value == null)
             {
-                return OrientationType.Unknown;
+                return OrientationMode.Unknown;
             }
 
-            OrientationType orientation;
+            OrientationMode orientation;
             if (value.DataType == ExifDataType.Short)
             {
-                orientation = (OrientationType)value.Value;
+                orientation = (OrientationMode)value.Value;
             }
             else
             {
-                orientation = (OrientationType)Convert.ToUInt16(value.Value);
+                orientation = (OrientationMode)Convert.ToUInt16(value.Value);
                 source.MetaData.ExifProfile.RemoveValue(ExifTag.Orientation);
             }
 
-            source.MetaData.ExifProfile.SetValue(ExifTag.Orientation, (ushort)OrientationType.TopLeft);
+            source.MetaData.ExifProfile.SetValue(ExifTag.Orientation, (ushort)OrientationMode.TopLeft);
 
             return orientation;
         }
diff --git a/src/ImageSharp/Processing/Transforms/Processors/FlipProcessor.cs b/src/ImageSharp/Processing/Transforms/Processors/FlipProcessor.cs
index 4c6cb166b..cf5ebf418 100644
--- a/src/ImageSharp/Processing/Transforms/Processors/FlipProcessor.cs
+++ b/src/ImageSharp/Processing/Transforms/Processors/FlipProcessor.cs
@@ -21,27 +21,27 @@ namespace SixLabors.ImageSharp.Processing.Transforms.Processors
         /// <summary>
         /// 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)
+        /// <param name="flipMode">The <see cref="Transforms.FlipMode"/> used to perform flipping.</param>
+        public FlipProcessor(FlipMode flipMode)
         {
-            this.FlipType = flipType;
+            this.FlipMode = flipMode;
         }
 
         /// <summary>
-        /// Gets the <see cref="FlipType"/> used to perform flipping.
+        /// Gets the <see cref="Transforms.FlipMode"/> used to perform flipping.
         /// </summary>
-        public FlipType FlipType { get; }
+        public FlipMode FlipMode { get; }
 
         /// <inheritdoc/>
         protected override void OnFrameApply(ImageFrame<TPixel> source, Rectangle sourceRectangle, Configuration configuration)
         {
-            switch (this.FlipType)
+            switch (this.FlipMode)
             {
                 // No default needed as we have already set the pixels.
-                case FlipType.Vertical:
+                case FlipMode.Vertical:
                     this.FlipX(source, configuration);
                     break;
-                case FlipType.Horizontal:
+                case FlipMode.Horizontal:
                     this.FlipY(source, configuration);
                     break;
             }
diff --git a/src/ImageSharp/Processing/Transforms/Processors/RotateProcessor.cs b/src/ImageSharp/Processing/Transforms/Processors/RotateProcessor.cs
index 0cf42cbb7..62c3e476b 100644
--- a/src/ImageSharp/Processing/Transforms/Processors/RotateProcessor.cs
+++ b/src/ImageSharp/Processing/Transforms/Processors/RotateProcessor.cs
@@ -24,7 +24,7 @@ namespace SixLabors.ImageSharp.Processing.Transforms.Processors
         /// <param name="degrees">The angle of rotation in degrees.</param>
         /// <param name="sourceSize">The source image size</param>
         public RotateProcessor(float degrees, Size sourceSize)
-            : this(degrees, ResampleMode.Bicubic, sourceSize)
+            : this(degrees, KnownResamplers.Bicubic, sourceSize)
         {
         }
 
diff --git a/src/ImageSharp/Processing/Transforms/Processors/SkewProcessor.cs b/src/ImageSharp/Processing/Transforms/Processors/SkewProcessor.cs
index cc3d901d6..61e8b1268 100644
--- a/src/ImageSharp/Processing/Transforms/Processors/SkewProcessor.cs
+++ b/src/ImageSharp/Processing/Transforms/Processors/SkewProcessor.cs
@@ -21,7 +21,7 @@ namespace SixLabors.ImageSharp.Processing.Transforms.Processors
         /// <param name="degreesY">The angle in degrees to perform the skew along the y-axis.</param>
         /// <param name="sourceSize">The source image size</param>
         public SkewProcessor(float degreesX, float degreesY, Size sourceSize)
-            : this(degreesX, degreesY, ResampleMode.Bicubic, sourceSize)
+            : this(degreesX, degreesY, KnownResamplers.Bicubic, sourceSize)
         {
         }
 
diff --git a/src/ImageSharp/Processing/Transforms/ResizeExtensions.cs b/src/ImageSharp/Processing/Transforms/ResizeExtensions.cs
index 4101d3cff..4317c1fc1 100644
--- a/src/ImageSharp/Processing/Transforms/ResizeExtensions.cs
+++ b/src/ImageSharp/Processing/Transforms/ResizeExtensions.cs
@@ -35,7 +35,7 @@ namespace SixLabors.ImageSharp.Processing.Transforms
         /// <remarks>Passing zero for one of height or width will automatically preserve the aspect ratio of the original image</remarks>
         public static IImageProcessingContext<TPixel> Resize<TPixel>(this IImageProcessingContext<TPixel> source, Size size)
             where TPixel : struct, IPixel<TPixel>
-            => Resize(source, size.Width, size.Height, ResampleMode.Bicubic, false);
+            => Resize(source, size.Width, size.Height, KnownResamplers.Bicubic, false);
 
         /// <summary>
         /// Resizes an image to the given <see cref="Size"/>.
@@ -48,7 +48,7 @@ namespace SixLabors.ImageSharp.Processing.Transforms
         /// <remarks>Passing zero for one of height or width will automatically preserve the aspect ratio of the original image</remarks>
         public static IImageProcessingContext<TPixel> Resize<TPixel>(this IImageProcessingContext<TPixel> source, Size size, bool compand)
             where TPixel : struct, IPixel<TPixel>
-            => Resize(source, size.Width, size.Height, ResampleMode.Bicubic, compand);
+            => Resize(source, size.Width, size.Height, KnownResamplers.Bicubic, compand);
 
         /// <summary>
         /// Resizes an image to the given width and height.
@@ -61,7 +61,7 @@ namespace SixLabors.ImageSharp.Processing.Transforms
         /// <remarks>Passing zero for one of height or width will automatically preserve the aspect ratio of the original image</remarks>
         public static IImageProcessingContext<TPixel> Resize<TPixel>(this IImageProcessingContext<TPixel> source, int width, int height)
             where TPixel : struct, IPixel<TPixel>
-            => Resize(source, width, height, ResampleMode.Bicubic, false);
+            => Resize(source, width, height, KnownResamplers.Bicubic, false);
 
         /// <summary>
         /// Resizes an image to the given width and height.
@@ -75,7 +75,7 @@ namespace SixLabors.ImageSharp.Processing.Transforms
         /// <remarks>Passing zero for one of height or width will automatically preserve the aspect ratio of the original image</remarks>
         public static IImageProcessingContext<TPixel> Resize<TPixel>(this IImageProcessingContext<TPixel> source, int width, int height, bool compand)
             where TPixel : struct, IPixel<TPixel>
-            => Resize(source, width, height, ResampleMode.Bicubic, compand);
+            => Resize(source, width, height, KnownResamplers.Bicubic, compand);
 
         /// <summary>
         /// Resizes an image to the given width and height with the given sampler.
diff --git a/src/ImageSharp/Processing/Transforms/ResizeHelper.cs b/src/ImageSharp/Processing/Transforms/ResizeHelper.cs
index 0d500b1bc..aca9d97d3 100644
--- a/src/ImageSharp/Processing/Transforms/ResizeHelper.cs
+++ b/src/ImageSharp/Processing/Transforms/ResizeHelper.cs
@@ -87,14 +87,14 @@ namespace SixLabors.ImageSharp.Processing.Transforms
                 {
                     switch (options.Position)
                     {
-                        case AnchorPosition.Top:
-                        case AnchorPosition.TopLeft:
-                        case AnchorPosition.TopRight:
+                        case AnchorPositionMode.Top:
+                        case AnchorPositionMode.TopLeft:
+                        case AnchorPositionMode.TopRight:
                             destinationY = 0;
                             break;
-                        case AnchorPosition.Bottom:
-                        case AnchorPosition.BottomLeft:
-                        case AnchorPosition.BottomRight:
+                        case AnchorPositionMode.Bottom:
+                        case AnchorPositionMode.BottomLeft:
+                        case AnchorPositionMode.BottomRight:
                             destinationY = (int)MathF.Round(height - (sourceHeight * ratio));
                             break;
                         default:
@@ -128,14 +128,14 @@ namespace SixLabors.ImageSharp.Processing.Transforms
                 {
                     switch (options.Position)
                     {
-                        case AnchorPosition.Left:
-                        case AnchorPosition.TopLeft:
-                        case AnchorPosition.BottomLeft:
+                        case AnchorPositionMode.Left:
+                        case AnchorPositionMode.TopLeft:
+                        case AnchorPositionMode.BottomLeft:
                             destinationX = 0;
                             break;
-                        case AnchorPosition.Right:
-                        case AnchorPosition.TopRight:
-                        case AnchorPosition.BottomRight:
+                        case AnchorPositionMode.Right:
+                        case AnchorPositionMode.TopRight:
+                        case AnchorPositionMode.BottomRight:
                             destinationX = (int)MathF.Round(width - (sourceWidth * ratio));
                             break;
                         default:
@@ -177,14 +177,14 @@ namespace SixLabors.ImageSharp.Processing.Transforms
 
                 switch (options.Position)
                 {
-                    case AnchorPosition.Left:
-                    case AnchorPosition.TopLeft:
-                    case AnchorPosition.BottomLeft:
+                    case AnchorPositionMode.Left:
+                    case AnchorPositionMode.TopLeft:
+                    case AnchorPositionMode.BottomLeft:
                         destinationX = 0;
                         break;
-                    case AnchorPosition.Right:
-                    case AnchorPosition.TopRight:
-                    case AnchorPosition.BottomRight:
+                    case AnchorPositionMode.Right:
+                    case AnchorPositionMode.TopRight:
+                    case AnchorPositionMode.BottomRight:
                         destinationX = (int)MathF.Round(width - (sourceWidth * ratio));
                         break;
                     default:
@@ -199,14 +199,14 @@ namespace SixLabors.ImageSharp.Processing.Transforms
 
                 switch (options.Position)
                 {
-                    case AnchorPosition.Top:
-                    case AnchorPosition.TopLeft:
-                    case AnchorPosition.TopRight:
+                    case AnchorPositionMode.Top:
+                    case AnchorPositionMode.TopLeft:
+                    case AnchorPositionMode.TopRight:
                         destinationY = 0;
                         break;
-                    case AnchorPosition.Bottom:
-                    case AnchorPosition.BottomLeft:
-                    case AnchorPosition.BottomRight:
+                    case AnchorPositionMode.Bottom:
+                    case AnchorPositionMode.BottomLeft:
+                    case AnchorPositionMode.BottomRight:
                         destinationY = (int)MathF.Round(height - (sourceHeight * ratio));
                         break;
                     default:
@@ -247,35 +247,35 @@ namespace SixLabors.ImageSharp.Processing.Transforms
 
                 switch (options.Position)
                 {
-                    case AnchorPosition.Left:
+                    case AnchorPositionMode.Left:
                         destinationY = (height - sourceHeight) / 2;
                         destinationX = 0;
                         break;
-                    case AnchorPosition.Right:
+                    case AnchorPositionMode.Right:
                         destinationY = (height - sourceHeight) / 2;
                         destinationX = width - sourceWidth;
                         break;
-                    case AnchorPosition.TopRight:
+                    case AnchorPositionMode.TopRight:
                         destinationY = 0;
                         destinationX = width - sourceWidth;
                         break;
-                    case AnchorPosition.Top:
+                    case AnchorPositionMode.Top:
                         destinationY = 0;
                         destinationX = (width - sourceWidth) / 2;
                         break;
-                    case AnchorPosition.TopLeft:
+                    case AnchorPositionMode.TopLeft:
                         destinationY = 0;
                         destinationX = 0;
                         break;
-                    case AnchorPosition.BottomRight:
+                    case AnchorPositionMode.BottomRight:
                         destinationY = height - sourceHeight;
                         destinationX = width - sourceWidth;
                         break;
-                    case AnchorPosition.Bottom:
+                    case AnchorPositionMode.Bottom:
                         destinationY = height - sourceHeight;
                         destinationX = (width - sourceWidth) / 2;
                         break;
-                    case AnchorPosition.BottomLeft:
+                    case AnchorPositionMode.BottomLeft:
                         destinationY = height - sourceHeight;
                         destinationX = 0;
                         break;
diff --git a/src/ImageSharp/Processing/Transforms/ResizeMode.cs b/src/ImageSharp/Processing/Transforms/ResizeMode.cs
index d81691cd3..2707b11b3 100644
--- a/src/ImageSharp/Processing/Transforms/ResizeMode.cs
+++ b/src/ImageSharp/Processing/Transforms/ResizeMode.cs
@@ -4,7 +4,7 @@
 namespace SixLabors.ImageSharp.Processing.Transforms
 {
     /// <summary>
-    /// Enumerated resize modes to apply to images.
+    /// Provides enumeration over how the image should be resized.
     /// </summary>
     public enum ResizeMode
     {
diff --git a/src/ImageSharp/Processing/Transforms/ResizeOptions.cs b/src/ImageSharp/Processing/Transforms/ResizeOptions.cs
index 8d6384748..c14abe2a8 100644
--- a/src/ImageSharp/Processing/Transforms/ResizeOptions.cs
+++ b/src/ImageSharp/Processing/Transforms/ResizeOptions.cs
@@ -21,7 +21,7 @@ namespace SixLabors.ImageSharp.Processing.Transforms
         /// <summary>
         /// Gets or sets the anchor position.
         /// </summary>
-        public AnchorPosition Position { get; set; } = AnchorPosition.Center;
+        public AnchorPositionMode Position { get; set; } = AnchorPositionMode.Center;
 
         /// <summary>
         /// Gets or sets the center coordinates.
@@ -36,7 +36,7 @@ namespace SixLabors.ImageSharp.Processing.Transforms
         /// <summary>
         /// Gets or sets the sampler to perform the resize operation.
         /// </summary>
-        public IResampler Sampler { get; set; } = ResampleMode.Bicubic;
+        public IResampler Sampler { get; set; } = KnownResamplers.Bicubic;
 
         /// <summary>
         /// Gets or sets a value indicating whether to compress
diff --git a/src/ImageSharp/Processing/Transforms/RotateExtensions.cs b/src/ImageSharp/Processing/Transforms/RotateExtensions.cs
index e4a233ba4..28819099e 100644
--- a/src/ImageSharp/Processing/Transforms/RotateExtensions.cs
+++ b/src/ImageSharp/Processing/Transforms/RotateExtensions.cs
@@ -17,11 +17,11 @@ namespace SixLabors.ImageSharp.Processing.Transforms
         /// </summary>
         /// <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>
+        /// <param name="rotateMode">The <see cref="RotateMode"/> to perform the rotation.</param>
         /// <returns>The <see cref="Image{TPixel}"/></returns>
-        public static IImageProcessingContext<TPixel> Rotate<TPixel>(this IImageProcessingContext<TPixel> source, RotateType rotateType)
+        public static IImageProcessingContext<TPixel> Rotate<TPixel>(this IImageProcessingContext<TPixel> source, RotateMode rotateMode)
             where TPixel : struct, IPixel<TPixel>
-            => Rotate(source, (float)rotateType);
+            => Rotate(source, (float)rotateMode);
 
         /// <summary>
         /// Rotates an image by the given angle in degrees.
@@ -32,7 +32,7 @@ namespace SixLabors.ImageSharp.Processing.Transforms
         /// <returns>The <see cref="Image{TPixel}"/></returns>
         public static IImageProcessingContext<TPixel> Rotate<TPixel>(this IImageProcessingContext<TPixel> source, float degrees)
             where TPixel : struct, IPixel<TPixel>
-            => Rotate(source, degrees, ResampleMode.Bicubic);
+            => Rotate(source, degrees, KnownResamplers.Bicubic);
 
         /// <summary>
         /// Rotates an image by the given angle in degrees using the specified sampling algorithm.
diff --git a/src/ImageSharp/Processing/Transforms/RotateFlipExtensions.cs b/src/ImageSharp/Processing/Transforms/RotateFlipExtensions.cs
index 693c0d8ad..66bb27b36 100644
--- a/src/ImageSharp/Processing/Transforms/RotateFlipExtensions.cs
+++ b/src/ImageSharp/Processing/Transforms/RotateFlipExtensions.cs
@@ -15,11 +15,11 @@ namespace SixLabors.ImageSharp.Processing.Transforms
         /// </summary>
         /// <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>
+        /// <param name="rotateMode">The <see cref="RotateMode"/> to perform the rotation.</param>
+        /// <param name="flipMode">The <see cref="FlipMode"/> to perform the flip.</param>
         /// <returns>The <see cref="Image{TPixel}"/></returns>
-        public static IImageProcessingContext<TPixel> RotateFlip<TPixel>(this IImageProcessingContext<TPixel> source, RotateType rotateType, FlipType flipType)
+        public static IImageProcessingContext<TPixel> RotateFlip<TPixel>(this IImageProcessingContext<TPixel> source, RotateMode rotateMode, FlipMode flipMode)
             where TPixel : struct, IPixel<TPixel>
-            => source.Rotate(rotateType).Flip(flipType);
+            => source.Rotate(rotateMode).Flip(flipMode);
     }
 }
\ No newline at end of file
diff --git a/src/ImageSharp/Processing/Transforms/RotateType.cs b/src/ImageSharp/Processing/Transforms/RotateMode.cs
similarity index 96%
rename from src/ImageSharp/Processing/Transforms/RotateType.cs
rename to src/ImageSharp/Processing/Transforms/RotateMode.cs
index 498ad4149..6f66d0c09 100644
--- a/src/ImageSharp/Processing/Transforms/RotateType.cs
+++ b/src/ImageSharp/Processing/Transforms/RotateMode.cs
@@ -6,7 +6,7 @@ namespace SixLabors.ImageSharp.Processing.Transforms
     /// <summary>
     /// Provides enumeration over how the image should be rotated.
     /// </summary>
-    public enum RotateType
+    public enum RotateMode
     {
         /// <summary>
         /// Do not rotate the image.
diff --git a/src/ImageSharp/Processing/Transforms/SkewExtensions.cs b/src/ImageSharp/Processing/Transforms/SkewExtensions.cs
index 686f2c87c..cbb414888 100644
--- a/src/ImageSharp/Processing/Transforms/SkewExtensions.cs
+++ b/src/ImageSharp/Processing/Transforms/SkewExtensions.cs
@@ -22,7 +22,7 @@ namespace SixLabors.ImageSharp.Processing.Transforms
         /// <returns>The <see cref="Image{TPixel}"/></returns>
         public static IImageProcessingContext<TPixel> Skew<TPixel>(this IImageProcessingContext<TPixel> source, float degreesX, float degreesY)
             where TPixel : struct, IPixel<TPixel>
-            => Skew(source, degreesX, degreesY, ResampleMode.Bicubic);
+            => Skew(source, degreesX, degreesY, KnownResamplers.Bicubic);
 
         /// <summary>
         /// Skews an image by the given angles in degrees using the specified sampling algorithm.
diff --git a/src/ImageSharp/Processing/Transforms/TransformExtensions.cs b/src/ImageSharp/Processing/Transforms/TransformExtensions.cs
index 865511b26..585288d8a 100644
--- a/src/ImageSharp/Processing/Transforms/TransformExtensions.cs
+++ b/src/ImageSharp/Processing/Transforms/TransformExtensions.cs
@@ -23,7 +23,7 @@ namespace SixLabors.ImageSharp.Processing.Transforms
         /// <returns>The <see cref="Image{TPixel}"/></returns>
         public static IImageProcessingContext<TPixel> Transform<TPixel>(this IImageProcessingContext<TPixel> source, Matrix3x2 matrix)
             where TPixel : struct, IPixel<TPixel>
-            => Transform(source, matrix, ResampleMode.Bicubic);
+            => Transform(source, matrix, KnownResamplers.Bicubic);
 
         /// <summary>
         /// Transforms an image by the given matrix using the specified sampling algorithm.
@@ -88,7 +88,7 @@ namespace SixLabors.ImageSharp.Processing.Transforms
         /// <returns>The <see cref="Image{TPixel}"/></returns>
         internal static IImageProcessingContext<TPixel> Transform<TPixel>(this IImageProcessingContext<TPixel> source, Matrix4x4 matrix)
             where TPixel : struct, IPixel<TPixel>
-            => Transform(source, matrix, ResampleMode.Bicubic);
+            => Transform(source, matrix, KnownResamplers.Bicubic);
 
         /// <summary>
         /// Applies a projective transform to the image by the given matrix using the specified sampling algorithm.
diff --git a/tests/ImageSharp.Benchmarks/Image/EncodeIndexedPng.cs b/tests/ImageSharp.Benchmarks/Image/EncodeIndexedPng.cs
index a4cc06e25..bed826c10 100644
--- a/tests/ImageSharp.Benchmarks/Image/EncodeIndexedPng.cs
+++ b/tests/ImageSharp.Benchmarks/Image/EncodeIndexedPng.cs
@@ -3,20 +3,15 @@
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 
+using System.IO;
+using BenchmarkDotNet.Attributes;
+using SixLabors.ImageSharp.Formats.Png;
 using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.ImageSharp.Processing.Quantization;
+using CoreImage = SixLabors.ImageSharp.Image;
 
 namespace SixLabors.ImageSharp.Benchmarks.Image
 {
-    using System.IO;
-
-    using BenchmarkDotNet.Attributes;
-
-    using SixLabors.ImageSharp;
-    using SixLabors.ImageSharp.Formats.Png;
-    using SixLabors.ImageSharp.Processing.Quantization;
-
-    using CoreImage = ImageSharp.Image;
-
     /// <summary>
     /// Benchmarks saving png files using different quantizers. System.Drawing cannot save indexed png files so we cannot compare.
     /// </summary>
@@ -35,8 +30,9 @@ namespace SixLabors.ImageSharp.Benchmarks.Image
             if (this.bmpStream == null)
             {
                 string path = this.LargeImage
-                                  ? "../ImageSharp.Tests/TestImages/Formats/Jpg/baseline/jpeg420exif.jpg"
-                                  : "../ImageSharp.Tests/TestImages/Formats/Bmp/Car.bmp";
+                    ? "../ImageSharp.Tests/TestImages/Formats/Jpg/baseline/jpeg420exif.jpg"
+                    : "../ImageSharp.Tests/TestImages/Formats/Bmp/Car.bmp";
+
                 this.bmpStream = File.OpenRead(path);
                 this.bmpCore = CoreImage.Load<Rgba32>(this.bmpStream);
                 this.bmpStream.Position = 0;
@@ -53,20 +49,20 @@ namespace SixLabors.ImageSharp.Benchmarks.Image
         [Benchmark(Baseline = true, Description = "ImageSharp Octree Png")]
         public void PngCoreOctree()
         {
-            using (MemoryStream memoryStream = new MemoryStream())
+            using (var memoryStream = new MemoryStream())
             {
-                PngEncoder encoder = new PngEncoder() { Quantizer = new OctreeQuantizer<Rgba32>(), PaletteSize = 256 };
+                var encoder = new PngEncoder { Quantizer = new OctreeQuantizer() };
 
                 this.bmpCore.SaveAsPng(memoryStream, encoder);
             }
         }
 
         [Benchmark(Description = "ImageSharp Octree NoDither Png")]
-        public void PngCoreOctreeNoDIther()
+        public void PngCoreOctreeNoDither()
         {
-            using (MemoryStream memoryStream = new MemoryStream())
+            using (var memoryStream = new MemoryStream())
             {
-                PngEncoder options = new PngEncoder() { Quantizer = new OctreeQuantizer<Rgba32> { Dither = false }, PaletteSize = 256 };
+                var options = new PngEncoder { Quantizer = new OctreeQuantizer(false) };
 
                 this.bmpCore.SaveAsPng(memoryStream, options);
             }
@@ -75,9 +71,9 @@ namespace SixLabors.ImageSharp.Benchmarks.Image
         [Benchmark(Description = "ImageSharp Palette Png")]
         public void PngCorePalette()
         {
-            using (MemoryStream memoryStream = new MemoryStream())
+            using (var memoryStream = new MemoryStream())
             {
-                PngEncoder options = new PngEncoder() { Quantizer = new PaletteQuantizer<Rgba32>(), PaletteSize = 256 };
+                var options = new PngEncoder { Quantizer = new PaletteQuantizer() };
 
                 this.bmpCore.SaveAsPng(memoryStream, options);
             }
@@ -86,9 +82,9 @@ namespace SixLabors.ImageSharp.Benchmarks.Image
         [Benchmark(Description = "ImageSharp Palette NoDither Png")]
         public void PngCorePaletteNoDither()
         {
-            using (MemoryStream memoryStream = new MemoryStream())
+            using (var memoryStream = new MemoryStream())
             {
-                PngEncoder options = new PngEncoder() { Quantizer = new PaletteQuantizer<Rgba32> { Dither = false }, PaletteSize = 256 };
+                var options = new PngEncoder { Quantizer = new PaletteQuantizer(false) };
 
                 this.bmpCore.SaveAsPng(memoryStream, options);
             }
@@ -97,9 +93,20 @@ namespace SixLabors.ImageSharp.Benchmarks.Image
         [Benchmark(Description = "ImageSharp Wu Png")]
         public void PngCoreWu()
         {
-            using (MemoryStream memoryStream = new MemoryStream())
+            using (var memoryStream = new MemoryStream())
+            {
+                var options = new PngEncoder { Quantizer = new WuQuantizer() };
+
+                this.bmpCore.SaveAsPng(memoryStream, options);
+            }
+        }
+
+        [Benchmark(Description = "ImageSharp Wu NoDither Png")]
+        public void PngCoreWuNoDither()
+        {
+            using (var memoryStream = new MemoryStream())
             {
-                PngEncoder options = new PngEncoder() { Quantizer = new WuQuantizer<Rgba32>(), PaletteSize = 256 };
+                var options = new PngEncoder { Quantizer = new WuQuantizer(false) };
 
                 this.bmpCore.SaveAsPng(memoryStream, options);
             }
diff --git a/tests/ImageSharp.Benchmarks/Image/EncodePng.cs b/tests/ImageSharp.Benchmarks/Image/EncodePng.cs
index ffd810f28..4fc84ba61 100644
--- a/tests/ImageSharp.Benchmarks/Image/EncodePng.cs
+++ b/tests/ImageSharp.Benchmarks/Image/EncodePng.cs
@@ -70,12 +70,12 @@ namespace SixLabors.ImageSharp.Benchmarks.Image
         {
             using (var memoryStream = new MemoryStream())
             {
-                QuantizerBase<Rgba32> quantizer = this.UseOctreeQuantizer
-                ? (QuantizerBase<Rgba32>)
-                new OctreeQuantizer<Rgba32>()
-                : new PaletteQuantizer<Rgba32>();
+                IQuantizer quantizer = this.UseOctreeQuantizer
+                ?
+                (IQuantizer)new OctreeQuantizer()
+                : new PaletteQuantizer();
 
-                var options = new PngEncoder() { Quantizer = quantizer };
+                var options = new PngEncoder { Quantizer = quantizer };
                 this.bmpCore.SaveAsPng(memoryStream, options);
             }
         }
diff --git a/tests/ImageSharp.Tests/Drawing/DrawImageTest.cs b/tests/ImageSharp.Tests/Drawing/DrawImageTest.cs
index cf65833ea..3e7f3648f 100644
--- a/tests/ImageSharp.Tests/Drawing/DrawImageTest.cs
+++ b/tests/ImageSharp.Tests/Drawing/DrawImageTest.cs
@@ -66,7 +66,7 @@ namespace SixLabors.ImageSharp.Tests
                 // We pass a new rectangle here based on the dest bounds since we've offset the matrix
                 blend.Mutate(x => x.Transform(
                     centeredMatrix,
-                    ResampleMode.Bicubic,
+                    KnownResamplers.Bicubic,
                     new Rectangle(0, 0, destBounds.Width, destBounds.Height)));
 
                 var position = new Point((image.Width - blend.Width) / 2, (image.Height - blend.Height) / 2);
diff --git a/tests/ImageSharp.Tests/Formats/GeneralFormatTests.cs b/tests/ImageSharp.Tests/Formats/GeneralFormatTests.cs
index b78a8083e..26b5dca27 100644
--- a/tests/ImageSharp.Tests/Formats/GeneralFormatTests.cs
+++ b/tests/ImageSharp.Tests/Formats/GeneralFormatTests.cs
@@ -74,7 +74,7 @@ namespace SixLabors.ImageSharp.Tests
                     {
                         using (FileStream output = File.OpenWrite($"{path}/Octree-{file.FileName}"))
                         {
-                            image.Mutate(x => x.Quantize(QuantizationMode.Octree));
+                            image.Mutate(x => x.Quantize(KnownQuantizers.Octree));
                             image.Save(output, mimeType);
 
                         }
@@ -84,7 +84,7 @@ namespace SixLabors.ImageSharp.Tests
                     {
                         using (FileStream output = File.OpenWrite($"{path}/Wu-{file.FileName}"))
                         {
-                            image.Mutate(x => x.Quantize(QuantizationMode.Wu));
+                            image.Mutate(x => x.Quantize(KnownQuantizers.Wu));
                             image.Save(output, mimeType);
                         }
                     }
@@ -93,7 +93,7 @@ namespace SixLabors.ImageSharp.Tests
                     {
                         using (FileStream output = File.OpenWrite($"{path}/Palette-{file.FileName}"))
                         {
-                            image.Mutate(x => x.Quantize(QuantizationMode.Palette));
+                            image.Mutate(x => x.Quantize(KnownQuantizers.Palette));
                             image.Save(output, mimeType);
                         }
                     }
diff --git a/tests/ImageSharp.Tests/Formats/Png/PngEncoderTests.cs b/tests/ImageSharp.Tests/Formats/Png/PngEncoderTests.cs
index 7f983e1e4..9a7b9413e 100644
--- a/tests/ImageSharp.Tests/Formats/Png/PngEncoderTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Png/PngEncoderTests.cs
@@ -7,6 +7,8 @@ using System.Linq;
 using SixLabors.ImageSharp.Formats;
 using SixLabors.ImageSharp.Formats.Png;
 using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.ImageSharp.Processing.Quantization;
+
 using Xunit;
 // ReSharper disable InconsistentNaming
 
@@ -22,31 +24,31 @@ namespace SixLabors.ImageSharp.Tests
         /// <summary>
         /// All types except Palette
         /// </summary>
-        public static readonly TheoryData<PngColorType> PngColorTypes = new TheoryData<PngColorType>()
-                                                                           {
-                                                                               PngColorType.RgbWithAlpha,
-                                                                               PngColorType.Rgb,
-                                                                               PngColorType.Grayscale,
-                                                                               PngColorType.GrayscaleWithAlpha,
-                                                                           };
+        public static readonly TheoryData<PngColorType> PngColorTypes = new TheoryData<PngColorType>
+        {
+            PngColorType.RgbWithAlpha,
+            PngColorType.Rgb,
+            PngColorType.Grayscale,
+            PngColorType.GrayscaleWithAlpha,
+        };
 
         /// <summary>
         /// All types except Palette
         /// </summary>
-        public static readonly TheoryData<int> CompressionLevels = new TheoryData<int>()
-                                                                            {
-                                                                                1, 2, 3, 4, 5, 6, 7, 8, 9
-                                                                            };
+        public static readonly TheoryData<int> CompressionLevels = new TheoryData<int>
+                                                                       {
+            1, 2, 3, 4, 5, 6, 7, 8, 9
+        };
 
-        public static readonly TheoryData<int> PaletteSizes = new TheoryData<int>()
+        public static readonly TheoryData<int> PaletteSizes = new TheoryData<int>
                                                                   {
-                                                                      30, 55, 100, 201, 255
-                                                                  };
+            30, 55, 100, 201, 255
+        };
 
-        public static readonly TheoryData<int> PaletteLargeOnly = new TheoryData<int>()
-                                                                  {
-                                                                      80, 100, 120, 230
-                                                                  };
+        public static readonly TheoryData<int> PaletteLargeOnly = new TheoryData<int>
+                                                                      {
+            80, 100, 120, 230
+        };
 
         [Theory]
         [WithFile(TestImages.Png.Palette8Bpp, nameof(PngColorTypes), PixelTypes.Rgba32)]
@@ -60,7 +62,7 @@ namespace SixLabors.ImageSharp.Tests
         {
             TestPngEncoderCore(provider, pngColorType, appendPngColorType: true);
         }
-        
+
         [Theory]
         [WithTestPatternImages(nameof(PngColorTypes), 24, 24, PixelTypes.Rgba32 | PixelTypes.Bgra32 | PixelTypes.Rgb24)]
         public void IsNotBoundToSinglePixelType<TPixel>(TestImageProvider<TPixel> provider, PngColorType pngColorType)
@@ -76,7 +78,7 @@ namespace SixLabors.ImageSharp.Tests
         {
             TestPngEncoderCore(provider, PngColorType.RgbWithAlpha, compressionLevel, appendCompressionLevel: true);
         }
-        
+
         [Theory]
         [WithFile(TestImages.Png.Palette8Bpp, nameof(PaletteLargeOnly), PixelTypes.Rgba32)]
         public void PaletteColorType_WuQuantizer<TPixel>(TestImageProvider<TPixel> provider, int paletteSize)
@@ -92,7 +94,7 @@ namespace SixLabors.ImageSharp.Tests
             TestImageProvider<TPixel> provider,
             PngColorType pngColorType,
             int compressionLevel = 6,
-            int paletteSize = 0,
+            int paletteSize = 255,
             bool appendPngColorType = false,
             bool appendPixelType = false,
             bool appendCompressionLevel = false,
@@ -107,11 +109,11 @@ namespace SixLabors.ImageSharp.Tests
                 }
 
                 var encoder = new PngEncoder
-                                  {
-                                      PngColorType = pngColorType,
-                                      CompressionLevel = compressionLevel,
-                                      PaletteSize = paletteSize
-                                  };
+                {
+                    PngColorType = pngColorType,
+                    CompressionLevel = compressionLevel,
+                    Quantizer = new WuQuantizer(paletteSize)
+                };
 
                 string pngColorTypeInfo = appendPngColorType ? pngColorType.ToString() : "";
                 string compressionLevelInfo = appendCompressionLevel ? $"_C{compressionLevel}" : "";
@@ -121,10 +123,10 @@ namespace SixLabors.ImageSharp.Tests
 
                 // Does DebugSave & load reference CompareToReferenceInput():
                 string actualOutputFile = ((ITestImageProvider)provider).Utility.SaveTestOutputFile(image, "png", encoder, debugInfo, appendPixelType);
-            
+
                 IImageDecoder referenceDecoder = TestEnvironment.GetReferenceDecoder(actualOutputFile);
                 string referenceOutputFile = ((ITestImageProvider)provider).Utility.GetReferenceOutputFileName("png", debugInfo, appendPixelType);
-            
+
                 using (var actualImage = Image.Load<TPixel>(actualOutputFile, referenceDecoder))
                 using (var referenceImage = Image.Load<TPixel>(referenceOutputFile, referenceDecoder))
                 {
@@ -136,7 +138,7 @@ namespace SixLabors.ImageSharp.Tests
                 }
             }
         }
-        
+
         [Theory]
         [WithBlankImages(1, 1, PixelTypes.Rgba32)]
         public void WritesFileMarker<TPixel>(TestImageProvider<TPixel> provider)
@@ -146,8 +148,8 @@ namespace SixLabors.ImageSharp.Tests
             using (var ms = new MemoryStream())
             {
                 image.Save(ms, new PngEncoder());
-                
-                byte[] data = ms.ToArray().Take(8).ToArray(); 
+
+                byte[] data = ms.ToArray().Take(8).ToArray();
                 byte[] expected = {
                     0x89, // Set the high bit.
                     0x50, // P
diff --git a/tests/ImageSharp.Tests/Image/ImageFramesCollectionTests.cs b/tests/ImageSharp.Tests/Image/ImageFramesCollectionTests.cs
index 1f2137070..987805ca1 100644
--- a/tests/ImageSharp.Tests/Image/ImageFramesCollectionTests.cs
+++ b/tests/ImageSharp.Tests/Image/ImageFramesCollectionTests.cs
@@ -69,7 +69,7 @@ namespace SixLabors.ImageSharp.Tests
                 this.collection.AddFrame(new Rgba32[0]);
             });
 
-            Assert.StartsWith("Value must be greater than or equal to 100.", ex.Message);
+            Assert.StartsWith("Value 0 must be greater than or equal to 100.", ex.Message);
         }
 
         [Fact]
diff --git a/tests/ImageSharp.Tests/MetaData/ImageMetaDataTests.cs b/tests/ImageSharp.Tests/MetaData/ImageMetaDataTests.cs
index 1cb35596c..43c53570a 100644
--- a/tests/ImageSharp.Tests/MetaData/ImageMetaDataTests.cs
+++ b/tests/ImageSharp.Tests/MetaData/ImageMetaDataTests.cs
@@ -6,6 +6,8 @@ using SixLabors.ImageSharp.Formats.Gif;
 using SixLabors.ImageSharp.MetaData;
 using SixLabors.ImageSharp.MetaData.Profiles.Exif;
 using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.ImageSharp.Primitives;
+
 using Xunit;
 
 namespace SixLabors.ImageSharp.Tests
diff --git a/tests/ImageSharp.Tests/MetaData/Profiles/Exif/ExifProfileTests.cs b/tests/ImageSharp.Tests/MetaData/Profiles/Exif/ExifProfileTests.cs
index 5e7e9e3a7..65a469b6f 100644
--- a/tests/ImageSharp.Tests/MetaData/Profiles/Exif/ExifProfileTests.cs
+++ b/tests/ImageSharp.Tests/MetaData/Profiles/Exif/ExifProfileTests.cs
@@ -9,6 +9,8 @@ using System.Text;
 using SixLabors.ImageSharp.MetaData;
 using SixLabors.ImageSharp.MetaData.Profiles.Exif;
 using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.ImageSharp.Primitives;
+
 using Xunit;
 
 namespace SixLabors.ImageSharp.Tests
diff --git a/tests/ImageSharp.Tests/Numerics/RationalTests.cs b/tests/ImageSharp.Tests/Numerics/RationalTests.cs
index 61eeed01f..71bf71fa0 100644
--- a/tests/ImageSharp.Tests/Numerics/RationalTests.cs
+++ b/tests/ImageSharp.Tests/Numerics/RationalTests.cs
@@ -2,6 +2,8 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.MetaData.Profiles.Exif;
+using SixLabors.ImageSharp.Primitives;
+
 using Xunit;
 
 namespace SixLabors.ImageSharp.Tests
diff --git a/tests/ImageSharp.Tests/Numerics/SignedRationalTests.cs b/tests/ImageSharp.Tests/Numerics/SignedRationalTests.cs
index af5388d1c..b22e84f3c 100644
--- a/tests/ImageSharp.Tests/Numerics/SignedRationalTests.cs
+++ b/tests/ImageSharp.Tests/Numerics/SignedRationalTests.cs
@@ -2,6 +2,8 @@
 // Licensed under the Apache License, Version 2.0.
 
 using SixLabors.ImageSharp.MetaData.Profiles.Exif;
+using SixLabors.ImageSharp.Primitives;
+
 using Xunit;
 
 namespace SixLabors.ImageSharp.Tests
diff --git a/tests/ImageSharp.Tests/Processing/Binarization/BinaryDitherTest.cs b/tests/ImageSharp.Tests/Processing/Binarization/BinaryDitherTest.cs
index a742171b1..324225a06 100644
--- a/tests/ImageSharp.Tests/Processing/Binarization/BinaryDitherTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Binarization/BinaryDitherTest.cs
@@ -20,8 +20,8 @@ namespace SixLabors.ImageSharp.Tests.Processing.Binarization
 
         public BinaryDitherTest()
         {
-            this.orderedDither = DitherMode.BayerDither4x4;
-            this.errorDiffuser = DiffuseMode.FloydSteinberg;
+            this.orderedDither = KnownDitherers.BayerDither4x4;
+            this.errorDiffuser = KnownDiffusers.FloydSteinberg;
         }
 
         [Fact]
diff --git a/tests/ImageSharp.Tests/Processing/Dithering/DitherTest.cs b/tests/ImageSharp.Tests/Processing/Dithering/DitherTest.cs
index 69aee9bc8..a29fc28c9 100644
--- a/tests/ImageSharp.Tests/Processing/Dithering/DitherTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Dithering/DitherTest.cs
@@ -25,8 +25,8 @@ namespace SixLabors.ImageSharp.Tests.Processing.Binarization
 
         public DitherTest()
         {
-            this.orderedDither = DitherMode.BayerDither4x4;
-            this.errorDiffuser = DiffuseMode.FloydSteinberg;
+            this.orderedDither = KnownDitherers.BayerDither4x4;
+            this.errorDiffuser = KnownDiffusers.FloydSteinberg;
         }
 
         [Fact]
diff --git a/tests/ImageSharp.Tests/Processing/Filters/ColorBlindnessTest.cs b/tests/ImageSharp.Tests/Processing/Filters/ColorBlindnessTest.cs
index 29d18897f..04b916b6e 100644
--- a/tests/ImageSharp.Tests/Processing/Filters/ColorBlindnessTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Filters/ColorBlindnessTest.cs
@@ -17,19 +17,19 @@ namespace SixLabors.ImageSharp.Tests.Processing.Filters
     public class ColorBlindnessTest : BaseImageOperationsExtensionTest
     {
         public static IEnumerable<object[]> TheoryData = new[] {
-            new object[]{ new TestType<AchromatomalyProcessor<Rgba32>>(), ColorBlindness.Achromatomaly },
-            new object[]{ new TestType<AchromatopsiaProcessor<Rgba32>>(), ColorBlindness.Achromatopsia },
-            new object[]{ new TestType<DeuteranomalyProcessor<Rgba32>>(), ColorBlindness.Deuteranomaly },
-            new object[]{ new TestType<DeuteranopiaProcessor<Rgba32>>(), ColorBlindness.Deuteranopia },
-            new object[]{ new TestType<ProtanomalyProcessor<Rgba32>>(), ColorBlindness.Protanomaly },
-            new object[]{ new TestType<ProtanopiaProcessor<Rgba32>>(), ColorBlindness.Protanopia },
-            new object[]{ new TestType<TritanomalyProcessor<Rgba32>>(), ColorBlindness.Tritanomaly },
-            new object[]{ new TestType<TritanopiaProcessor<Rgba32>>(), ColorBlindness.Tritanopia }
+            new object[]{ new TestType<AchromatomalyProcessor<Rgba32>>(), ColorBlindnessMode.Achromatomaly },
+            new object[]{ new TestType<AchromatopsiaProcessor<Rgba32>>(), ColorBlindnessMode.Achromatopsia },
+            new object[]{ new TestType<DeuteranomalyProcessor<Rgba32>>(), ColorBlindnessMode.Deuteranomaly },
+            new object[]{ new TestType<DeuteranopiaProcessor<Rgba32>>(), ColorBlindnessMode.Deuteranopia },
+            new object[]{ new TestType<ProtanomalyProcessor<Rgba32>>(), ColorBlindnessMode.Protanomaly },
+            new object[]{ new TestType<ProtanopiaProcessor<Rgba32>>(), ColorBlindnessMode.Protanopia },
+            new object[]{ new TestType<TritanomalyProcessor<Rgba32>>(), ColorBlindnessMode.Tritanomaly },
+            new object[]{ new TestType<TritanopiaProcessor<Rgba32>>(), ColorBlindnessMode.Tritanopia }
         };
 
         [Theory]
         [MemberData(nameof(TheoryData))]
-        public void ColorBlindness_CorrectProcessor<T>(TestType<T> testType, ColorBlindness colorBlindness)
+        public void ColorBlindness_CorrectProcessor<T>(TestType<T> testType, ColorBlindnessMode colorBlindness)
             where T : IImageProcessor<Rgba32>
         {
             this.operations.ColorBlindness(colorBlindness);
@@ -37,7 +37,7 @@ namespace SixLabors.ImageSharp.Tests.Processing.Filters
         }
         [Theory]
         [MemberData(nameof(TheoryData))]
-        public void ColorBlindness_rect_CorrectProcessor<T>(TestType<T> testType, ColorBlindness colorBlindness)
+        public void ColorBlindness_rect_CorrectProcessor<T>(TestType<T> testType, ColorBlindnessMode colorBlindness)
             where T : IImageProcessor<Rgba32>
         {
             this.operations.ColorBlindness(colorBlindness, this.rect);
diff --git a/tests/ImageSharp.Tests/Processing/Filters/FilterTest.cs b/tests/ImageSharp.Tests/Processing/Filters/FilterTest.cs
index 77325b24c..cac1d7057 100644
--- a/tests/ImageSharp.Tests/Processing/Filters/FilterTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Filters/FilterTest.cs
@@ -16,14 +16,14 @@ namespace SixLabors.ImageSharp.Tests.Processing.Filters
         [Fact]
         public void Filter_CorrectProcessor()
         {
-            this.operations.Filter(MatrixFilters.AchromatomalyFilter * MatrixFilters.CreateHueFilter(90F));
+            this.operations.Filter(KnownFilterMatrices.AchromatomalyFilter * KnownFilterMatrices.CreateHueFilter(90F));
             FilterProcessor<Rgba32> p = this.Verify<FilterProcessor<Rgba32>>();
         }
 
         [Fact]
         public void Filter_rect_CorrectProcessor()
         {
-            this.operations.Filter(MatrixFilters.AchromatomalyFilter * MatrixFilters.CreateHueFilter(90F), this.rect);
+            this.operations.Filter(KnownFilterMatrices.AchromatomalyFilter * KnownFilterMatrices.CreateHueFilter(90F), this.rect);
             FilterProcessor<Rgba32> p = this.Verify<FilterProcessor<Rgba32>>(this.rect);
         }
     }
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Binarization/BinaryDitherTests.cs b/tests/ImageSharp.Tests/Processing/Processors/Binarization/BinaryDitherTests.cs
index 293757339..f99fe0c2a 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Binarization/BinaryDitherTests.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Binarization/BinaryDitherTests.cs
@@ -25,29 +25,29 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Binarization
 
         public static readonly TheoryData<string, IOrderedDither> OrderedDitherers = new TheoryData<string, IOrderedDither>
         {
-            { "Bayer8x8", DitherMode.BayerDither8x8 },
-            { "Bayer4x4", DitherMode.BayerDither4x4 },
-            { "Ordered3x3", DitherMode.OrderedDither3x3 },
-            { "Bayer2x2", DitherMode.BayerDither2x2 }
+            { "Bayer8x8", KnownDitherers.BayerDither8x8 },
+            { "Bayer4x4", KnownDitherers.BayerDither4x4 },
+            { "Ordered3x3", KnownDitherers.OrderedDither3x3 },
+            { "Bayer2x2", KnownDitherers.BayerDither2x2 }
         };
 
         public static readonly TheoryData<string, IErrorDiffuser> ErrorDiffusers = new TheoryData<string, IErrorDiffuser>
         {
-            { "Atkinson", DiffuseMode.Atkinson },
-            { "Burks", DiffuseMode.Burks },
-            { "FloydSteinberg", DiffuseMode.FloydSteinberg },
-            { "JarvisJudiceNinke", DiffuseMode.JarvisJudiceNinke },
-            { "Sierra2", DiffuseMode.Sierra2 },
-            { "Sierra3", DiffuseMode.Sierra3 },
-            { "SierraLite", DiffuseMode.SierraLite },
-            { "StevensonArce", DiffuseMode.StevensonArce },
-            { "Stucki", DiffuseMode.Stucki },
+            { "Atkinson", KnownDiffusers.Atkinson },
+            { "Burks", KnownDiffusers.Burks },
+            { "FloydSteinberg", KnownDiffusers.FloydSteinberg },
+            { "JarvisJudiceNinke", KnownDiffusers.JarvisJudiceNinke },
+            { "Sierra2", KnownDiffusers.Sierra2 },
+            { "Sierra3", KnownDiffusers.Sierra3 },
+            { "SierraLite", KnownDiffusers.SierraLite },
+            { "StevensonArce", KnownDiffusers.StevensonArce },
+            { "Stucki", KnownDiffusers.Stucki },
         };
 
 
-        private static IOrderedDither DefaultDitherer => DitherMode.BayerDither4x4;
+        private static IOrderedDither DefaultDitherer => KnownDitherers.BayerDither4x4;
 
-        private static IErrorDiffuser DefaultErrorDiffuser => DiffuseMode.Atkinson;
+        private static IErrorDiffuser DefaultErrorDiffuser => KnownDiffusers.Atkinson;
 
         [Theory]
         [WithFileCollection(nameof(CommonTestImages), nameof(OrderedDitherers), DefaultPixelType)]
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Dithering/DitherTests.cs b/tests/ImageSharp.Tests/Processing/Processors/Dithering/DitherTests.cs
index 3bb3aedfc..de2eff2ee 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Dithering/DitherTests.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Dithering/DitherTests.cs
@@ -24,29 +24,29 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Binarization
 
         public static readonly TheoryData<string, IOrderedDither> OrderedDitherers = new TheoryData<string, IOrderedDither>
         {
-            { "Bayer8x8", DitherMode.BayerDither8x8 },
-            { "Bayer4x4", DitherMode.BayerDither4x4 },
-            { "Ordered3x3", DitherMode.OrderedDither3x3 },
-            { "Bayer2x2", DitherMode.BayerDither2x2 }
+            { "Bayer8x8", KnownDitherers.BayerDither8x8 },
+            { "Bayer4x4", KnownDitherers.BayerDither4x4 },
+            { "Ordered3x3", KnownDitherers.OrderedDither3x3 },
+            { "Bayer2x2", KnownDitherers.BayerDither2x2 }
         };
 
         public static readonly TheoryData<string, IErrorDiffuser> ErrorDiffusers = new TheoryData<string, IErrorDiffuser>
         {
-            { "Atkinson", DiffuseMode.Atkinson },
-            { "Burks", DiffuseMode.Burks },
-            { "FloydSteinberg", DiffuseMode.FloydSteinberg },
-            { "JarvisJudiceNinke", DiffuseMode.JarvisJudiceNinke },
-            { "Sierra2", DiffuseMode.Sierra2 },
-            { "Sierra3", DiffuseMode.Sierra3 },
-            { "SierraLite", DiffuseMode.SierraLite },
-            { "StevensonArce", DiffuseMode.StevensonArce },
-            { "Stucki", DiffuseMode.Stucki },
+            { "Atkinson", KnownDiffusers.Atkinson },
+            { "Burks", KnownDiffusers.Burks },
+            { "FloydSteinberg", KnownDiffusers.FloydSteinberg },
+            { "JarvisJudiceNinke", KnownDiffusers.JarvisJudiceNinke },
+            { "Sierra2", KnownDiffusers.Sierra2 },
+            { "Sierra3", KnownDiffusers.Sierra3 },
+            { "SierraLite", KnownDiffusers.SierraLite },
+            { "StevensonArce", KnownDiffusers.StevensonArce },
+            { "Stucki", KnownDiffusers.Stucki },
         };
 
 
-        private static IOrderedDither DefaultDitherer => DitherMode.BayerDither4x4;
+        private static IOrderedDither DefaultDitherer => KnownDitherers.BayerDither4x4;
 
-        private static IErrorDiffuser DefaultErrorDiffuser => DiffuseMode.Atkinson;
+        private static IErrorDiffuser DefaultErrorDiffuser => KnownDiffusers.Atkinson;
 
         [Theory]
         [WithFileCollection(nameof(CommonTestImages), nameof(OrderedDitherers), DefaultPixelType)]
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Filters/ColorBlindnessTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Filters/ColorBlindnessTest.cs
index b0dcbd726..fd7724531 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Filters/ColorBlindnessTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Filters/ColorBlindnessTest.cs
@@ -13,22 +13,22 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Filters
     [GroupOutput("Filters")]
     public class ColorBlindnessTest
     {
-        public static readonly TheoryData<ColorBlindness> ColorBlindnessFilters
-        = new TheoryData<ColorBlindness>
+        public static readonly TheoryData<ColorBlindnessMode> ColorBlindnessFilters
+        = new TheoryData<ColorBlindnessMode>
         {
-            ColorBlindness.Achromatomaly,
-            ColorBlindness.Achromatopsia,
-            ColorBlindness.Deuteranomaly,
-            ColorBlindness.Deuteranopia,
-            ColorBlindness.Protanomaly,
-            ColorBlindness.Protanopia,
-            ColorBlindness.Tritanomaly,
-            ColorBlindness.Tritanopia
+            ColorBlindnessMode.Achromatomaly,
+            ColorBlindnessMode.Achromatopsia,
+            ColorBlindnessMode.Deuteranomaly,
+            ColorBlindnessMode.Deuteranopia,
+            ColorBlindnessMode.Protanomaly,
+            ColorBlindnessMode.Protanopia,
+            ColorBlindnessMode.Tritanomaly,
+            ColorBlindnessMode.Tritanopia
         };
 
         [Theory]
         [WithTestPatternImages(nameof(ColorBlindnessFilters), 48, 48, PixelTypes.Rgba32)]
-        public void ApplyColorBlindnessFilter<TPixel>(TestImageProvider<TPixel> provider, ColorBlindness colorBlindness)
+        public void ApplyColorBlindnessFilter<TPixel>(TestImageProvider<TPixel> provider, ColorBlindnessMode colorBlindness)
             where TPixel : struct, IPixel<TPixel>
         {
             provider.RunValidatingProcessorTest(x => x.ColorBlindness(colorBlindness), colorBlindness.ToString());
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Filters/FilterTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Filters/FilterTest.cs
index 077073b4c..190e117b3 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Filters/FilterTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Filters/FilterTest.cs
@@ -40,9 +40,9 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Filters
 
         private static Matrix4x4 CreateCombinedTestFilterMatrix()
         {
-            Matrix4x4 brightness = MatrixFilters.CreateBrightnessFilter(0.9F);
-            Matrix4x4 hue = MatrixFilters.CreateHueFilter(180F);
-            Matrix4x4 saturation = MatrixFilters.CreateSaturateFilter(1.5F);
+            Matrix4x4 brightness = KnownFilterMatrices.CreateBrightnessFilter(0.9F);
+            Matrix4x4 hue = KnownFilterMatrices.CreateHueFilter(180F);
+            Matrix4x4 saturation = KnownFilterMatrices.CreateSaturateFilter(1.5F);
             Matrix4x4 m = brightness * hue * saturation;
             return m;
         }
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Transforms/AutoOrientTests.cs b/tests/ImageSharp.Tests/Processing/Processors/Transforms/AutoOrientTests.cs
index fb1a7f0a3..d421a5936 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Transforms/AutoOrientTests.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Transforms/AutoOrientTests.cs
@@ -15,18 +15,18 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Transforms
     {
         public static readonly string[] FlipFiles = { TestImages.Bmp.F };
 
-        public static readonly TheoryData<RotateType, FlipType, ushort> OrientationValues
-            = new TheoryData<RotateType, FlipType, ushort>
+        public static readonly TheoryData<RotateMode, FlipMode, ushort> OrientationValues
+            = new TheoryData<RotateMode, FlipMode, ushort>
         {
-            { RotateType.None,      FlipType.None,       0 },
-            { RotateType.None,      FlipType.None,       1 },
-            { RotateType.None,      FlipType.Horizontal, 2 },
-            { RotateType.Rotate180, FlipType.None,       3 },
-            { RotateType.Rotate180, FlipType.Horizontal, 4 },
-            { RotateType.Rotate90,  FlipType.Horizontal, 5 },
-            { RotateType.Rotate270, FlipType.None,       6 },
-            { RotateType.Rotate90,  FlipType.Vertical,   7 },
-            { RotateType.Rotate90,  FlipType.None,       8 },
+            { RotateMode.None,      FlipMode.None,       0 },
+            { RotateMode.None,      FlipMode.None,       1 },
+            { RotateMode.None,      FlipMode.Horizontal, 2 },
+            { RotateMode.Rotate180, FlipMode.None,       3 },
+            { RotateMode.Rotate180, FlipMode.Horizontal, 4 },
+            { RotateMode.Rotate90,  FlipMode.Horizontal, 5 },
+            { RotateMode.Rotate270, FlipMode.None,       6 },
+            { RotateMode.Rotate90,  FlipMode.Vertical,   7 },
+            { RotateMode.Rotate90,  FlipMode.None,       8 },
         };
 
         public static readonly TheoryData<ExifDataType, byte[]> InvalidOrientationValues
@@ -41,7 +41,7 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Transforms
 
         [Theory]
         [WithFileCollection(nameof(FlipFiles), nameof(OrientationValues), DefaultPixelType)]
-        public void ImageShouldAutoRotate<TPixel>(TestImageProvider<TPixel> provider, RotateType rotateType, FlipType flipType, ushort orientation)
+        public void ImageShouldAutoRotate<TPixel>(TestImageProvider<TPixel> provider, RotateMode rotateType, FlipMode flipType, ushort orientation)
             where TPixel : struct, IPixel<TPixel>
         {
             using (Image<TPixel> image = provider.GetImage())
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Transforms/FlipTests.cs b/tests/ImageSharp.Tests/Processing/Processors/Transforms/FlipTests.cs
index 7a4743e44..b1ce7ae1f 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Transforms/FlipTests.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Transforms/FlipTests.cs
@@ -13,17 +13,17 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Transforms
     {
         public static readonly string[] FlipFiles = { TestImages.Bmp.F };
 
-        public static readonly TheoryData<FlipType> FlipValues
-            = new TheoryData<FlipType>
+        public static readonly TheoryData<FlipMode> FlipValues
+            = new TheoryData<FlipMode>
         {
-            { FlipType.None },
-            { FlipType.Vertical },
-            { FlipType.Horizontal },
+            { FlipMode.None },
+            { FlipMode.Vertical },
+            { FlipMode.Horizontal },
         };
 
         [Theory]
         [WithFileCollection(nameof(FlipFiles), nameof(FlipValues), DefaultPixelType)]
-        public void ImageShouldFlip<TPixel>(TestImageProvider<TPixel> provider, FlipType flipType)
+        public void ImageShouldFlip<TPixel>(TestImageProvider<TPixel> provider, FlipMode flipType)
             where TPixel : struct, IPixel<TPixel>
         {
             using (Image<TPixel> image = provider.GetImage())
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeProfilingBenchmarks.cs b/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeProfilingBenchmarks.cs
index bbb0b1db9..cf070ccbb 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeProfilingBenchmarks.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeProfilingBenchmarks.cs
@@ -45,7 +45,7 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Transforms
         public void PrintWeightsData()
         {
             var size = new Size(500, 500);
-            var proc = new ResizeProcessor<Rgba32>(ResampleMode.Bicubic, 200, 200, size);
+            var proc = new ResizeProcessor<Rgba32>(KnownResamplers.Bicubic, 200, 200, size);
 
             WeightsBuffer weights = proc.PrecomputeWeights(Configuration.Default.MemoryManager, proc.Width, size.Width);
 
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeTests.cs b/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeTests.cs
index 46e7b119e..ae763d65c 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeTests.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeTests.cs
@@ -20,20 +20,20 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Transforms
         public static readonly TheoryData<string, IResampler> AllReSamplers =
             new TheoryData<string, IResampler>
             {
-                { "Bicubic", ResampleMode.Bicubic },
-                { "Triangle", ResampleMode.Triangle},
-                { "NearestNeighbor", ResampleMode.NearestNeighbor },
-                { "Box", ResampleMode.Box },
+                { "Bicubic", KnownResamplers.Bicubic },
+                { "Triangle", KnownResamplers.Triangle},
+                { "NearestNeighbor", KnownResamplers.NearestNeighbor },
+                { "Box", KnownResamplers.Box },
                 // { "Lanczos2", KnownResamplers.Lanczos2 }, TODO: Add expected file
-                { "Lanczos3", ResampleMode.Lanczos3 },
-                { "Lanczos5", ResampleMode.Lanczos5 },
-                { "MitchellNetravali", ResampleMode.MitchellNetravali  },
-                { "Lanczos8", ResampleMode.Lanczos8  },
-                { "Hermite", ResampleMode.Hermite  },
-                { "Spline", ResampleMode.Spline  },
-                { "Robidoux", ResampleMode.Robidoux  },
-                { "RobidouxSharp", ResampleMode.RobidouxSharp },
-                { "Welch", ResampleMode.Welch  }
+                { "Lanczos3", KnownResamplers.Lanczos3 },
+                { "Lanczos5", KnownResamplers.Lanczos5 },
+                { "MitchellNetravali", KnownResamplers.MitchellNetravali  },
+                { "Lanczos8", KnownResamplers.Lanczos8  },
+                { "Hermite", KnownResamplers.Hermite  },
+                { "Spline", KnownResamplers.Spline  },
+                { "Robidoux", KnownResamplers.Robidoux  },
+                { "RobidouxSharp", KnownResamplers.RobidouxSharp },
+                { "Welch", KnownResamplers.Welch  }
             };
 
         [Theory]
@@ -102,7 +102,7 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Transforms
         {
             using (Image<TPixel> image = provider.GetImage())
             {
-                image.Mutate(x => x.Resize(image.Width / 2, image.Height / 2, ResampleMode.NearestNeighbor));
+                image.Mutate(x => x.Resize(image.Width / 2, image.Height / 2, KnownResamplers.NearestNeighbor));
 
                 // Comparer fights decoder with gif-s. Could not use CompareToReferenceOutput here :(
                 image.DebugSave(provider, extension: Extensions.Gif);
@@ -119,7 +119,7 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Transforms
                 var sourceRectangle = new Rectangle(image.Width / 8, image.Height / 8, image.Width / 4, image.Height / 4);
                 var destRectangle = new Rectangle(image.Width / 4, image.Height / 4, image.Width / 2, image.Height / 2);
 
-                image.Mutate(x => x.Resize(image.Width, image.Height, ResampleMode.Bicubic, sourceRectangle, destRectangle, false));
+                image.Mutate(x => x.Resize(image.Width, image.Height, KnownResamplers.Bicubic, sourceRectangle, destRectangle, false));
 
                 image.DebugSave(provider);
                 image.CompareToReferenceOutput(provider);
@@ -300,7 +300,7 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Transforms
         [InlineData(2, 0)]
         public static void BicubicWindowOscillatesCorrectly(float x, float expected)
         {
-            var sampler = ResampleMode.Bicubic;
+            var sampler = KnownResamplers.Bicubic;
             float result = sampler.GetValue(x);
 
             Assert.Equal(result, expected);
@@ -314,7 +314,7 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Transforms
         [InlineData(2, 0)]
         public static void TriangleWindowOscillatesCorrectly(float x, float expected)
         {
-            var sampler = ResampleMode.Triangle;
+            var sampler = KnownResamplers.Triangle;
             float result = sampler.GetValue(x);
 
             Assert.Equal(result, expected);
@@ -328,7 +328,7 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Transforms
         [InlineData(2, 0)]
         public static void Lanczos3WindowOscillatesCorrectly(float x, float expected)
         {
-            var sampler = ResampleMode.Lanczos3;
+            var sampler = KnownResamplers.Lanczos3;
             float result = sampler.GetValue(x);
 
             Assert.Equal(result, expected);
@@ -342,7 +342,7 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Transforms
         [InlineData(4, 0)]
         public static void Lanczos5WindowOscillatesCorrectly(float x, float expected)
         {
-            var sampler = ResampleMode.Lanczos5;
+            var sampler = KnownResamplers.Lanczos5;
             float result = sampler.GetValue(x);
 
             Assert.Equal(result, expected);
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Transforms/RotateFlipTests.cs b/tests/ImageSharp.Tests/Processing/Processors/Transforms/RotateFlipTests.cs
index f15ed3cc7..b2865d9da 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Transforms/RotateFlipTests.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Transforms/RotateFlipTests.cs
@@ -13,20 +13,20 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Transforms
     {
         public static readonly string[] FlipFiles = { TestImages.Bmp.F };
 
-        public static readonly TheoryData<RotateType, FlipType> RotateFlipValues
-            = new TheoryData<RotateType, FlipType>
+        public static readonly TheoryData<RotateMode, FlipMode> RotateFlipValues
+            = new TheoryData<RotateMode, FlipMode>
         {
-            { RotateType.None, FlipType.Vertical },
-            { RotateType.None, FlipType.Horizontal },
-            { RotateType.Rotate90, FlipType.None },
-            { RotateType.Rotate180, FlipType.None },
-            { RotateType.Rotate270, FlipType.None },
+            { RotateMode.None, FlipMode.Vertical },
+            { RotateMode.None, FlipMode.Horizontal },
+            { RotateMode.Rotate90, FlipMode.None },
+            { RotateMode.Rotate180, FlipMode.None },
+            { RotateMode.Rotate270, FlipMode.None },
         };
 
         [Theory]
         [WithTestPatternImages(nameof(RotateFlipValues), 100, 50, DefaultPixelType)]
         [WithTestPatternImages(nameof(RotateFlipValues), 50, 100, DefaultPixelType)]
-        public void RotateFlip<TPixel>(TestImageProvider<TPixel> provider, RotateType rotateType, FlipType flipType)
+        public void RotateFlip<TPixel>(TestImageProvider<TPixel> provider, RotateMode rotateType, FlipMode flipType)
             where TPixel : struct, IPixel<TPixel>
         {
             using (Image<TPixel> image = provider.GetImage())
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Transforms/RotateTests.cs b/tests/ImageSharp.Tests/Processing/Processors/Transforms/RotateTests.cs
index 54e2a4a18..f9c2d83c8 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Transforms/RotateTests.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Transforms/RotateTests.cs
@@ -21,13 +21,13 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Transforms
             50, -50, 170, -170
         };
 
-        public static readonly TheoryData<RotateType> RotateEnumValues
-            = new TheoryData<RotateType>
+        public static readonly TheoryData<RotateMode> RotateEnumValues
+            = new TheoryData<RotateMode>
         {
-            RotateType.None,
-            RotateType.Rotate90,
-            RotateType.Rotate180,
-            RotateType.Rotate270
+            RotateMode.None,
+            RotateMode.Rotate90,
+            RotateMode.Rotate180,
+            RotateMode.Rotate270
         };
         
         [Theory]
@@ -46,7 +46,7 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Transforms
         [Theory]
         [WithTestPatternImages(nameof(RotateEnumValues), 100, 50, DefaultPixelType)]
         [WithTestPatternImages(nameof(RotateEnumValues), 50, 100, DefaultPixelType)]
-        public void Rotate_WithRotateTypeEnum<TPixel>(TestImageProvider<TPixel> provider, RotateType value)
+        public void Rotate_WithRotateTypeEnum<TPixel>(TestImageProvider<TPixel> provider, RotateMode value)
             where TPixel : struct, IPixel<TPixel>
         {
             using (Image<TPixel> image = provider.GetImage())
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Transforms/SkewTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Transforms/SkewTest.cs
index 174aadf60..30c9e682d 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Transforms/SkewTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Transforms/SkewTest.cs
@@ -26,21 +26,21 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Transforms
         public static readonly List<string> ResamplerNames
             = new List<string>
         {
-            nameof(ResampleMode.Bicubic),
-            nameof(ResampleMode.Box),
-            nameof(ResampleMode.CatmullRom),
-            nameof(ResampleMode.Hermite),
-            nameof(ResampleMode.Lanczos2),
-            nameof(ResampleMode.Lanczos3),
-            nameof(ResampleMode.Lanczos5),
-            nameof(ResampleMode.Lanczos8),
-            nameof(ResampleMode.MitchellNetravali),
-            nameof(ResampleMode.NearestNeighbor),
-            nameof(ResampleMode.Robidoux),
-            nameof(ResampleMode.RobidouxSharp),
-            nameof(ResampleMode.Spline),
-            nameof(ResampleMode.Triangle),
-            nameof(ResampleMode.Welch),
+            nameof(KnownResamplers.Bicubic),
+            nameof(KnownResamplers.Box),
+            nameof(KnownResamplers.CatmullRom),
+            nameof(KnownResamplers.Hermite),
+            nameof(KnownResamplers.Lanczos2),
+            nameof(KnownResamplers.Lanczos3),
+            nameof(KnownResamplers.Lanczos5),
+            nameof(KnownResamplers.Lanczos8),
+            nameof(KnownResamplers.MitchellNetravali),
+            nameof(KnownResamplers.NearestNeighbor),
+            nameof(KnownResamplers.Robidoux),
+            nameof(KnownResamplers.RobidouxSharp),
+            nameof(KnownResamplers.Spline),
+            nameof(KnownResamplers.Triangle),
+            nameof(KnownResamplers.Welch),
         };
 
         [Theory]
@@ -73,7 +73,7 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Transforms
 
         private static IResampler GetResampler(string name)
         {
-            PropertyInfo property = typeof(ResampleMode).GetTypeInfo().GetProperty(name);
+            PropertyInfo property = typeof(KnownResamplers).GetTypeInfo().GetProperty(name);
 
             if (property == null)
             {
diff --git a/tests/ImageSharp.Tests/Processing/Transforms/AffineTransformTests.cs b/tests/ImageSharp.Tests/Processing/Transforms/AffineTransformTests.cs
index 02144e073..605f4075a 100644
--- a/tests/ImageSharp.Tests/Processing/Transforms/AffineTransformTests.cs
+++ b/tests/ImageSharp.Tests/Processing/Transforms/AffineTransformTests.cs
@@ -38,30 +38,30 @@ namespace SixLabors.ImageSharp.Tests.Processing.Transforms
         public static readonly TheoryData<string> ResamplerNames =
             new TheoryData<string>
                   {
-                      nameof(ResampleMode.Bicubic),
-                      nameof(ResampleMode.Box),
-                      nameof(ResampleMode.CatmullRom),
-                      nameof(ResampleMode.Hermite),
-                      nameof(ResampleMode.Lanczos2),
-                      nameof(ResampleMode.Lanczos3),
-                      nameof(ResampleMode.Lanczos5),
-                      nameof(ResampleMode.Lanczos8),
-                      nameof(ResampleMode.MitchellNetravali),
-                      nameof(ResampleMode.NearestNeighbor),
-                      nameof(ResampleMode.Robidoux),
-                      nameof(ResampleMode.RobidouxSharp),
-                      nameof(ResampleMode.Spline),
-                      nameof(ResampleMode.Triangle),
-                      nameof(ResampleMode.Welch),
+                      nameof(KnownResamplers.Bicubic),
+                      nameof(KnownResamplers.Box),
+                      nameof(KnownResamplers.CatmullRom),
+                      nameof(KnownResamplers.Hermite),
+                      nameof(KnownResamplers.Lanczos2),
+                      nameof(KnownResamplers.Lanczos3),
+                      nameof(KnownResamplers.Lanczos5),
+                      nameof(KnownResamplers.Lanczos8),
+                      nameof(KnownResamplers.MitchellNetravali),
+                      nameof(KnownResamplers.NearestNeighbor),
+                      nameof(KnownResamplers.Robidoux),
+                      nameof(KnownResamplers.RobidouxSharp),
+                      nameof(KnownResamplers.Spline),
+                      nameof(KnownResamplers.Triangle),
+                      nameof(KnownResamplers.Welch),
                   };
 
         public static readonly TheoryData<string> Transform_DoesNotCreateEdgeArtifacts_ResamplerNames =
             new TheoryData<string>
                 {
-                    nameof(ResampleMode.NearestNeighbor),
-                    nameof(ResampleMode.Triangle),
-                    nameof(ResampleMode.Bicubic),
-                    nameof(ResampleMode.Lanczos8),
+                    nameof(KnownResamplers.NearestNeighbor),
+                    nameof(KnownResamplers.Triangle),
+                    nameof(KnownResamplers.Bicubic),
+                    nameof(KnownResamplers.Lanczos8),
                 };
 
         public AffineTransformTests(ITestOutputHelper output)
@@ -113,7 +113,7 @@ namespace SixLabors.ImageSharp.Tests.Processing.Transforms
 
                 this.PrintMatrix(m);
 
-                image.Mutate(i => i.Transform(m, ResampleMode.Bicubic));
+                image.Mutate(i => i.Transform(m, KnownResamplers.Bicubic));
 
                 string testOutputDetails = $"R({angleDeg})_S({sx},{sy})_T({tx},{ty})";
                 image.DebugSave(provider, testOutputDetails);
@@ -130,7 +130,7 @@ namespace SixLabors.ImageSharp.Tests.Processing.Transforms
             {
                 Matrix3x2 m = this.MakeManuallyCenteredMatrix(angleDeg, s, image);
 
-                image.Mutate(i => i.Transform(m, ResampleMode.Bicubic));
+                image.Mutate(i => i.Transform(m, KnownResamplers.Bicubic));
 
                 string testOutputDetails = $"R({angleDeg})_S({s})";
                 image.DebugSave(provider, testOutputDetails);
@@ -163,7 +163,7 @@ namespace SixLabors.ImageSharp.Tests.Processing.Transforms
             {
                 var m = Matrix3x2.CreateScale(2.0F, 1.5F);
                 
-                image.Mutate(i => i.Transform(m, ResampleMode.Spline, rectangle));
+                image.Mutate(i => i.Transform(m, KnownResamplers.Spline, rectangle));
 
                 image.DebugSave(provider);
                 image.CompareToReferenceOutput(provider);
@@ -181,7 +181,7 @@ namespace SixLabors.ImageSharp.Tests.Processing.Transforms
             {
                 var m = Matrix3x2.CreateScale(1.0F, 2.0F);
 
-                image.Mutate(i => i.Transform(m, ResampleMode.Spline, rectangle));
+                image.Mutate(i => i.Transform(m, KnownResamplers.Spline, rectangle));
 
                 image.DebugSave(provider);
                 image.CompareToReferenceOutput(provider);
@@ -225,7 +225,7 @@ namespace SixLabors.ImageSharp.Tests.Processing.Transforms
 
         private static IResampler GetResampler(string name)
         {
-            PropertyInfo property = typeof(ResampleMode).GetTypeInfo().GetProperty(name);
+            PropertyInfo property = typeof(KnownResamplers).GetTypeInfo().GetProperty(name);
 
             if (property == null)
             {
diff --git a/tests/ImageSharp.Tests/Processing/Transforms/FlipTests.cs b/tests/ImageSharp.Tests/Processing/Transforms/FlipTests.cs
index 0ab9978d1..41aeb1ad5 100644
--- a/tests/ImageSharp.Tests/Processing/Transforms/FlipTests.cs
+++ b/tests/ImageSharp.Tests/Processing/Transforms/FlipTests.cs
@@ -16,15 +16,15 @@ namespace SixLabors.ImageSharp.Tests.Processing.Transforms
     {
 
         [Theory]
-        [InlineData(FlipType.None)]
-        [InlineData(FlipType.Horizontal)]
-        [InlineData(FlipType.Vertical)]
-        public void Flip_degreesFloat_RotateProcessorWithAnglesSetAndExpandTrue(FlipType flip)
+        [InlineData(FlipMode.None)]
+        [InlineData(FlipMode.Horizontal)]
+        [InlineData(FlipMode.Vertical)]
+        public void Flip_degreesFloat_RotateProcessorWithAnglesSetAndExpandTrue(FlipMode flip)
         {
             this.operations.Flip(flip);
             FlipProcessor<Rgba32> flipProcessor = this.Verify<FlipProcessor<Rgba32>>();
 
-            Assert.Equal(flip, flipProcessor.FlipType);
+            Assert.Equal(flip, flipProcessor.FlipMode);
         }
     }
 }
diff --git a/tests/ImageSharp.Tests/Processing/Transforms/PadTest.cs b/tests/ImageSharp.Tests/Processing/Transforms/PadTest.cs
index 6d7816f59..dd4c31458 100644
--- a/tests/ImageSharp.Tests/Processing/Transforms/PadTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Transforms/PadTest.cs
@@ -17,7 +17,7 @@ namespace SixLabors.ImageSharp.Tests.Processing.Transforms
         {
             int width = 500;
             int height = 565;
-            IResampler sampler = ResampleMode.NearestNeighbor;
+            IResampler sampler = KnownResamplers.NearestNeighbor;
 
             this.operations.Pad(width, height);
             ResizeProcessor<Rgba32> resizeProcessor = this.Verify<ResizeProcessor<Rgba32>>();
diff --git a/tests/ImageSharp.Tests/Processing/Transforms/ResizeTests.cs b/tests/ImageSharp.Tests/Processing/Transforms/ResizeTests.cs
index 853f4b3e6..ee72f361b 100644
--- a/tests/ImageSharp.Tests/Processing/Transforms/ResizeTests.cs
+++ b/tests/ImageSharp.Tests/Processing/Transforms/ResizeTests.cs
@@ -29,7 +29,7 @@ namespace SixLabors.ImageSharp.Tests.Processing.Transforms
         {
             int width = 50;
             int height = 100;
-            IResampler sampler = ResampleMode.Lanczos3;
+            IResampler sampler = KnownResamplers.Lanczos3;
             this.operations.Resize(width, height, sampler);
             ResizeProcessor<Rgba32> resizeProcessor = this.Verify<ResizeProcessor<Rgba32>>();
 
@@ -43,7 +43,7 @@ namespace SixLabors.ImageSharp.Tests.Processing.Transforms
         {
             int width = 50;
             int height = 100;
-            IResampler sampler = ResampleMode.Lanczos3;
+            IResampler sampler = KnownResamplers.Lanczos3;
             bool compand = true;
 
             // ReSharper disable once ConditionIsAlwaysTrueOrFalse
@@ -61,7 +61,7 @@ namespace SixLabors.ImageSharp.Tests.Processing.Transforms
         {
             int width = 50;
             int height = 100;
-            IResampler sampler = ResampleMode.Lanczos3;
+            IResampler sampler = KnownResamplers.Lanczos3;
             bool compand = true;
             ResizeMode mode = ResizeMode.Stretch;
 
diff --git a/tests/ImageSharp.Tests/Processing/Transforms/RotateFlipTests.cs b/tests/ImageSharp.Tests/Processing/Transforms/RotateFlipTests.cs
index 3d443b70c..9a396e871 100644
--- a/tests/ImageSharp.Tests/Processing/Transforms/RotateFlipTests.cs
+++ b/tests/ImageSharp.Tests/Processing/Transforms/RotateFlipTests.cs
@@ -11,26 +11,26 @@ namespace SixLabors.ImageSharp.Tests.Processing.Transforms
     public class RotateFlipTests : BaseImageOperationsExtensionTest
     {
         [Theory]
-        [InlineData(RotateType.None, FlipType.None, 0)]
-        [InlineData(RotateType.Rotate90, FlipType.None, 90)]
-        [InlineData(RotateType.Rotate180, FlipType.None, 180)]
-        [InlineData(RotateType.Rotate270, FlipType.None, 270)]
-        [InlineData(RotateType.None, FlipType.Horizontal, 0)]
-        [InlineData(RotateType.Rotate90, FlipType.Horizontal, 90)]
-        [InlineData(RotateType.Rotate180, FlipType.Horizontal, 180)]
-        [InlineData(RotateType.Rotate270, FlipType.Horizontal, 270)]
-        [InlineData(RotateType.None, FlipType.Vertical, 0)]
-        [InlineData(RotateType.Rotate90, FlipType.Vertical, 90)]
-        [InlineData(RotateType.Rotate180, FlipType.Vertical, 180)]
-        [InlineData(RotateType.Rotate270, FlipType.Vertical, 270)]
-        public void RotateDegreesFloatRotateProcessorWithAnglesSet(RotateType angle, FlipType flip, float expectedAngle)
+        [InlineData(RotateMode.None, FlipMode.None, 0)]
+        [InlineData(RotateMode.Rotate90, FlipMode.None, 90)]
+        [InlineData(RotateMode.Rotate180, FlipMode.None, 180)]
+        [InlineData(RotateMode.Rotate270, FlipMode.None, 270)]
+        [InlineData(RotateMode.None, FlipMode.Horizontal, 0)]
+        [InlineData(RotateMode.Rotate90, FlipMode.Horizontal, 90)]
+        [InlineData(RotateMode.Rotate180, FlipMode.Horizontal, 180)]
+        [InlineData(RotateMode.Rotate270, FlipMode.Horizontal, 270)]
+        [InlineData(RotateMode.None, FlipMode.Vertical, 0)]
+        [InlineData(RotateMode.Rotate90, FlipMode.Vertical, 90)]
+        [InlineData(RotateMode.Rotate180, FlipMode.Vertical, 180)]
+        [InlineData(RotateMode.Rotate270, FlipMode.Vertical, 270)]
+        public void RotateDegreesFloatRotateProcessorWithAnglesSet(RotateMode angle, FlipMode flip, float expectedAngle)
         {
             this.operations.RotateFlip(angle, flip);
             RotateProcessor<Rgba32> rotateProcessor = this.Verify<RotateProcessor<Rgba32>>(0);
             FlipProcessor<Rgba32> flipProcessor = this.Verify<FlipProcessor<Rgba32>>(1);
 
             Assert.Equal(expectedAngle, rotateProcessor.Degrees);
-            Assert.Equal(flip, flipProcessor.FlipType);
+            Assert.Equal(flip, flipProcessor.FlipMode);
         }
     }
 }
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests/Processing/Transforms/RotateTests.cs b/tests/ImageSharp.Tests/Processing/Transforms/RotateTests.cs
index 742f633c0..e81cf8305 100644
--- a/tests/ImageSharp.Tests/Processing/Transforms/RotateTests.cs
+++ b/tests/ImageSharp.Tests/Processing/Transforms/RotateTests.cs
@@ -25,11 +25,11 @@ namespace SixLabors.ImageSharp.Tests.Processing.Transforms
         }
 
         [Theory]
-        [InlineData(RotateType.None, 0)]
-        [InlineData(RotateType.Rotate90, 90)]
-        [InlineData(RotateType.Rotate180, 180)]
-        [InlineData(RotateType.Rotate270, 270)]
-        public void RotateRotateTypeRotateProcessorWithAnglesConvertedFromEnum(RotateType angle, float expectedAngle)
+        [InlineData(RotateMode.None, 0)]
+        [InlineData(RotateMode.Rotate90, 90)]
+        [InlineData(RotateMode.Rotate180, 180)]
+        [InlineData(RotateMode.Rotate270, 270)]
+        public void RotateRotateTypeRotateProcessorWithAnglesConvertedFromEnum(RotateMode angle, float expectedAngle)
         {
             this.operations.Rotate(angle); // is this api needed ???
             RotateProcessor<Rgba32> processor = this.Verify<RotateProcessor<Rgba32>>();
diff --git a/tests/ImageSharp.Tests/Quantization/QuantizedImageTests.cs b/tests/ImageSharp.Tests/Quantization/QuantizedImageTests.cs
index 8ca04ac23..8965904a5 100644
--- a/tests/ImageSharp.Tests/Quantization/QuantizedImageTests.cs
+++ b/tests/ImageSharp.Tests/Quantization/QuantizedImageTests.cs
@@ -10,13 +10,17 @@
         [Fact]
         public void QuantizersDitherByDefault()
         {
-            var palette = new PaletteQuantizer<Rgba32>();
-            var octree = new OctreeQuantizer<Rgba32>();
-            var wu = new WuQuantizer<Rgba32>();
+            var palette = new PaletteQuantizer();
+            var octree = new OctreeQuantizer();
+            var wu = new WuQuantizer();
 
-            Assert.True(palette.Dither);
-            Assert.True(octree.Dither);
-            Assert.True(wu.Dither);
+            Assert.NotNull(palette.Diffuser);
+            Assert.NotNull(octree.Diffuser);
+            Assert.NotNull(wu.Diffuser);
+
+            Assert.True(palette.CreateFrameQuantizer<Rgba32>().Dither);
+            Assert.True(octree.CreateFrameQuantizer<Rgba32>().Dither);
+            Assert.True(wu.CreateFrameQuantizer<Rgba32>().Dither);
         }
 
         [Theory]
@@ -29,11 +33,11 @@
             {
                 Assert.True(image[0, 0].Equals(default(TPixel)));
 
-                IQuantizer<TPixel> quantizer = new PaletteQuantizer<TPixel> { Dither = dither };
+                var quantizer = new PaletteQuantizer(dither);
 
                 foreach (ImageFrame<TPixel> frame in image.Frames)
                 {
-                    QuantizedFrame<TPixel> quantized = quantizer.Quantize(frame, 256);
+                    QuantizedFrame<TPixel> quantized = quantizer.CreateFrameQuantizer<TPixel>().QuantizeFrame(frame);
 
                     int index = this.GetTransparentIndex(quantized);
                     Assert.Equal(index, quantized.Pixels[0]);
@@ -51,11 +55,11 @@
             {
                 Assert.True(image[0, 0].Equals(default(TPixel)));
 
-                IQuantizer<TPixel> quantizer = new OctreeQuantizer<TPixel> { Dither = dither };
+                var quantizer = new OctreeQuantizer(dither);
 
                 foreach (ImageFrame<TPixel> frame in image.Frames)
                 {
-                    QuantizedFrame<TPixel> quantized = quantizer.Quantize(frame, 256);
+                    QuantizedFrame<TPixel> quantized = quantizer.CreateFrameQuantizer<TPixel>().QuantizeFrame(frame);
 
                     int index = this.GetTransparentIndex(quantized);
                     Assert.Equal(index, quantized.Pixels[0]);
@@ -73,11 +77,11 @@
             {
                 Assert.True(image[0, 0].Equals(default(TPixel)));
 
-                IQuantizer<TPixel> quantizer = new WuQuantizer<TPixel>() { Dither = dither };
+                var quantizer = new WuQuantizer(dither);
 
                 foreach (ImageFrame<TPixel> frame in image.Frames)
                 {
-                    QuantizedFrame<TPixel> quantized = quantizer.Quantize(frame, 256);
+                    QuantizedFrame<TPixel> quantized = quantizer.CreateFrameQuantizer<TPixel>().QuantizeFrame(frame);
 
                     int index = this.GetTransparentIndex(quantized);
                     Assert.Equal(index, quantized.Pixels[0]);