diff --git a/config/hyperion.config.json b/config/hyperion.config.json
index 8a8f6065..68d24c70 100644
--- a/config/hyperion.config.json
+++ b/config/hyperion.config.json
@@ -2,390 +2,390 @@
 // Generated by: HyperCon (The Hyperion deamon configuration file builder
 
 {
-	/// Device configuration contains the following fields: 
-	/// * 'name'       : The user friendly name of the device (only used for display purposes)
-	/// * 'type'       : The type of the device or leds (known types for now are 'ws2801', 'test' and 'none')
-	/// * 'output'     : The output specification depends on selected device
-	///                  - 'ws2801' this is the device (eg '/dev/spidev0.0')
-	///                  - 'test' this is the file used to write test output (eg '/home/pi/hyperion.out')
-	/// * 'rate'       : The baudrate of the output to the device (only applicable for 'ws2801')
-	/// * 'bgr-output' : Use BGR output instead of RGB (reverse red and blue).
-	"device" :
-	{
-		"name"       : "MyPi",
-		"type"       : "ws2801",
-		"output"     : "/dev/spidev0.0",
-		"rate"       : 1000000,
-		"bgr-output" : false
-	},
+    /// Device configuration contains the following fields:
+    /// * 'name'       : The user friendly name of the device (only used for display purposes)
+    /// * 'type'       : The type of the device or leds (known types for now are 'ws2801', 'ldp6803', 'test' and 'none')
+    /// * 'output'     : The output specification depends on selected device
+    ///                  - 'ws2801' this is the device (eg '/dev/spidev0.0')
+    ///                  - 'test' this is the file used to write test output (eg '/home/pi/hyperion.out')
+    /// * 'rate'       : The baudrate of the output to the device (only applicable for 'ws2801')
+    /// * 'bgr-output' : Use BGR output instead of RGB (reverse red and blue).
+    "device" :
+    {
+        "name"       : "MyPi",
+        "type"       : "ws2801",
+        "output"     : "/dev/spidev0.0",
+        "rate"       : 1000000,
+        "bgr-output" : false
+    },
 
-	/// Color manipulation configuration used to tune the output colors to specific surroundings. Contains the following fields:
-	///  * 'hsv' : The manipulation in the Hue-Saturation-Value color domain with the following tuning parameters:
-	///            - 'saturationGain'  The gain adjustement of the saturation
-	///            - 'valueGain'       The gain adjustement of the value
-	///  * 'red'/'green'/'blue' : The manipulation in the Red-Green-Blue color domain with the following tuning parameters for each channel:
-	///            - 'threshold'       The minimum required input value for the channel to be on (else zero)
-	///            - 'gamma'           The gamma-curve correction factor
-	///            - 'blacklevel'      The lowest possible value (when the channel is black)
-	///            - 'whitelevel'      The highest possible value (when the channel is white)
-	///  * 'smoothing' : Smoothing of the colors in the time-domain with the following tuning parameters:
-	///            - 'type'            The type of smoothing algorithm ('linear' or 'none')
-	///            - 'time_ms'         The time constant for smoothing algorithm in milliseconds
-	///            - 'updateFrequency' The update frequency of the leds in Hz
-	"color" :
-	{
-		"hsv" :
-		{
-			"saturationGain" : 1.0000,
-			"valueGain"      : 1.5000
-		},
-		"red" :
-		{
-			"threshold"  : 0.1000,
-			"gamma"      : 2.0000,
-			"blacklevel" : 0.0000,
-			"whitelevel" : 0.8000
-		},
-		"green" :
-		{
-			"threshold"  : 0.1000,
-			"gamma"      : 2.0000,
-			"blacklevel" : 0.0000,
-			"whitelevel" : 1.0000
-		},
-		"blue" :
-		{
-			"threshold"  : 0.1000,
-			"gamma"      : 2.0000,
-			"blacklevel" : 0.0000,
-			"whitelevel" : 1.0000
-		},
-		"smoothing" :
-		{
-			"type"            : "none",
-			"time_ms"         : 200,
-			"updateFrequency" : 20.0000
-		}
-	},
+    /// Color manipulation configuration used to tune the output colors to specific surroundings. Contains the following fields:
+    ///  * 'hsv' : The manipulation in the Hue-Saturation-Value color domain with the following tuning parameters:
+    ///            - 'saturationGain'  The gain adjustement of the saturation
+    ///            - 'valueGain'       The gain adjustement of the value
+    ///  * 'red'/'green'/'blue' : The manipulation in the Red-Green-Blue color domain with the following tuning parameters for each channel:
+    ///            - 'threshold'       The minimum required input value for the channel to be on (else zero)
+    ///            - 'gamma'           The gamma-curve correction factor
+    ///            - 'blacklevel'      The lowest possible value (when the channel is black)
+    ///            - 'whitelevel'      The highest possible value (when the channel is white)
+    ///  * 'smoothing' : Smoothing of the colors in the time-domain with the following tuning parameters:
+    ///            - 'type'            The type of smoothing algorithm ('linear' or 'none')
+    ///            - 'time_ms'         The time constant for smoothing algorithm in milliseconds
+    ///            - 'updateFrequency' The update frequency of the leds in Hz
+    "color" :
+    {
+        "hsv" :
+        {
+            "saturationGain" : 1.0000,
+            "valueGain"      : 1.5000
+        },
+        "red" :
+        {
+            "threshold"  : 0.1000,
+            "gamma"      : 2.0000,
+            "blacklevel" : 0.0000,
+            "whitelevel" : 0.8000
+        },
+        "green" :
+        {
+            "threshold"  : 0.1000,
+            "gamma"      : 2.0000,
+            "blacklevel" : 0.0000,
+            "whitelevel" : 1.0000
+        },
+        "blue" :
+        {
+            "threshold"  : 0.1000,
+            "gamma"      : 2.0000,
+            "blacklevel" : 0.0000,
+            "whitelevel" : 1.0000
+        },
+        "smoothing" :
+        {
+            "type"            : "none",
+            "time_ms"         : 200,
+            "updateFrequency" : 20.0000
+        }
+    },
 
-	/// The configuration for each individual led. This contains the specification of the area 
-	/// averaged of an input image for each led to determine its color. Each item in the list 
-	/// contains the following fields:
-	/// * index: The index of the led. This determines its location in the string of leds; zero 
-	///          being the first led.
-	/// * hscan: The fractional part of the image along the horizontal used for the averaging 
-	///          (minimum and maximum inclusive)
-	/// * vscan: The fractional part of the image along the vertical used for the averaging 
-	///          (minimum and maximum inclusive)
-	"leds" : 
-	[
-		{
-			"index" : 0,
-			"hscan" : { "minimum" : 0.4375, "maximum" : 0.5000 },
-			"vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
-		},
-		{
-			"index" : 1,
-			"hscan" : { "minimum" : 0.3750, "maximum" : 0.4375 },
-			"vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
-		},
-		{
-			"index" : 2,
-			"hscan" : { "minimum" : 0.3125, "maximum" : 0.3750 },
-			"vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
-		},
-		{
-			"index" : 3,
-			"hscan" : { "minimum" : 0.2500, "maximum" : 0.3125 },
-			"vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
-		},
-		{
-			"index" : 4,
-			"hscan" : { "minimum" : 0.1875, "maximum" : 0.2500 },
-			"vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
-		},
-		{
-			"index" : 5,
-			"hscan" : { "minimum" : 0.1250, "maximum" : 0.1875 },
-			"vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
-		},
-		{
-			"index" : 6,
-			"hscan" : { "minimum" : 0.0625, "maximum" : 0.1250 },
-			"vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
-		},
-		{
-			"index" : 7,
-			"hscan" : { "minimum" : 0.0000, "maximum" : 0.0625 },
-			"vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
-		},
-		{
-			"index" : 8,
-			"hscan" : { "minimum" : 0.0000, "maximum" : 0.0500 },
-			"vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
-		},
-		{
-			"index" : 9,
-			"hscan" : { "minimum" : 0.0000, "maximum" : 0.0500 },
-			"vscan" : { "minimum" : 0.8571, "maximum" : 1.0000 }
-		},
-		{
-			"index" : 10,
-			"hscan" : { "minimum" : 0.0000, "maximum" : 0.0500 },
-			"vscan" : { "minimum" : 0.7143, "maximum" : 0.8571 }
-		},
-		{
-			"index" : 11,
-			"hscan" : { "minimum" : 0.0000, "maximum" : 0.0500 },
-			"vscan" : { "minimum" : 0.5714, "maximum" : 0.7143 }
-		},
-		{
-			"index" : 12,
-			"hscan" : { "minimum" : 0.0000, "maximum" : 0.0500 },
-			"vscan" : { "minimum" : 0.4286, "maximum" : 0.5714 }
-		},
-		{
-			"index" : 13,
-			"hscan" : { "minimum" : 0.0000, "maximum" : 0.0500 },
-			"vscan" : { "minimum" : 0.2857, "maximum" : 0.4286 }
-		},
-		{
-			"index" : 14,
-			"hscan" : { "minimum" : 0.0000, "maximum" : 0.0500 },
-			"vscan" : { "minimum" : 0.1429, "maximum" : 0.2857 }
-		},
-		{
-			"index" : 15,
-			"hscan" : { "minimum" : 0.0000, "maximum" : 0.0500 },
-			"vscan" : { "minimum" : 0.0000, "maximum" : 0.1429 }
-		},
-		{
-			"index" : 16,
-			"hscan" : { "minimum" : 0.0000, "maximum" : 0.0500 },
-			"vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
-		},
-		{
-			"index" : 17,
-			"hscan" : { "minimum" : 0.0000, "maximum" : 0.0625 },
-			"vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
-		},
-		{
-			"index" : 18,
-			"hscan" : { "minimum" : 0.0625, "maximum" : 0.1250 },
-			"vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
-		},
-		{
-			"index" : 19,
-			"hscan" : { "minimum" : 0.1250, "maximum" : 0.1875 },
-			"vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
-		},
-		{
-			"index" : 20,
-			"hscan" : { "minimum" : 0.1875, "maximum" : 0.2500 },
-			"vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
-		},
-		{
-			"index" : 21,
-			"hscan" : { "minimum" : 0.2500, "maximum" : 0.3125 },
-			"vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
-		},
-		{
-			"index" : 22,
-			"hscan" : { "minimum" : 0.3125, "maximum" : 0.3750 },
-			"vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
-		},
-		{
-			"index" : 23,
-			"hscan" : { "minimum" : 0.3750, "maximum" : 0.4375 },
-			"vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
-		},
-		{
-			"index" : 24,
-			"hscan" : { "minimum" : 0.4375, "maximum" : 0.5000 },
-			"vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
-		},
-		{
-			"index" : 25,
-			"hscan" : { "minimum" : 0.5000, "maximum" : 0.5625 },
-			"vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
-		},
-		{
-			"index" : 26,
-			"hscan" : { "minimum" : 0.5625, "maximum" : 0.6250 },
-			"vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
-		},
-		{
-			"index" : 27,
-			"hscan" : { "minimum" : 0.6250, "maximum" : 0.6875 },
-			"vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
-		},
-		{
-			"index" : 28,
-			"hscan" : { "minimum" : 0.6875, "maximum" : 0.7500 },
-			"vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
-		},
-		{
-			"index" : 29,
-			"hscan" : { "minimum" : 0.7500, "maximum" : 0.8125 },
-			"vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
-		},
-		{
-			"index" : 30,
-			"hscan" : { "minimum" : 0.8125, "maximum" : 0.8750 },
-			"vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
-		},
-		{
-			"index" : 31,
-			"hscan" : { "minimum" : 0.8750, "maximum" : 0.9375 },
-			"vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
-		},
-		{
-			"index" : 32,
-			"hscan" : { "minimum" : 0.9375, "maximum" : 1.0000 },
-			"vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
-		},
-		{
-			"index" : 33,
-			"hscan" : { "minimum" : 0.9500, "maximum" : 1.0000 },
-			"vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
-		},
-		{
-			"index" : 34,
-			"hscan" : { "minimum" : 0.9500, "maximum" : 1.0000 },
-			"vscan" : { "minimum" : 0.0000, "maximum" : 0.1429 }
-		},
-		{
-			"index" : 35,
-			"hscan" : { "minimum" : 0.9500, "maximum" : 1.0000 },
-			"vscan" : { "minimum" : 0.1429, "maximum" : 0.2857 }
-		},
-		{
-			"index" : 36,
-			"hscan" : { "minimum" : 0.9500, "maximum" : 1.0000 },
-			"vscan" : { "minimum" : 0.2857, "maximum" : 0.4286 }
-		},
-		{
-			"index" : 37,
-			"hscan" : { "minimum" : 0.9500, "maximum" : 1.0000 },
-			"vscan" : { "minimum" : 0.4286, "maximum" : 0.5714 }
-		},
-		{
-			"index" : 38,
-			"hscan" : { "minimum" : 0.9500, "maximum" : 1.0000 },
-			"vscan" : { "minimum" : 0.5714, "maximum" : 0.7143 }
-		},
-		{
-			"index" : 39,
-			"hscan" : { "minimum" : 0.9500, "maximum" : 1.0000 },
-			"vscan" : { "minimum" : 0.7143, "maximum" : 0.8571 }
-		},
-		{
-			"index" : 40,
-			"hscan" : { "minimum" : 0.9500, "maximum" : 1.0000 },
-			"vscan" : { "minimum" : 0.8571, "maximum" : 1.0000 }
-		},
-		{
-			"index" : 41,
-			"hscan" : { "minimum" : 0.9500, "maximum" : 1.0000 },
-			"vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
-		},
-		{
-			"index" : 42,
-			"hscan" : { "minimum" : 0.9375, "maximum" : 1.0000 },
-			"vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
-		},
-		{
-			"index" : 43,
-			"hscan" : { "minimum" : 0.8750, "maximum" : 0.9375 },
-			"vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
-		},
-		{
-			"index" : 44,
-			"hscan" : { "minimum" : 0.8125, "maximum" : 0.8750 },
-			"vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
-		},
-		{
-			"index" : 45,
-			"hscan" : { "minimum" : 0.7500, "maximum" : 0.8125 },
-			"vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
-		},
-		{
-			"index" : 46,
-			"hscan" : { "minimum" : 0.6875, "maximum" : 0.7500 },
-			"vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
-		},
-		{
-			"index" : 47,
-			"hscan" : { "minimum" : 0.6250, "maximum" : 0.6875 },
-			"vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
-		},
-		{
-			"index" : 48,
-			"hscan" : { "minimum" : 0.5625, "maximum" : 0.6250 },
-			"vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
-		},
-		{
-			"index" : 49,
-			"hscan" : { "minimum" : 0.5000, "maximum" : 0.5625 },
-			"vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
-		}
-	],
+    /// The configuration for each individual led. This contains the specification of the area
+    /// averaged of an input image for each led to determine its color. Each item in the list
+    /// contains the following fields:
+    /// * index: The index of the led. This determines its location in the string of leds; zero
+    ///          being the first led.
+    /// * hscan: The fractional part of the image along the horizontal used for the averaging
+    ///          (minimum and maximum inclusive)
+    /// * vscan: The fractional part of the image along the vertical used for the averaging
+    ///          (minimum and maximum inclusive)
+    "leds" :
+    [
+        {
+            "index" : 0,
+            "hscan" : { "minimum" : 0.4375, "maximum" : 0.5000 },
+            "vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
+        },
+        {
+            "index" : 1,
+            "hscan" : { "minimum" : 0.3750, "maximum" : 0.4375 },
+            "vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
+        },
+        {
+            "index" : 2,
+            "hscan" : { "minimum" : 0.3125, "maximum" : 0.3750 },
+            "vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
+        },
+        {
+            "index" : 3,
+            "hscan" : { "minimum" : 0.2500, "maximum" : 0.3125 },
+            "vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
+        },
+        {
+            "index" : 4,
+            "hscan" : { "minimum" : 0.1875, "maximum" : 0.2500 },
+            "vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
+        },
+        {
+            "index" : 5,
+            "hscan" : { "minimum" : 0.1250, "maximum" : 0.1875 },
+            "vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
+        },
+        {
+            "index" : 6,
+            "hscan" : { "minimum" : 0.0625, "maximum" : 0.1250 },
+            "vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
+        },
+        {
+            "index" : 7,
+            "hscan" : { "minimum" : 0.0000, "maximum" : 0.0625 },
+            "vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
+        },
+        {
+            "index" : 8,
+            "hscan" : { "minimum" : 0.0000, "maximum" : 0.0500 },
+            "vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
+        },
+        {
+            "index" : 9,
+            "hscan" : { "minimum" : 0.0000, "maximum" : 0.0500 },
+            "vscan" : { "minimum" : 0.8571, "maximum" : 1.0000 }
+        },
+        {
+            "index" : 10,
+            "hscan" : { "minimum" : 0.0000, "maximum" : 0.0500 },
+            "vscan" : { "minimum" : 0.7143, "maximum" : 0.8571 }
+        },
+        {
+            "index" : 11,
+            "hscan" : { "minimum" : 0.0000, "maximum" : 0.0500 },
+            "vscan" : { "minimum" : 0.5714, "maximum" : 0.7143 }
+        },
+        {
+            "index" : 12,
+            "hscan" : { "minimum" : 0.0000, "maximum" : 0.0500 },
+            "vscan" : { "minimum" : 0.4286, "maximum" : 0.5714 }
+        },
+        {
+            "index" : 13,
+            "hscan" : { "minimum" : 0.0000, "maximum" : 0.0500 },
+            "vscan" : { "minimum" : 0.2857, "maximum" : 0.4286 }
+        },
+        {
+            "index" : 14,
+            "hscan" : { "minimum" : 0.0000, "maximum" : 0.0500 },
+            "vscan" : { "minimum" : 0.1429, "maximum" : 0.2857 }
+        },
+        {
+            "index" : 15,
+            "hscan" : { "minimum" : 0.0000, "maximum" : 0.0500 },
+            "vscan" : { "minimum" : 0.0000, "maximum" : 0.1429 }
+        },
+        {
+            "index" : 16,
+            "hscan" : { "minimum" : 0.0000, "maximum" : 0.0500 },
+            "vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
+        },
+        {
+            "index" : 17,
+            "hscan" : { "minimum" : 0.0000, "maximum" : 0.0625 },
+            "vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
+        },
+        {
+            "index" : 18,
+            "hscan" : { "minimum" : 0.0625, "maximum" : 0.1250 },
+            "vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
+        },
+        {
+            "index" : 19,
+            "hscan" : { "minimum" : 0.1250, "maximum" : 0.1875 },
+            "vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
+        },
+        {
+            "index" : 20,
+            "hscan" : { "minimum" : 0.1875, "maximum" : 0.2500 },
+            "vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
+        },
+        {
+            "index" : 21,
+            "hscan" : { "minimum" : 0.2500, "maximum" : 0.3125 },
+            "vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
+        },
+        {
+            "index" : 22,
+            "hscan" : { "minimum" : 0.3125, "maximum" : 0.3750 },
+            "vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
+        },
+        {
+            "index" : 23,
+            "hscan" : { "minimum" : 0.3750, "maximum" : 0.4375 },
+            "vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
+        },
+        {
+            "index" : 24,
+            "hscan" : { "minimum" : 0.4375, "maximum" : 0.5000 },
+            "vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
+        },
+        {
+            "index" : 25,
+            "hscan" : { "minimum" : 0.5000, "maximum" : 0.5625 },
+            "vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
+        },
+        {
+            "index" : 26,
+            "hscan" : { "minimum" : 0.5625, "maximum" : 0.6250 },
+            "vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
+        },
+        {
+            "index" : 27,
+            "hscan" : { "minimum" : 0.6250, "maximum" : 0.6875 },
+            "vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
+        },
+        {
+            "index" : 28,
+            "hscan" : { "minimum" : 0.6875, "maximum" : 0.7500 },
+            "vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
+        },
+        {
+            "index" : 29,
+            "hscan" : { "minimum" : 0.7500, "maximum" : 0.8125 },
+            "vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
+        },
+        {
+            "index" : 30,
+            "hscan" : { "minimum" : 0.8125, "maximum" : 0.8750 },
+            "vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
+        },
+        {
+            "index" : 31,
+            "hscan" : { "minimum" : 0.8750, "maximum" : 0.9375 },
+            "vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
+        },
+        {
+            "index" : 32,
+            "hscan" : { "minimum" : 0.9375, "maximum" : 1.0000 },
+            "vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
+        },
+        {
+            "index" : 33,
+            "hscan" : { "minimum" : 0.9500, "maximum" : 1.0000 },
+            "vscan" : { "minimum" : 0.0000, "maximum" : 0.0800 }
+        },
+        {
+            "index" : 34,
+            "hscan" : { "minimum" : 0.9500, "maximum" : 1.0000 },
+            "vscan" : { "minimum" : 0.0000, "maximum" : 0.1429 }
+        },
+        {
+            "index" : 35,
+            "hscan" : { "minimum" : 0.9500, "maximum" : 1.0000 },
+            "vscan" : { "minimum" : 0.1429, "maximum" : 0.2857 }
+        },
+        {
+            "index" : 36,
+            "hscan" : { "minimum" : 0.9500, "maximum" : 1.0000 },
+            "vscan" : { "minimum" : 0.2857, "maximum" : 0.4286 }
+        },
+        {
+            "index" : 37,
+            "hscan" : { "minimum" : 0.9500, "maximum" : 1.0000 },
+            "vscan" : { "minimum" : 0.4286, "maximum" : 0.5714 }
+        },
+        {
+            "index" : 38,
+            "hscan" : { "minimum" : 0.9500, "maximum" : 1.0000 },
+            "vscan" : { "minimum" : 0.5714, "maximum" : 0.7143 }
+        },
+        {
+            "index" : 39,
+            "hscan" : { "minimum" : 0.9500, "maximum" : 1.0000 },
+            "vscan" : { "minimum" : 0.7143, "maximum" : 0.8571 }
+        },
+        {
+            "index" : 40,
+            "hscan" : { "minimum" : 0.9500, "maximum" : 1.0000 },
+            "vscan" : { "minimum" : 0.8571, "maximum" : 1.0000 }
+        },
+        {
+            "index" : 41,
+            "hscan" : { "minimum" : 0.9500, "maximum" : 1.0000 },
+            "vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
+        },
+        {
+            "index" : 42,
+            "hscan" : { "minimum" : 0.9375, "maximum" : 1.0000 },
+            "vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
+        },
+        {
+            "index" : 43,
+            "hscan" : { "minimum" : 0.8750, "maximum" : 0.9375 },
+            "vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
+        },
+        {
+            "index" : 44,
+            "hscan" : { "minimum" : 0.8125, "maximum" : 0.8750 },
+            "vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
+        },
+        {
+            "index" : 45,
+            "hscan" : { "minimum" : 0.7500, "maximum" : 0.8125 },
+            "vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
+        },
+        {
+            "index" : 46,
+            "hscan" : { "minimum" : 0.6875, "maximum" : 0.7500 },
+            "vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
+        },
+        {
+            "index" : 47,
+            "hscan" : { "minimum" : 0.6250, "maximum" : 0.6875 },
+            "vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
+        },
+        {
+            "index" : 48,
+            "hscan" : { "minimum" : 0.5625, "maximum" : 0.6250 },
+            "vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
+        },
+        {
+            "index" : 49,
+            "hscan" : { "minimum" : 0.5000, "maximum" : 0.5625 },
+            "vscan" : { "minimum" : 0.9200, "maximum" : 1.0000 }
+        }
+    ],
 
-	/// The black border configuration, contains the following items: 
-	///  * enable : true if the detector should be activated
-	"blackborderdetector" :
-	{
-		"enable" : true
-	},
+    /// The black border configuration, contains the following items:
+    ///  * enable : true if the detector should be activated
+    "blackborderdetector" :
+    {
+        "enable" : true
+    },
 
-	/// The boot-sequence configuration, contains the following items: 
-	///  * type        : The type of the boot-sequence ('rainbow', 'knight_rider', 'none') 
-	///  * duration_ms : The length of the boot-sequence [ms]
-	"bootsequence" :
-	{
-		"type"        : "Rainbow",
-		"duration_ms" : 3000
-	},
+    /// The boot-sequence configuration, contains the following items:
+    ///  * type        : The type of the boot-sequence ('rainbow', 'knight_rider', 'none')
+    ///  * duration_ms : The length of the boot-sequence [ms]
+    "bootsequence" :
+    {
+        "type"        : "Rainbow",
+        "duration_ms" : 3000
+    },
 
-	/// The configuration for the frame-grabber, contains the following items: 
-	///  * width        : The width of the grabbed frames [pixels]
-	///  * height       : The height of the grabbed frames [pixels]
-	///  * frequency_Hz : The frequency of the frame grab [Hz]
-	"framegrabber" :
-	{
-		"width"        : 64,
-		"height"       : 64,
-		"frequency_Hz" : 10.0
-	},
+    /// The configuration for the frame-grabber, contains the following items:
+    ///  * width        : The width of the grabbed frames [pixels]
+    ///  * height       : The height of the grabbed frames [pixels]
+    ///  * frequency_Hz : The frequency of the frame grab [Hz]
+    "framegrabber" :
+    {
+        "width"        : 64,
+        "height"       : 64,
+        "frequency_Hz" : 10.0
+    },
 
-	/// The configuration of the XBMC connection used to enable and disable the frame-grabber. Contains the following fields: 
-	///  * xbmcAddress  : The IP address of the XBMC-host
-	///  * xbmcTcpPort  : The TCP-port of the XBMC-server
-	///  * grabVideo    : Flag indicating that the frame-grabber is on(true) during video playback
-	///  * grabPictures : Flag indicating that the frame-grabber is on(true) during picture show
-	///  * grabAudio    : Flag indicating that the frame-grabber is on(true) during audio playback
-	///  * grabMenu     : Flag indicating that the frame-grabber is on(true) in the XBMC menu
-	"xbmcVideoChecker" :
-	{
-		"xbmcAddress"  : "127.0.0.1",
-		"xbmcTcpPort"  : 9090,
-		"grabVideo"    : true,
-		"grabPictures" : true,
-		"grabAudio"    : true,
-		"grabMenu"     : false
-	},
+    /// The configuration of the XBMC connection used to enable and disable the frame-grabber. Contains the following fields:
+    ///  * xbmcAddress  : The IP address of the XBMC-host
+    ///  * xbmcTcpPort  : The TCP-port of the XBMC-server
+    ///  * grabVideo    : Flag indicating that the frame-grabber is on(true) during video playback
+    ///  * grabPictures : Flag indicating that the frame-grabber is on(true) during picture show
+    ///  * grabAudio    : Flag indicating that the frame-grabber is on(true) during audio playback
+    ///  * grabMenu     : Flag indicating that the frame-grabber is on(true) in the XBMC menu
+    "xbmcVideoChecker" :
+    {
+        "xbmcAddress"  : "127.0.0.1",
+        "xbmcTcpPort"  : 9090,
+        "grabVideo"    : true,
+        "grabPictures" : true,
+        "grabAudio"    : true,
+        "grabMenu"     : false
+    },
 
-	/// The configuration of the Json server which enables the json remote interface
-	///  * port : Port at which the json server is started
-	"jsonServer" :
-	{
-		"port" : 19444
-	},
+    /// The configuration of the Json server which enables the json remote interface
+    ///  * port : Port at which the json server is started
+    "jsonServer" :
+    {
+        "port" : 19444
+    },
 
-	/// The configuration of the Proto server which enables the protobuffer remote interface
-	///  * port : Port at which the protobuffer server is started
-	"protoServer" :
-	{
-		"port" : 19445
-	}
+    /// The configuration of the Proto server which enables the protobuffer remote interface
+    ///  * port : Port at which the protobuffer server is started
+    "protoServer" :
+    {
+        "port" : 19445
+    }
 }
diff --git a/deploy/hyperion-remote b/deploy/hyperion-remote
index 5d5eea63..ad1653d6 100755
Binary files a/deploy/hyperion-remote and b/deploy/hyperion-remote differ
diff --git a/deploy/hyperiond.REMOVED.git-id b/deploy/hyperiond.REMOVED.git-id
index a9cf374e..03a45695 100644
--- a/deploy/hyperiond.REMOVED.git-id
+++ b/deploy/hyperiond.REMOVED.git-id
@@ -1 +1 @@
-e027a9a48c14dcffacb9539ede8ddca32cba2171
\ No newline at end of file
+26d94964cc23d092b4504771bb1c0940e4d6d66e
\ No newline at end of file
diff --git a/libsrc/hyperion/LedDeviceLdp6803.cpp b/libsrc/hyperion/LedDeviceLdp6803.cpp
index df0c0264..11c6a246 100644
--- a/libsrc/hyperion/LedDeviceLdp6803.cpp
+++ b/libsrc/hyperion/LedDeviceLdp6803.cpp
@@ -20,31 +20,23 @@ LedDeviceLdp6803::LedDeviceLdp6803(const std::string& outputDevice, const unsign
 int LedDeviceLdp6803::write(const std::vector<RgbColor> &ledValues)
 {
 	// Reconfigure if the current connfiguration does not match the required configuration
-	if (ledValues.size() != _ledBuffer.size())
+	if (4 + 2*ledValues.size() != _ledBuffer.size())
 	{
-		// Initialise the buffer with all 'black' values
-		_ledBuffer.resize(ledValues.size() + 2, 0x80);
-		_ledBuffer[0] = 0;
-		_ledBuffer[1] = 0;
+		// Initialise the buffer
+		_ledBuffer.resize(4 + 2*ledValues.size(), 0x00);
 	}
 
-	// Copy the colors from the RgbColor vector to the Ldp6803Rgb vector
+	// Copy the colors from the RgbColor vector to the Ldp6803 data vector
 	for (unsigned iLed=0; iLed<ledValues.size(); ++iLed)
 	{
 		const RgbColor& rgb = ledValues[iLed];
 
-		const char packedRed   = rgb.red   & 0xf8;
-		const char packedGreen = rgb.green & 0xf8;
-		const char packedBlue  = rgb.blue  & 0xf8;
-		const unsigned short packedRgb = 0x80 | (packedRed << 7) | (packedGreen << 2) | (packedBlue >> 3);
-
-		_ledBuffer[iLed + 2] = packedRgb;
+		_ledBuffer[4 + 2 * iLed] = 0x80 | ((rgb.red & 0xf8) >> 1) | (rgb.green >> 6);
+		_ledBuffer[5 + 2 * iLed] = ((rgb.green & 0x38) << 2) | (rgb.blue >> 3);
 	}
 
 	// Write the data
-	const unsigned bufCnt = _ledBuffer.size() * sizeof(short);
-	const char * bufPtr   = reinterpret_cast<const char *>(_ledBuffer.data());
-	if (latch(bufCnt, bufPtr, 0) < 0)
+	if (writeBytes(_ledBuffer.size(), _ledBuffer.data()) < 0)
 	{
 		return -1;
 	}
diff --git a/libsrc/hyperion/LedDeviceLdp6803.h b/libsrc/hyperion/LedDeviceLdp6803.h
index ee57e1e5..096468c2 100644
--- a/libsrc/hyperion/LedDeviceLdp6803.h
+++ b/libsrc/hyperion/LedDeviceLdp6803.h
@@ -6,12 +6,12 @@
 ///
 /// Implementation of the LedDevice interface for writing to LDP6803 led device.
 ///
-/// 00000000 00000000 00000000 00000000 1XXXXXYY YYYZZZZZ 1XXXXXYY YYYZZZZZ ...
+/// 00000000 00000000 00000000 00000000 1RRRRRGG GGGBBBBB 1RRRRRGG GGGBBBBB ...
 /// |---------------------------------| |---------------| |---------------|
 /// 32 zeros to start the frame Led1 Led2 ...
 ///
 /// For each led, the first bit is always 1, and then you have 5 bits each for red, green and blue
-/// (X, Y and Z in the above illustration) making 16 bits per led. Total bits = 32 + (16 x number of
+/// (R, G and B in the above illustration) making 16 bits per led. Total bytes = 4 + (2 x number of
 /// leds)
 ///
 class LedDeviceLdp6803 : public LedSpiDevice
@@ -20,7 +20,7 @@ public:
 	///
 	/// Constructs the LedDevice for a string containing leds of the type LDP6803
 	///
-	/// @param[in] outputDevice The name of the output device (eg '/etc/SpiDev.0.0')
+	/// @param[in] outputDevice The name of the output device (eg '/dev/spidev0.0')
 	/// @param[in] baudrate The used baudrate for writing to the output device
 	///
 	LedDeviceLdp6803(const std::string& outputDevice, const unsigned baudrate);
@@ -38,5 +38,5 @@ public:
 
 private:
 	/// The buffer containing the packed RGB values
-	std::vector<unsigned short> _ledBuffer;
+	std::vector<uint8_t> _ledBuffer;
 };
diff --git a/libsrc/hyperion/LedDeviceWs2801.cpp b/libsrc/hyperion/LedDeviceWs2801.cpp
index 2c95e80e..05d06119 100644
--- a/libsrc/hyperion/LedDeviceWs2801.cpp
+++ b/libsrc/hyperion/LedDeviceWs2801.cpp
@@ -12,7 +12,7 @@
 #include "LedDeviceWs2801.h"
 
 LedDeviceWs2801::LedDeviceWs2801(const std::string& outputDevice, const unsigned baudrate) :
-	LedSpiDevice(outputDevice, baudrate),
+	LedSpiDevice(outputDevice, baudrate, 500000),
 	mLedCount(0)
 {
 	// empty
@@ -23,10 +23,9 @@ int LedDeviceWs2801::write(const std::vector<RgbColor> &ledValues)
 	mLedCount = ledValues.size();
 
 	const unsigned dataLen = ledValues.size() * sizeof(RgbColor);
-	const char * dataPtr   = reinterpret_cast<const char *>(ledValues.data());
+	const uint8_t * dataPtr = reinterpret_cast<const uint8_t *>(ledValues.data());
 
-	const int retVal = latch(dataLen, dataPtr, 500000);
-	return retVal;
+	return writeBytes(dataLen, dataPtr);
 }
 
 int LedDeviceWs2801::switchOff()
diff --git a/libsrc/hyperion/LedSpiDevice.cpp b/libsrc/hyperion/LedSpiDevice.cpp
index 7c99b6fa..a4c7125c 100644
--- a/libsrc/hyperion/LedSpiDevice.cpp
+++ b/libsrc/hyperion/LedSpiDevice.cpp
@@ -12,9 +12,10 @@
 #include "LedSpiDevice.h"
 
 
-LedSpiDevice::LedSpiDevice(const std::string& outputDevice, const unsigned baudrate) :
+LedSpiDevice::LedSpiDevice(const std::string& outputDevice, const unsigned baudrate, const int latchTime_ns) :
 	mDeviceName(outputDevice),
 	mBaudRate_Hz(baudrate),
+	mLatchTime_ns(latchTime_ns),
 	mFid(-1)
 {
 	memset(&spi, 0, sizeof(spi));
@@ -56,30 +57,28 @@ int LedSpiDevice::open()
 	return 0;
 }
 
-int LedSpiDevice::latch(const unsigned len, const char * vec, const int latchTime_ns)
+int LedSpiDevice::writeBytes(const unsigned size, const uint8_t * data)
 {
-
 	if (mFid < 0)
 	{
 		return -1;
 	}
 
-	spi.tx_buf = __u64(vec);
-	spi.len    = __u32(len);
+	spi.tx_buf = __u64(data);
+	spi.len    = __u32(size);
 
 	int retVal = ioctl(mFid, SPI_IOC_MESSAGE(1), &spi);
 
-	if (retVal == 0 && latchTime_ns > 0)
+	if (retVal == 0 && mLatchTime_ns > 0)
 	{
 		// The 'latch' time for latching the shifted-value into the leds
 		timespec latchTime;
 		latchTime.tv_sec  = 0;
-		latchTime.tv_nsec = latchTime_ns;
+		latchTime.tv_nsec = mLatchTime_ns;
 
 		// Sleep to latch the leds (only if write succesfull)
 		nanosleep(&latchTime, NULL);
 	}
 
 	return retVal;
-
 }
diff --git a/libsrc/hyperion/LedSpiDevice.h b/libsrc/hyperion/LedSpiDevice.h
index bdeb9b38..51d03bfb 100644
--- a/libsrc/hyperion/LedSpiDevice.h
+++ b/libsrc/hyperion/LedSpiDevice.h
@@ -18,7 +18,7 @@ public:
 	/// @param[in] outputDevice The name of the output device (eg '/etc/SpiDev.0.0')
 	/// @param[in] baudrate The used baudrate for writing to the output device
 	///
-	LedSpiDevice(const std::string& outputDevice, const unsigned baudrate);
+	LedSpiDevice(const std::string& outputDevice, const unsigned baudrate, const int latchTime_ns = -1);
 
 	///
 	/// Destructor of the LedDevice; closes the output device if it is open
@@ -37,20 +37,22 @@ protected:
 	 * Writes the given bytes/bits to the SPI-device and sleeps the latch time to ensure that the
 	 * values are latched.
 	 *
-	 * @param[in[ len The length of the data
-	 * @param[in] vec The data
+	 * @param[in[ size The length of the data
+	 * @param[in] data The data
 	 * @param[in] latchTime_ns The latch-time to latch in the values across the SPI-device (negative
 	 * means no latch required) [ns]
 	 *
 	 * @return Zero on succes else negative
 	 */
-	int latch(const unsigned len, const char * vec, const int latchTime_ns);
+	int writeBytes(const unsigned size, const uint8_t *data);
 
 private:
 	/// The name of the output device
 	const std::string mDeviceName;
 	/// The used baudrate of the output device
 	const int mBaudRate_Hz;
+	/// The time which the device should be untouched after a write
+	const int mLatchTime_ns;
 
 	/// The File Identifier of the opened output device (or -1 if not opened)
 	int mFid;