diff --git a/radio/src/gui/128x64/radio_setup.cpp b/radio/src/gui/128x64/radio_setup.cpp
index fdc8457b5..f2813dfea 100644
--- a/radio/src/gui/128x64/radio_setup.cpp
+++ b/radio/src/gui/128x64/radio_setup.cpp
@@ -376,17 +376,18 @@ void menuRadioSetup(event_t event)
         SLIDER_5POS(y, g_eeGeneral.hapticStrength, STR_HAPTICSTRENGTH, event, attr);
         break;
 #endif
+        
 #if defined(GYRO)
       case ITEM_SETUP_GYRO_LABEL:
         lcdDrawTextAlignedLeft(y, STR_GYRO_LABEL);
         break;
 
       case ITEM_SETUP_GYRO_MAX:
-        lcdDrawTextAlignedLeft(y, STR_GYRO_MAX);
-        lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, 30 + g_eeGeneral.gyroMax, attr|LEFT);
+        lcdDrawText(INDENT_WIDTH, y, STR_GYRO_MAX);
+        lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, GYRO_MAX_DEFAULT + g_eeGeneral.gyroMax, attr|LEFT);
         lcdDrawChar(lcdLastRightPos, y, '@', attr);
         if (attr) {
-          CHECK_INCDEC_GENVAR(event, g_eeGeneral.gyroMax, -20, 60);
+          CHECK_INCDEC_GENVAR(event, g_eeGeneral.gyroMax, GYRO_MAX_DEFAULT - GYRO_MAX_RANGE, GYRO_MAX_DEFAULT + GYRO_MAX_RANGE);
           lcdDrawText(LCD_W-4*FW, y, "(");
           lcdDrawNumber(lcdLastRightPos, y, max(abs(gyro.outputs[0]), abs(gyro.outputs[1])) * 180 / 1024);
           lcdDrawText(lcdLastRightPos, y, ")");
@@ -394,17 +395,18 @@ void menuRadioSetup(event_t event)
         break;
 
       case ITEM_SETUP_GYRO_OFFSET:
-        lcdDrawTextAlignedLeft(y, STR_GYRO_OFFSET);
+        lcdDrawText(INDENT_WIDTH, y, STR_GYRO_OFFSET);
         lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.gyroOffset, attr|LEFT);
         lcdDrawChar(lcdLastRightPos, y, '@', attr);
         if (attr) {
-          CHECK_INCDEC_GENVAR(event, g_eeGeneral.gyroOffset, 10, 90);
+          CHECK_INCDEC_GENVAR(event, g_eeGeneral.gyroOffset, GYRO_OFFSET_MIN, GYRO_OFFSET_MAX);
           lcdDrawText(LCD_W-4*FW, y, "(");
           lcdDrawNumber(lcdLastRightPos, y, gyro.outputs[0] * 180 / 1024);
           lcdDrawText(lcdLastRightPos, y, ")");
         }
         break;
 #endif
+        
       case ITEM_SETUP_CONTRAST:
         lcdDrawTextAlignedLeft(y, STR_CONTRAST);
         lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.contrast, attr|LEFT);
diff --git a/radio/src/storage/datacopy.cpp b/radio/src/storage/datacopy.cpp
index c8f8607a5..99caa414a 100644
--- a/radio/src/storage/datacopy.cpp
+++ b/radio/src/storage/datacopy.cpp
@@ -1,4 +1,4 @@
-//This file was auto-generated by generate_datacopy.py script on Wed Apr  3 12:26:41 2019. Do not edit this file!
+//This file was auto-generated by generate_datacopy.py script on Wed Apr  3 12:29:34 2019. Do not edit this file!
 
 
 
diff --git a/radio/src/targets/taranis/board.h b/radio/src/targets/taranis/board.h
index 6bfa52df4..f0d85ce12 100644
--- a/radio/src/targets/taranis/board.h
+++ b/radio/src/targets/taranis/board.h
@@ -811,5 +811,9 @@ extern DMAFifo<32> serial2RxFifo;
 #define GYRO_BUFFER_LENGTH              (GYRO_VALUES_COUNT * sizeof(int16_t))
 int gyroInit();
 int gyroRead(uint8_t buffer[GYRO_BUFFER_LENGTH]);
+#define GYRO_MAX_DEFAULT                30
+#define GYRO_MAX_RANGE                  60
+#define GYRO_OFFSET_MIN                 10
+#define GYRO_OFFSET_MAX                 90
 
 #endif // _BOARD_H_
diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt
index 0e83b4d6f..3e7c8d58c 100644
--- a/radio/src/translations/cz.h.txt
+++ b/radio/src/translations/cz.h.txt
@@ -632,8 +632,8 @@
 #define TR_HAPTIC_LABEL        "Vibrace"
 #define TR_HAPTICSTRENGTH      INDENT"Síla"
 #define TR_GYRO_LABEL                  "Gyro"
-#define TR_GYRO_OFFSET                 INDENT "Offset"
-#define TR_GYRO_MAX                    INDENT "Max"
+#define TR_GYRO_OFFSET                 "Offset"
+#define TR_GYRO_MAX                    "Max"
 #define TR_CONTRAST            "Kontrast LCD"
 #define TR_ALARMS_LABEL        "Alarmy"
 #define TR_BATTERY_RANGE       TR("Ukazatel bat.", "Ukazatel baterie")
diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt
index 49ce746be..4a79ae7b8 100644
--- a/radio/src/translations/de.h.txt
+++ b/radio/src/translations/de.h.txt
@@ -637,8 +637,8 @@
 #define TR_HAPTIC_LABEL        "Haptik"
 #define TR_HAPTICSTRENGTH      INDENT "Stärke"
 #define TR_GYRO_LABEL                  "Gyro"
-#define TR_GYRO_OFFSET                 INDENT "Offset"
-#define TR_GYRO_MAX                    INDENT "Max"
+#define TR_GYRO_OFFSET                 "Offset"
+#define TR_GYRO_MAX                    "Max"
 #define TR_CONTRAST            "LCD-Kontrast"
 #define TR_ALARMS_LABEL        "Alarme"
 #define TR_BATTERY_RANGE       TR("Akku Bereich", "Akku Spgannungsbereich") // Symbol Akku Ladezustand
diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt
index ec998bfba..232d7d49d 100644
--- a/radio/src/translations/en.h.txt
+++ b/radio/src/translations/en.h.txt
@@ -643,8 +643,8 @@
 #define TR_HAPTIC_LABEL                "Haptic"
 #define TR_HAPTICSTRENGTH              INDENT "Strength"
 #define TR_GYRO_LABEL                  "Gyro"
-#define TR_GYRO_OFFSET                 INDENT "Offset"
-#define TR_GYRO_MAX                    INDENT "Max"
+#define TR_GYRO_OFFSET                 "Offset"
+#define TR_GYRO_MAX                    "Max"
 #define TR_CONTRAST                    "Contrast"
 #define TR_ALARMS_LABEL                "Alarms"
 #define TR_BATTERY_RANGE               TR("Battery range", "Battery meter range")
diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt
index fa4038ae4..7d3576d9d 100644
--- a/radio/src/translations/es.h.txt
+++ b/radio/src/translations/es.h.txt
@@ -640,8 +640,8 @@
 #define TR_HAPTIC_LABEL        "Tactil"
 #define TR_HAPTICSTRENGTH      INDENT"Intensidad"
 #define TR_GYRO_LABEL                  "Gyro"
-#define TR_GYRO_OFFSET                 INDENT "Offset"
-#define TR_GYRO_MAX                    INDENT "Max"
+#define TR_GYRO_OFFSET                 "Offset"
+#define TR_GYRO_MAX                    "Max"
 #define TR_CONTRAST            "Contraste"
 #define TR_ALARMS_LABEL        "Alarmas"
 #define TR_BATTERY_RANGE       TR("Rango bateria","Rango medidor Bater")
diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt
index 8e133631c..050a26d68 100644
--- a/radio/src/translations/fi.h.txt
+++ b/radio/src/translations/fi.h.txt
@@ -632,8 +632,8 @@
 #define TR_HAPTIC_LABEL        "Haptic"
 #define TR_HAPTICSTRENGTH      INDENT"Strength"
 #define TR_GYRO_LABEL                  "Gyro"
-#define TR_GYRO_OFFSET                 INDENT "Offset"
-#define TR_GYRO_MAX                    INDENT "Max"
+#define TR_GYRO_OFFSET                 "Offset"
+#define TR_GYRO_MAX                    "Max"
 #define TR_CONTRAST            "Contrast"
 #define TR_ALARMS_LABEL        "Alarms"
 #define TR_BATTERY_RANGE       TR("Battery range","Battery meter range")
diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt
index e0a4bde7e..d8412f060 100644
--- a/radio/src/translations/fr.h.txt
+++ b/radio/src/translations/fr.h.txt
@@ -649,8 +649,8 @@
 #define TR_HAPTIC_LABEL                "Vibreur"
 #define TR_HAPTICSTRENGTH              INDENT "Force"
 #define TR_GYRO_LABEL                  "Gyro"
-#define TR_GYRO_OFFSET                 INDENT "Offset"
-#define TR_GYRO_MAX                    INDENT "Max"
+#define TR_GYRO_OFFSET                 "Offset"
+#define TR_GYRO_MAX                    "Max"
 #define TR_CONTRAST                    "Contraste"
 #define TR_ALARMS_LABEL                "Alarmes"
 #define TR_BATTERY_RANGE               "Plage batterie"
diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt
index 9cb528aa4..8abe6726d 100644
--- a/radio/src/translations/it.h.txt
+++ b/radio/src/translations/it.h.txt
@@ -638,8 +638,8 @@
 #define TR_HAPTIC_LABEL        "Vibraz"
 #define TR_HAPTICSTRENGTH      INDENT"Forza"
 #define TR_GYRO_LABEL                  "Gyro"
-#define TR_GYRO_OFFSET                 INDENT "Offset"
-#define TR_GYRO_MAX                    INDENT "Max"
+#define TR_GYRO_OFFSET                 "Offset"
+#define TR_GYRO_MAX                    "Max"
 #define TR_CONTRAST            "Contrasto"
 #define TR_ALARMS_LABEL        "Allarmi"
 #define TR_BATTERY_RANGE       TR("Interv. Batt", "Intervallo batteria")
diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt
index fb597a5bd..9377d536d 100644
--- a/radio/src/translations/nl.h.txt
+++ b/radio/src/translations/nl.h.txt
@@ -633,8 +633,8 @@
 #define TR_HAPTIC_LABEL        "Haptic"
 #define TR_HAPTICSTRENGTH      INDENT "Sterkte"
 #define TR_GYRO_LABEL                  "Gyro"
-#define TR_GYRO_OFFSET                 INDENT "Offset"
-#define TR_GYRO_MAX                    INDENT "Max"
+#define TR_GYRO_OFFSET                 "Offset"
+#define TR_GYRO_MAX                    "Max"
 #define TR_CONTRAST            "LCD-Kontrast"
 #define TR_ALARMS_LABEL        "Alarm"
 #define TR_BATTERY_RANGE       TR("Accu Bereik", "Accu Spngs-Bereik") // Symbol Akku Ladezustand
diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt
index d79beb35e..186e32703 100644
--- a/radio/src/translations/pl.h.txt
+++ b/radio/src/translations/pl.h.txt
@@ -639,8 +639,8 @@
 #define TR_HAPTIC_LABEL        "Wibracja"
 #define TR_HAPTICSTRENGTH      INDENT"Siła"
 #define TR_GYRO_LABEL                  "Gyro"
-#define TR_GYRO_OFFSET                 INDENT "Offset"
-#define TR_GYRO_MAX                    INDENT "Max"
+#define TR_GYRO_OFFSET                 "Offset"
+#define TR_GYRO_MAX                    "Max"
 #define TR_CONTRAST            "Kontrast"
 #define TR_ALARMS_LABEL        "Alarmy"
 #define TR_BATTERY_RANGE       TR("PokażPasBat.", "Pokaż pasek bateri")
diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt
index c37244fac..4cdf8cc5a 100644
--- a/radio/src/translations/pt.h.txt
+++ b/radio/src/translations/pt.h.txt
@@ -639,8 +639,8 @@
 #define TR_HAPTIC_LABEL        "Vibrar"
 #define TR_HAPTICSTRENGTH      INDENT"Forca"
 #define TR_GYRO_LABEL                  "Gyro"
-#define TR_GYRO_OFFSET                 INDENT "Offset"
-#define TR_GYRO_MAX                    INDENT "Max"
+#define TR_GYRO_OFFSET                 "Offset"
+#define TR_GYRO_MAX                    "Max"
 #define TR_CONTRAST            "Contraste"
 #define TR_ALARMS_LABEL        "Alarmes"
 #define TR_BATTERY_RANGE       "Battery Range"
diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt
index 4c0660944..b346c9754 100644
--- a/radio/src/translations/se.h.txt
+++ b/radio/src/translations/se.h.txt
@@ -651,8 +651,8 @@
 #define TR_HAPTIC_LABEL        "Vibrator"
 #define TR_HAPTICSTRENGTH      INDENT"Styrka"
 #define TR_GYRO_LABEL                  "Gyro"
-#define TR_GYRO_OFFSET                 INDENT "Offset"
-#define TR_GYRO_MAX                    INDENT "Max"
+#define TR_GYRO_OFFSET                 "Offset"
+#define TR_GYRO_MAX                    "Max"
 #define TR_CONTRAST            "Kontrast"
 #define TR_ALARMS_LABEL        "Alarm"
 #define TR_BATTERY_RANGE       "Batteri-MinMax"