diff --git a/simulation/config.lua b/simulation/config.lua
index b15e0a7..48e04ba 100644
--- a/simulation/config.lua
+++ b/simulation/config.lua
@@ -10,4 +10,4 @@ color4=string.char(green, red, blue)
 
 colorBg=string.char(0,0,0) -- black is the default background color
 sntpserverhostname="ptbtime1.ptb.de"
-
+timezoneoffset=1
\ No newline at end of file
diff --git a/simulation/src/de/c3ma/ollo/mockup/ESP8266Ws2812.java b/simulation/src/de/c3ma/ollo/mockup/ESP8266Ws2812.java
index eda22c7..3cdbde1 100644
--- a/simulation/src/de/c3ma/ollo/mockup/ESP8266Ws2812.java
+++ b/simulation/src/de/c3ma/ollo/mockup/ESP8266Ws2812.java
@@ -61,8 +61,8 @@ public class ESP8266Ws2812 extends TwoArgFunction {
 							for (int i = 0; i < length; i += 3) {
 								if (ESP8266Ws2812.layout != null) {
 									int r = array[i + 0]+(Byte.MIN_VALUE*-1);
-									int g = array[i + 1]+(Byte.MIN_VALUE*-1);
-									int b = array[i + 2]+(Byte.MIN_VALUE*-1);
+									int b = array[i + 1]+(Byte.MIN_VALUE*-1);
+									int g = array[i + 2]+(Byte.MIN_VALUE*-1);
 									ESP8266Ws2812.layout.updateLED(i / 3, r, g, b);
 								}
 							}
diff --git a/simulation/src/de/c3ma/ollo/mockup/ui/WS2812Layout.java b/simulation/src/de/c3ma/ollo/mockup/ui/WS2812Layout.java
index cf2a977..de630b4 100644
--- a/simulation/src/de/c3ma/ollo/mockup/ui/WS2812Layout.java
+++ b/simulation/src/de/c3ma/ollo/mockup/ui/WS2812Layout.java
@@ -184,6 +184,10 @@ public class WS2812Layout extends JFrame {
 		if (mElements != null) {
 			int i = (index / mColumn);
 			int j = (index % mColumn);
+			// Swap each second row
+			if (i % 2 == 1) {
+				j = (mColumn-1) - j;
+			}
 			if ((i < mElements.length) && (j < mElements[i].length) && (mElements[i][j] != null)) {
 				Element curlbl = mElements[i][j];
 				curlbl.setColor(r, g, b);