diff --git a/host/shiver/pom.xml b/host/shiver/pom.xml
index 13a29c7..7dea0ea 100644
--- a/host/shiver/pom.xml
+++ b/host/shiver/pom.xml
@@ -20,10 +20,12 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <dropwizard.version>0.9.2</dropwizard.version>
+      <twelve.version>3.2.1</twelve.version>
   </properties>
   
   <dependencies>
-    <dependency>
+      <!-- https://mvnrepository.com/artifact/com.twelvemonkeys.common/common-image -->
+      <dependency>
       <groupId>io.dropwizard</groupId>
       <artifactId>dropwizard-core</artifactId>
       <version>${dropwizard.version}</version>
@@ -107,7 +109,12 @@
 		<artifactId>bootstrap</artifactId>
 		<version>3.3.6</version>
 	</dependency>
-	
+
+      <dependency>
+          <groupId>com.twelvemonkeys.common</groupId>
+          <artifactId>common-image</artifactId>
+          <version>${twelve.version}</version>
+      </dependency>
   </dependencies>
 	
   <build>
diff --git a/host/shiver/src/main/java/dk/osaa/psaw/job/DitherFloydSteinberg.java b/host/shiver/src/main/java/dk/osaa/psaw/job/DitherFloydSteinberg.java
deleted file mode 100644
index f964dfa..0000000
--- a/host/shiver/src/main/java/dk/osaa/psaw/job/DitherFloydSteinberg.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package dk.osaa.psaw.job;
-
-import java.awt.Color;
-import java.awt.image.BufferedImage;
-
-public class DitherFloydSteinberg {
-	private static final C3[] palette = new C3[] {
-			new C3(  0,   0,   0),
-			new C3(255, 255, 255)
-	};
-
-	public static BufferedImage dither(BufferedImage img) {
-
-	    int w = img.getWidth();
-	    int h = img.getHeight();
-	
-	    C3[][] d = new C3[h][w];
-	
-	    for (int y = 0; y < h; y++) 
-	      for (int x = 0; x < w; x++) 
-	        d[y][x] = new C3(img.getRGB(x, y));
-	
-	    for (int y = 0; y < img.getHeight(); y++) {
-	      for (int x = 0; x < img.getWidth(); x++) {
-	
-	        C3 oldColor = d[y][x];
-	        C3 newColor = findClosestPaletteColor(oldColor, palette);
-	        img.setRGB(x, y, newColor.toColor().getRGB());
-	
-	        C3 err = oldColor.sub(newColor);
-	
-	        if (x+1 < w)         d[y  ][x+1] = d[y  ][x+1].add(err.mul(7./16));
-	        if (x-1>=0 && y+1<h) d[y+1][x-1] = d[y+1][x-1].add(err.mul(3./16));
-	        if (y+1 < h)         d[y+1][x  ] = d[y+1][x  ].add(err.mul(5./16));
-	        if (x+1<w && y+1<h)  d[y+1][x+1] = d[y+1][x+1].add(err.mul(1./16));
-	      }
-	    }
-	
-	    return img;
-	  }
-	
-	  private static C3 findClosestPaletteColor(C3 c, C3[] palette) {
-	    C3 closest = palette[0];
-	
-	    for (C3 n : palette) 
-	      if (n.diff(c) < closest.diff(c))
-	        closest = n;
-	
-	    return closest;
-	  }
-	
-	  static class C3 {
-	    int r, g, b;
-	
-	    public C3(int c) {
-	      Color color = new Color(c);
-	      this.r = color.getRed();
-	      this.g = color.getGreen();
-	      this.b = color.getBlue();
-	    }
-	    
-	    public C3(int r, int g, int b) {
-	      this.r = r;
-	      this.g = g;
-	      this.b = b;
-	    }
-	
-	    public C3 add(C3 o) {
-	      return new C3(r + o.r, g + o.g, b + o.b);
-	    }
-	    public C3 sub(C3 o) {
-	      return new C3(r - o.r, g - o.g, b - o.b);
-	    }
-	    public C3 mul(double d) {
-	      return new C3((int) (d * r), (int) (d * g), (int) (d * b));
-	    }
-	
-	    public int toRGB() {
-	      return toColor().getRGB();
-	    }
-	    
-	    public Color toColor() {
-	      return new Color(clamp(r), clamp(g), clamp(b));
-	    }
-	    
-	    public int clamp(int c) {
-	      return Math.max(0, Math.min(255, c));
-	    }
-	    
-	    public int diff(C3 other) {
-	    	return Math.abs(other.r-r) + Math.abs(other.g-g) + Math.abs(other.b-b); 
-	    }
-	  }
-}
diff --git a/host/shiver/src/main/java/dk/osaa/psaw/job/rasterizer/Rasterizer.java b/host/shiver/src/main/java/dk/osaa/psaw/job/rasterizer/Rasterizer.java
index 3995d0e..225508d 100644
--- a/host/shiver/src/main/java/dk/osaa/psaw/job/rasterizer/Rasterizer.java
+++ b/host/shiver/src/main/java/dk/osaa/psaw/job/rasterizer/Rasterizer.java
@@ -6,8 +6,15 @@
 import java.awt.geom.AffineTransform;
 import java.awt.geom.Point2D;
 import java.awt.image.BufferedImage;
+import java.awt.image.BufferedImageOp;
+import java.awt.image.ColorModel;
+import java.awt.image.IndexColorModel;
+import java.io.File;
+import java.io.IOException;
 import java.util.List;
+import java.util.logging.Level;
 
+import com.twelvemonkeys.image.DiffusionDither;
 import dk.osaa.psaw.config.AxisConstraints;
 import dk.osaa.psaw.config.PhotonSawMachineConfig;
 import dk.osaa.psaw.core.Line;
@@ -15,6 +22,8 @@
 import lombok.val;
 import lombok.extern.java.Log;
 
+import javax.imageio.ImageIO;
+
 /**
  * This is the great big lump of code that takes care of collecting all the RasterNodes in the job and merging the transformed rasters
  * into fewer, ideally one, large raster, then outputs the merged raster lines to the render target.
@@ -23,6 +32,10 @@
  */
 @Log
 public class Rasterizer {
+	private static final byte[] BLACK_AND_WHITE = new byte[]{(byte)Color.BLACK.getRed(), (byte)Color.WHITE.getRed()};
+	private static final IndexColorModel ONE_BIT = new IndexColorModel(1, 2, BLACK_AND_WHITE,BLACK_AND_WHITE,BLACK_AND_WHITE);
+
+	private static DiffusionDither ditherer = new DiffusionDither();
 
 	/**
 	 * 
@@ -141,17 +154,19 @@ private static BufferedImage combinedOneBitRaster(RasterGroup eg, double linePit
 			*/
 
         log.info("Starting dither of image "+ri.getWidth()+" x "+ri.getHeight()+" pixels at "+eg.bb.getMinX()+","+eg.bb.getMinY()+" w/h: "+eg.bb.getWidth()+"/"+eg.bb.getHeight());
-        BufferedImage onebit = DitherFloydSteinberg.dither(ri);
-        log.info("Done with dither");
-
-			/*
-			try {
-			    File outputfile = new File("/tmp/onebit.png");
-			    ImageIO.write(onebit, "png", outputfile);
-			} catch (IOException e) {
-			    log.log(Level.SEVERE, "Fail!", e);
-			}
-			*/
+		BufferedImage onebit = ditherer.filter(ri, ditherer.createCompatibleDestImage(ri, ONE_BIT));
+		log.info("Done with dither");
+
+/*
+		try {
+			File outputfile = new File("/tmp/onebit.png");
+			ImageIO.write(onebit, "png", outputfile);
+		} catch (IOException e) {
+			log.log(Level.SEVERE, "Fail!", e);
+		}
+*/
         return onebit;
     }
+
+
 }