diff --git a/simulat0r/gui/qsimulat0r.cc b/simulat0r/gui/qsimulat0r.cc
index 9cc36c5..c2146d2 100644
--- a/simulat0r/gui/qsimulat0r.cc
+++ b/simulat0r/gui/qsimulat0r.cc
@@ -96,10 +96,10 @@ public:
     for (int x = 0; x < dimx; ++x) {
       for(int y=0; y<dimy; ++y) {
 	int color;
-	if(lcd_layout & LCD_INVERTED) {
-	  color=lcdGetPixel((lcd_layout & LCD_MIRRORX)?(RESX-x-1):x,(lcd_layout & LCD_MIRRORY)?(RESY-y-1):y)?colorInvertedPixelOn:colorInvertedPixelOff;
+	if(globalconfig.lcdstate & LCD_INVERTED) {
+	  color=lcdGetPixel((globalconfig.lcdstate & LCD_MIRRORX)?(RESX-x-1):x,(globalconfig.lcdstate & LCD_MIRRORY)?(RESY-y-1):y)?colorInvertedPixelOn:colorInvertedPixelOff;
 	} else {
-	  color=lcdGetPixel((lcd_layout & LCD_MIRRORX)?(RESX-x-1):x,(lcd_layout & LCD_MIRRORY)?(RESY-y-1):y)?colorPixelOn:colorPixelOff;
+	  color=lcdGetPixel((globalconfig.lcdstate & LCD_MIRRORX)?(RESX-x-1):x,(globalconfig.lcdstate & LCD_MIRRORY)?(RESY-y-1):y)?colorPixelOn:colorPixelOff;
 	}
 	for(int minix=0; minix<pixw; ++minix) {
 	  for(int miniy=0; miniy<pixh; ++miniy) {
diff --git a/simulat0r/tui/simulat0r.c b/simulat0r/tui/simulat0r.c
index 526a3c2..2d0208d 100644
--- a/simulat0r/tui/simulat0r.c
+++ b/simulat0r/tui/simulat0r.c
@@ -1,18 +1,17 @@
 #include "simulator.h"
+#include "../firmware/basic/basic.h"
 #include "../firmware/lcd/display.h"
 
 #include <unistd.h>
 
-extern int lcd_layout;
-
 void simlcdDisplayUpdate() {
   write(1,"\033[H",3);
   for(int y=0; y<RESY; ++y) {
     for(int x=0; x<RESX; ++x) {
-      if(lcd_layout & LCD_INVERTED) {
-	write(1,(lcdGetPixel((lcd_layout & LCD_MIRRORX)?(RESX-x-1):x,(lcd_layout & LCD_MIRRORY)?(RESY-y-1):y)?"#":"_"),1);
+      if(globalconfig.lcdstate & LCD_INVERTED) {
+	write(1,(lcdGetPixel((globalconfig.lcdstate & LCD_MIRRORX)?(RESX-x-1):x,(globalconfig.lcdstate & LCD_MIRRORY)?(RESY-y-1):y)?"#":"_"),1);
       } else {
-	write(1,(lcdGetPixel((lcd_layout & LCD_MIRRORX)?(RESX-x-1):x,(lcd_layout & LCD_MIRRORY)?(RESY-y-1):y)?".":"@"),1);
+	write(1,(lcdGetPixel((globalconfig.lcdstate & LCD_MIRRORX)?(RESX-x-1):x,(globalconfig.lcdstate & LCD_MIRRORY)?(RESY-y-1):y)?".":"@"),1);
       }
     }
       write(1,("\n"),1);