diff --git a/platformio.ini b/platformio.ini
index cc1eb021e..ae7da7e1a 100755
--- a/platformio.ini
+++ b/platformio.ini
@@ -23,7 +23,7 @@ build_dir = .pioenvs
 ;default_envs = sonoff-BR
 ;default_envs = sonoff-CN
 ;default_envs = sonoff-CZ
-default_envs = sonoff-DE
+;default_envs = sonoff-DE
 ;default_envs = sonoff-ES
 ;default_envs = sonoff-FR
 ;default_envs = sonoff-GR
diff --git a/sonoff/xdrv_13_display.ino b/sonoff/xdrv_13_display.ino
index 7aea6b92b..bb8fd78f4 100755
--- a/sonoff/xdrv_13_display.ino
+++ b/sonoff/xdrv_13_display.ino
@@ -1426,7 +1426,7 @@ void CmndDisplayAddress(void)
     if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 255)) {
       Settings.display_address[XdrvMailbox.index -1] = XdrvMailbox.payload;
     }
-    ResponseCmndNumber(Settings.display_address[XdrvMailbox.index -1]);
+    ResponseCmndIdxNumber(Settings.display_address[XdrvMailbox.index -1]);
   }
 }
 
diff --git a/sonoff/xdsp_02_ssd1306.ino b/sonoff/xdsp_02_ssd1306.ino
index abf776c7c..6896b281a 100755
--- a/sonoff/xdsp_02_ssd1306.ino
+++ b/sonoff/xdsp_02_ssd1306.ino
@@ -1,7 +1,7 @@
 /*
   xdsp_02_SSD1306.ino - Display Oled SSD1306 support for Sonoff-Tasmota
 
-  Copyright (C) 2018  Theo Arends and Adafruit
+  Copyright (C) 2019  Theo Arends and Adafruit
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/sonoff/xdsp_05_epaper_29.ino b/sonoff/xdsp_05_epaper_29.ino
index 2af8c3341..ee99126d0 100644
--- a/sonoff/xdsp_05_epaper_29.ino
+++ b/sonoff/xdsp_05_epaper_29.ino
@@ -1,7 +1,7 @@
 /*
   xdsp_05_epaper.ino - Display e-paper support for Sonoff-Tasmota
 
-  Copyright (C) 2018  Theo Arends, Gerhard Mutz and Waveshare
+  Copyright (C) 2019  Theo Arends, Gerhard Mutz and Waveshare
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
 
 #ifdef USE_SPI
 #ifdef USE_DISPLAY
-#ifdef USE_DISPLAY_EPAPER29
+#ifdef USE_DISPLAY_EPAPER_29
 
 #define XDSP_05                5
 
diff --git a/sonoff/xdsp_06_epaper_42.ino b/sonoff/xdsp_06_epaper_42.ino
index 48ac93075..ddd1aeb56 100644
--- a/sonoff/xdsp_06_epaper_42.ino
+++ b/sonoff/xdsp_06_epaper_42.ino
@@ -1,7 +1,7 @@
 /*
   xdsp_05_epaper.ino - Display e-paper support for Sonoff-Tasmota
 
-  Copyright (C) 2018  Theo Arends, Gerhard Mutz and Waveshare
+  Copyright (C) 2019  Theo Arends, Gerhard Mutz and Waveshare
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
 
 #ifdef USE_SPI
 #ifdef USE_DISPLAY
-#ifdef USE_DISPLAY_EPAPER42
+#ifdef USE_DISPLAY_EPAPER_42
 
 #define XDSP_06                6
 
diff --git a/sonoff/xdsp_07_sh1106.ino b/sonoff/xdsp_07_sh1106.ino
index db5f33e6e..2d59ed8d5 100644
--- a/sonoff/xdsp_07_sh1106.ino
+++ b/sonoff/xdsp_07_sh1106.ino
@@ -1,7 +1,7 @@
 /*
   xdsp_07_SH1106.ino - Display Oled SH1106 support for Sonoff-Tasmota
 
-  Copyright (C) 2018  Theo Arends and Adafruit
+  Copyright (C) 2019  Theo Arends and Adafruit
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/sonoff/xdsp_08_ILI9488.ino b/sonoff/xdsp_08_ILI9488.ino
index e4f6fc235..401a8eadd 100644
--- a/sonoff/xdsp_08_ILI9488.ino
+++ b/sonoff/xdsp_08_ILI9488.ino
@@ -1,7 +1,7 @@
 /*
   xdsp_08_ILI9488.ino - Display ILI9488 support for Sonoff-Tasmota
 
-  Copyright (C) 2018  Theo Arends, Gerhard Mutz
+  Copyright (C) 2019  Theo Arends, Gerhard Mutz
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by