diff --git a/radio/sdcard/horus/S6R/S6R.lua b/radio/sdcard/horus/SxR/SxR.lua
similarity index 97%
rename from radio/sdcard/horus/S6R/S6R.lua
rename to radio/sdcard/horus/SxR/SxR.lua
index 742115da4..766a08a63 100755
--- a/radio/sdcard/horus/S6R/S6R.lua
+++ b/radio/sdcard/horus/SxR/SxR.lua
@@ -26,6 +26,7 @@ local mountBitmapsFile = {"img/up.png", "img/down.png", "img/vert.png", "img/ver
 
 local settingsFields = {
   {"S6R functions:", COMBO, 0x9C, nil, { "Disable", "Enable" } },
+  {"Quick Mode:", COMBO, 0xAA, nil, { "Disable", "Enable" } },
   {"CH5 mode:", COMBO, 0xA8, nil, { "AIL2", "AUX1" } },
   {"CH6 mode:", COMBO, 0xA9, nil, { "ELE2", "AUX2" } },
   {"AIL direction:", COMBO, 0x82, nil, { "Normal", "Invers" }, { 255, 0 } },
@@ -151,7 +152,7 @@ local function refreshNext()
       if telemetryWrite(0x9D, calibrationStep) == true then
         refreshState = 1
         calibrationState = 2
-        telemetryPopTimeout = getTime() + 80 -- normal delay is 500ms
+        telemetryPopTimeout = getTime() + 120 -- normal delay is 500ms
       end
     elseif #modifications > 0 then
       telemetryWrite(modifications[1][1], modifications[1][2])
@@ -199,6 +200,8 @@ local function refreshNext()
         end
       end
     elseif getTime() > telemetryPopTimeout then
+      fields[refreshIndex + 1][4] = nil
+      refreshIndex = refreshIndex + 1
       refreshState = 0
       calibrationState = 0
     end
diff --git a/radio/sdcard/horus/S6R/S6R_Calibrate.lua b/radio/sdcard/horus/SxR/SxR_Calibrate.lua
similarity index 100%
rename from radio/sdcard/horus/S6R/S6R_Calibrate.lua
rename to radio/sdcard/horus/SxR/SxR_Calibrate.lua
diff --git a/radio/sdcard/horus/S6R/img/back.png b/radio/sdcard/horus/SxR/img/back.png
similarity index 100%
rename from radio/sdcard/horus/S6R/img/back.png
rename to radio/sdcard/horus/SxR/img/back.png
diff --git a/radio/sdcard/horus/S6R/img/delta_b.png b/radio/sdcard/horus/SxR/img/delta_b.png
similarity index 100%
rename from radio/sdcard/horus/S6R/img/delta_b.png
rename to radio/sdcard/horus/SxR/img/delta_b.png
diff --git a/radio/sdcard/horus/S6R/img/done.bmp b/radio/sdcard/horus/SxR/img/done.bmp
similarity index 100%
rename from radio/sdcard/horus/S6R/img/done.bmp
rename to radio/sdcard/horus/SxR/img/done.bmp
diff --git a/radio/sdcard/horus/S6R/img/down.png b/radio/sdcard/horus/SxR/img/down.png
similarity index 100%
rename from radio/sdcard/horus/S6R/img/down.png
rename to radio/sdcard/horus/SxR/img/down.png
diff --git a/radio/sdcard/horus/S6R/img/forward.png b/radio/sdcard/horus/SxR/img/forward.png
similarity index 100%
rename from radio/sdcard/horus/S6R/img/forward.png
rename to radio/sdcard/horus/SxR/img/forward.png
diff --git a/radio/sdcard/horus/S6R/img/left.png b/radio/sdcard/horus/SxR/img/left.png
similarity index 100%
rename from radio/sdcard/horus/S6R/img/left.png
rename to radio/sdcard/horus/SxR/img/left.png
diff --git a/radio/sdcard/horus/S6R/img/plane_b.png b/radio/sdcard/horus/SxR/img/plane_b.png
similarity index 100%
rename from radio/sdcard/horus/S6R/img/plane_b.png
rename to radio/sdcard/horus/SxR/img/plane_b.png
diff --git a/radio/sdcard/horus/S6R/img/planev_b.png b/radio/sdcard/horus/SxR/img/planev_b.png
similarity index 100%
rename from radio/sdcard/horus/S6R/img/planev_b.png
rename to radio/sdcard/horus/SxR/img/planev_b.png
diff --git a/radio/sdcard/horus/S6R/img/planev_s.png b/radio/sdcard/horus/SxR/img/planev_s.png
similarity index 100%
rename from radio/sdcard/horus/S6R/img/planev_s.png
rename to radio/sdcard/horus/SxR/img/planev_s.png
diff --git a/radio/sdcard/horus/S6R/img/right.png b/radio/sdcard/horus/SxR/img/right.png
similarity index 100%
rename from radio/sdcard/horus/S6R/img/right.png
rename to radio/sdcard/horus/SxR/img/right.png
diff --git a/radio/sdcard/horus/S6R/img/up.png b/radio/sdcard/horus/SxR/img/up.png
similarity index 100%
rename from radio/sdcard/horus/S6R/img/up.png
rename to radio/sdcard/horus/SxR/img/up.png
diff --git a/radio/sdcard/horus/S6R/img/vert-r.png b/radio/sdcard/horus/SxR/img/vert-r.png
similarity index 100%
rename from radio/sdcard/horus/S6R/img/vert-r.png
rename to radio/sdcard/horus/SxR/img/vert-r.png
diff --git a/radio/sdcard/horus/S6R/img/vert.png b/radio/sdcard/horus/SxR/img/vert.png
similarity index 100%
rename from radio/sdcard/horus/S6R/img/vert.png
rename to radio/sdcard/horus/SxR/img/vert.png
diff --git a/radio/sdcard/taranis-x7/S6R/S6R.lua b/radio/sdcard/taranis-x7/SxR/SxR.lua
similarity index 97%
rename from radio/sdcard/taranis-x7/S6R/S6R.lua
rename to radio/sdcard/taranis-x7/SxR/SxR.lua
index 54b53dbe4..8d1615502 100644
--- a/radio/sdcard/taranis-x7/S6R/S6R.lua
+++ b/radio/sdcard/taranis-x7/SxR/SxR.lua
@@ -18,6 +18,7 @@ local configFields = {
 
 local settingsFields = {
   {"S6R functions", COMBO, 0x9C, nil, { "Disable", "Enable" } },
+  {"Quick Mode:", COMBO, 0xAA, nil, { "Disable", "Enable" } },
   {"CH5 mode", COMBO, 0xA8, nil, { "AIL2", "AUX1" } },
   {"CH6 mode", COMBO, 0xA9, nil, { "ELE2", "AUX2" } },
   {"AIL direction", COMBO, 0x82, nil, { "Normal", "Invers" }, { 255, 0 } },
@@ -132,7 +133,7 @@ local function refreshNext()
       local field = fields[refreshIndex + 1]
       if telemetryRead(field[3]) == true then
         refreshState = 1
-        telemetryPopTimeout = getTime() + 80 -- normal delay is 500ms
+        telemetryPopTimeout = getTime() + 120 -- normal delay is 500ms
       end
     end
   elseif refreshState == 1 then
@@ -163,6 +164,8 @@ local function refreshNext()
         refreshState = 0
       end
     elseif getTime() > telemetryPopTimeout then
+      fields[refreshIndex + 1][4] = nil
+      refreshIndex = refreshIndex + 1
       refreshState = 0
     end
   end
diff --git a/radio/sdcard/taranis-x7/S6R/S6R_Calibrate.lua b/radio/sdcard/taranis-x7/SxR/SxR_Calibrate.lua
similarity index 100%
rename from radio/sdcard/taranis-x7/S6R/S6R_Calibrate.lua
rename to radio/sdcard/taranis-x7/SxR/SxR_Calibrate.lua
diff --git a/radio/sdcard/taranis-x9/S6R/S6R.lua b/radio/sdcard/taranis-x9/SxR/SxR.lua
similarity index 97%
rename from radio/sdcard/taranis-x9/S6R/S6R.lua
rename to radio/sdcard/taranis-x9/SxR/SxR.lua
index 1ecf6bf08..5c485bcee 100644
--- a/radio/sdcard/taranis-x9/S6R/S6R.lua
+++ b/radio/sdcard/taranis-x9/SxR/SxR.lua
@@ -20,6 +20,7 @@ local configFields = {
 
 local settingsFields = {
   {"S6R functions:", COMBO, 0x9C, nil, { "Disable", "Enable" } },
+  {"Quick Mode:", COMBO, 0xAA, nil, { "Disable", "Enable" } },
   {"CH5 mode:", COMBO, 0xA8, nil, { "AIL2", "AUX1" } },
   {"CH6 mode:", COMBO, 0xA9, nil, { "ELE2", "AUX2" } },
   {"AIL direction:", COMBO, 0x82, nil, { "Normal", "Invers" }, { 255, 0 } },
@@ -134,7 +135,7 @@ local function refreshNext()
       local field = fields[refreshIndex + 1]
       if telemetryRead(field[3]) == true then
         refreshState = 1
-        telemetryPopTimeout = getTime() + 80 -- normal delay is 500ms
+        telemetryPopTimeout = getTime() + 120 -- normal delay is 500ms
       end
     end
   elseif refreshState == 1 then
@@ -165,6 +166,8 @@ local function refreshNext()
         refreshState = 0
       end
     elseif getTime() > telemetryPopTimeout then
+      fields[refreshIndex + 1][4] = nil
+      refreshIndex = refreshIndex + 1
       refreshState = 0
     end
   end
diff --git a/radio/sdcard/taranis-x9/S6R/S6R_Calibrate.lua b/radio/sdcard/taranis-x9/SxR/SxR_Calibrate.lua
similarity index 100%
rename from radio/sdcard/taranis-x9/S6R/S6R_Calibrate.lua
rename to radio/sdcard/taranis-x9/SxR/SxR_Calibrate.lua
diff --git a/radio/sdcard/taranis-x9/S6R/bmp/back.bmp b/radio/sdcard/taranis-x9/SxR/bmp/back.bmp
similarity index 100%
rename from radio/sdcard/taranis-x9/S6R/bmp/back.bmp
rename to radio/sdcard/taranis-x9/SxR/bmp/back.bmp
diff --git a/radio/sdcard/taranis-x9/S6R/bmp/delta.bmp b/radio/sdcard/taranis-x9/SxR/bmp/delta.bmp
similarity index 100%
rename from radio/sdcard/taranis-x9/S6R/bmp/delta.bmp
rename to radio/sdcard/taranis-x9/SxR/bmp/delta.bmp
diff --git a/radio/sdcard/taranis-x9/S6R/bmp/done.bmp b/radio/sdcard/taranis-x9/SxR/bmp/done.bmp
similarity index 100%
rename from radio/sdcard/taranis-x9/S6R/bmp/done.bmp
rename to radio/sdcard/taranis-x9/SxR/bmp/done.bmp
diff --git a/radio/sdcard/taranis-x9/S6R/bmp/down.bmp b/radio/sdcard/taranis-x9/SxR/bmp/down.bmp
similarity index 100%
rename from radio/sdcard/taranis-x9/S6R/bmp/down.bmp
rename to radio/sdcard/taranis-x9/SxR/bmp/down.bmp
diff --git a/radio/sdcard/taranis-x9/S6R/bmp/forward.bmp b/radio/sdcard/taranis-x9/SxR/bmp/forward.bmp
similarity index 100%
rename from radio/sdcard/taranis-x9/S6R/bmp/forward.bmp
rename to radio/sdcard/taranis-x9/SxR/bmp/forward.bmp
diff --git a/radio/sdcard/taranis-x9/S6R/bmp/horz-r.bmp b/radio/sdcard/taranis-x9/SxR/bmp/horz-r.bmp
similarity index 100%
rename from radio/sdcard/taranis-x9/S6R/bmp/horz-r.bmp
rename to radio/sdcard/taranis-x9/SxR/bmp/horz-r.bmp
diff --git a/radio/sdcard/taranis-x9/S6R/bmp/horz.bmp b/radio/sdcard/taranis-x9/SxR/bmp/horz.bmp
similarity index 100%
rename from radio/sdcard/taranis-x9/S6R/bmp/horz.bmp
rename to radio/sdcard/taranis-x9/SxR/bmp/horz.bmp
diff --git a/radio/sdcard/taranis-x9/S6R/bmp/left.bmp b/radio/sdcard/taranis-x9/SxR/bmp/left.bmp
similarity index 100%
rename from radio/sdcard/taranis-x9/S6R/bmp/left.bmp
rename to radio/sdcard/taranis-x9/SxR/bmp/left.bmp
diff --git a/radio/sdcard/taranis-x9/S6R/bmp/plane.bmp b/radio/sdcard/taranis-x9/SxR/bmp/plane.bmp
similarity index 100%
rename from radio/sdcard/taranis-x9/S6R/bmp/plane.bmp
rename to radio/sdcard/taranis-x9/SxR/bmp/plane.bmp
diff --git a/radio/sdcard/taranis-x9/S6R/bmp/right.bmp b/radio/sdcard/taranis-x9/SxR/bmp/right.bmp
similarity index 100%
rename from radio/sdcard/taranis-x9/S6R/bmp/right.bmp
rename to radio/sdcard/taranis-x9/SxR/bmp/right.bmp
diff --git a/radio/sdcard/taranis-x9/S6R/bmp/up.bmp b/radio/sdcard/taranis-x9/SxR/bmp/up.bmp
similarity index 100%
rename from radio/sdcard/taranis-x9/S6R/bmp/up.bmp
rename to radio/sdcard/taranis-x9/SxR/bmp/up.bmp
diff --git a/radio/sdcard/taranis-x9/S6R/bmp/vert-r.bmp b/radio/sdcard/taranis-x9/SxR/bmp/vert-r.bmp
similarity index 100%
rename from radio/sdcard/taranis-x9/S6R/bmp/vert-r.bmp
rename to radio/sdcard/taranis-x9/SxR/bmp/vert-r.bmp
diff --git a/radio/sdcard/taranis-x9/S6R/bmp/vert.bmp b/radio/sdcard/taranis-x9/SxR/bmp/vert.bmp
similarity index 100%
rename from radio/sdcard/taranis-x9/S6R/bmp/vert.bmp
rename to radio/sdcard/taranis-x9/SxR/bmp/vert.bmp
diff --git a/radio/sdcard/taranis-x9/S6R/bmp/vtail.bmp b/radio/sdcard/taranis-x9/SxR/bmp/vtail.bmp
similarity index 100%
rename from radio/sdcard/taranis-x9/S6R/bmp/vtail.bmp
rename to radio/sdcard/taranis-x9/SxR/bmp/vtail.bmp