diff --git a/src/Makefile b/src/Makefile
index 8ac737d1f..3a3a493e8 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -130,9 +130,6 @@ GRAPHICS = YES
 BOLD = YES
 BATTGRAPH = NO
 
-# THR trace (in STATS screen)
-THR_TRACE = YES
-
 # PPM center adjustable
 # Values = YES, NO
 PPM_CENTER_ADJUSTABLE = NO
@@ -239,6 +236,12 @@ ifneq ($(PCB), $(filter $(PCB), STD 9X 9XR STD128 9X128 9XR128 GRUVIN9X MEGA2560
   $(error Sorry, the PCB $(PCB) is not supported yet in openTx)
 endif
 
+GVARS_VARIANT  = +1 
+FRSKY_VARIANT  = +2
+3POS_VARIANT   = +4
+M128_VARIANT   = +32768
+EEPROM_VARIANT = 0
+
 ifeq ($(PCB), $(filter $(PCB), STD 9X 9XR))
   # 9x/9xr radio
   ARCH = AVR
@@ -247,6 +250,7 @@ ifeq ($(PCB), $(filter $(PCB), STD 9X 9XR))
   OPT = s  
   XCURVES = NO
   SDCARD = NO
+  THR_TRACE = NO
   EXTRAINCDIRS = stock
   CPPDEFS = -DF_CPU=$(F_CPU)UL -DPCBSTD -DCPUM64 -DEEPROM_VARIANT=$(shell echo ${EEPROM_VARIANT} | bc)
   BOARDSRC = stock/board_stock.cpp
@@ -298,6 +302,7 @@ ifeq ($(PCB), $(filter $(PCB), STD128 9X128 9XR128))
   MCU = atmega128
   OPT = 2
   SDCARD = NO
+  THR_TRACE = NO
   EEPROM_VARIANT += ${M128_VARIANT}
   CPPDEFS = -DF_CPU=$(F_CPU)UL -DPCBSTD -DCPUM128 -DEEPROM_VARIANT=$(shell echo ${EEPROM_VARIANT} | bc)
   EXTRAINCDIRS = stock
@@ -357,6 +362,7 @@ ifeq ($(PCB), GRUVIN9X)
   CPPDEFS += -DF_CPU=$(F_CPU)UL -DPCBGRUVIN9X -DEEPROM_VARIANT=0 -DAUDIO -DHAPTIC
   SDCARD = NO
   BEEPER = NO
+  THR_TRACE = YES
   EXTRAINCDIRS = gruvin9x stock FatFs FatFs/option
   BOARDSRC = gruvin9x/board_gruvin9x.cpp
   EXTRABOARDSRC = stock/lcd_driver.cpp
@@ -394,6 +400,7 @@ ifeq ($(PCB), MEGA2560)
   OPT = 2
   CPPDEFS = -DF_CPU=$(F_CPU)UL -DPCBGRUVIN9X -DEEPROM_VARIANT=0 -DAUDIO -DHAPTIC
   SDCARD = NO
+  THR_TRACE = YES
   EXTRAINCDIRS = gruvin9x stock FatFs FatFs/option
   BOARDSRC = mega2560/board_mega2560.cpp
   EXTRABOARDSRC = mega2560/lcd_driver_ST7565R.cpp
@@ -437,6 +444,7 @@ ifeq ($(PCB), SKY9X)
   OPT = 2
   SDCARD = YES
   BEEPER = NO
+  THR_TRACE = YES
   CPPDEFS += -DPCBSKY9X -DCPUARM -DEEPROM_VARIANT=0 -DAUDIO -DHAPTIC -DPXX -DDSM2 -DDSM2_PPM -DROTARY_ENCODERS=1
   EXTRAINCDIRS = sky9x CoOS/kernel CoOS/portable
   BOARDSRC = sky9x/board_sky9x.cpp
@@ -494,6 +502,7 @@ ifeq ($(PCB), TARANIS)
   OPT = 2
   CPPDEFS += -DHSE_VALUE=12000000
   SDCARD = YES
+  THR_TRACE = YES
   EXT = FRSKY
   CPPDEFS += -DPCBTARANIS -DCPUARM -DEEPROM_VARIANT=0 -DAUDIO -DPXX
   EXTRAINCDIRS = taranis CoOS/kernel CoOS/portable
@@ -593,12 +602,6 @@ CPPDEFS += -DTRANSLATIONS_$(TRANSLATIONS)
 # TTS language
 CPPDEFS += -DTTS_$(TTS)
 
-GVARS_VARIANT  = +0x0001 
-FRSKY_VARIANT  = +0x0002
-3POS_VARIANT   = +0x0004
-M128_VARIANT   = +0x8000
-EEPROM_VARIANT = 0
-
 ifeq ($(UNITS), IMPERIAL)
   CPPDEFS += -DIMPERIAL_UNITS
 endif
diff --git a/src/myeeprom.h b/src/myeeprom.h
index e8645f5e1..ecfa5b9ca 100644
--- a/src/myeeprom.h
+++ b/src/myeeprom.h
@@ -874,8 +874,8 @@ PACK(typedef struct t_PhaseData {
   #define MAX_PHASES 5
   #define MAX_MIXERS 32
   #define MAX_EXPOS  14
-  #define NUM_CSW    12 // number of custom switches
-  #define NUM_CFN    16 // number of functions assigned to switches
+  #define NUM_CSW    15 // number of custom switches
+  #define NUM_CFN    24 // number of functions assigned to switches
 #else
   #define MAX_MODELS 16
   #define NUM_CHNOUT 16 // number of real output channels CH1-CH16
diff --git a/src/opentx.h b/src/opentx.h
index 741aed2ee..1164864eb 100644
--- a/src/opentx.h
+++ b/src/opentx.h
@@ -1118,7 +1118,7 @@ extern void moveTrimsToOffsets();
 #if defined(CPUARM)
   #define MASK_CFN_TYPE uint32_t  // current max = 32 function switches
   #define MASK_FUNC_TYPE uint32_t // current max = 32 functions
-#elif defined(PCBSTD)
+#elif defined(CPUM64)
   #define MASK_CFN_TYPE uint16_t  // current max = 16 function switches
   #define MASK_FUNC_TYPE uint16_t // current max = 16 functions
 #else
diff --git a/src/stock/voice.h b/src/stock/voice.h
index 83dd19b4b..061850e4b 100644
--- a/src/stock/voice.h
+++ b/src/stock/voice.h
@@ -41,7 +41,11 @@
 #define BACKLIGHT_BIT           0x04
 #define SPARE_BIT               0x08
 
-#define VOICE_Q_LENGTH        8
+#if defined(CPUM64)
+  #define VOICE_Q_LENGTH        8
+#else
+  #define VOICE_Q_LENGTH        16
+#endif
 
 // Voice states
 #define V_STARTUP               0
diff --git a/src/translations/cz.h b/src/translations/cz.h
index 8a2018112..f773f7352 100644
--- a/src/translations/cz.h
+++ b/src/translations/cz.h
@@ -285,7 +285,7 @@
 
 #if defined(CPUARM)
   #define TR_CUSTOMSW          "CS1""CS2""CS3""CS4""CS5""CS6""CS7""CS8""CS9""CSA""CSB""CSC""CSD""CSE""CSF""CSG""CSH""CSI""CSJ""CSK""CSL""CSM""CSN""CSO""CSP""CSQ""CSR""CSS""CST""CSU""CSV""CSW"
-#elif defined(PCBGRUVIN9X)
+#elif defined(PCBGRUVIN9X) || defined(CPUM128)
   #define TR_CUSTOMSW          "CS1""CS2""CS3""CS4""CS5""CS6""CS7""CS8""CS9""CSA""CSB""CSC""CSD""CSE""CSF"
 #else
   #define TR_CUSTOMSW          "CS1""CS2""CS3""CS4""CS5""CS6""CS7""CS8""CS9""CSA""CSB""CSC"
diff --git a/src/translations/de.h b/src/translations/de.h
index 9a046d0d5..4d75fead1 100644
--- a/src/translations/de.h
+++ b/src/translations/de.h
@@ -287,7 +287,7 @@
 
 #if defined(CPUARM)
   #define TR_CUSTOMSW        "PS1""PS2""PS3""PS4""PS5""PS6""PS7""PS8""PS9""PSA""PSB""PSC""PSD""PSE""PSF""PSG""PSH""PSI""PSJ""PSK""PSL""PSM""PSN""PSO""PSP""PSQ""PSR""PSS""PST""PSU""PSV""PSW"
-#elif defined(PCBGRUVIN9X)
+#elif defined(PCBGRUVIN9X) || defined(CPUM128)
   #define TR_CUSTOMSW          "PS1""PS2""PS3""PS4""PS5""PS6""PS7""PS8""PS9""PSA""PSB""PSC""PSD""PSE""PSF"
 #else
   #define TR_CUSTOMSW          "PS1""PS2""PS3""PS4""PS5""PS6""PS7""PS8""PS9""PSA""PSB""PSC"
diff --git a/src/translations/en.h b/src/translations/en.h
index fb048b481..cf0cdf5d0 100644
--- a/src/translations/en.h
+++ b/src/translations/en.h
@@ -299,7 +299,7 @@
 
 #if defined(CPUARM)
   #define TR_CUSTOMSW          "CS1""CS2""CS3""CS4""CS5""CS6""CS7""CS8""CS9""CSA""CSB""CSC""CSD""CSE""CSF""CSG""CSH""CSI""CSJ""CSK""CSL""CSM""CSN""CSO""CSP""CSQ""CSR""CSS""CST""CSU""CSV""CSW"
-#elif defined(PCBGRUVIN9X)
+#elif defined(PCBGRUVIN9X) || defined(CPUM128)
   #define TR_CUSTOMSW          "CS1""CS2""CS3""CS4""CS5""CS6""CS7""CS8""CS9""CSA""CSB""CSC""CSD""CSE""CSF"
 #else
   #define TR_CUSTOMSW          "CS1""CS2""CS3""CS4""CS5""CS6""CS7""CS8""CS9""CSA""CSB""CSC"
diff --git a/src/translations/es.h b/src/translations/es.h
index dc9dbf57b..57f67cce9 100644
--- a/src/translations/es.h
+++ b/src/translations/es.h
@@ -285,7 +285,7 @@
 
 #if defined(CPUARM)
   #define TR_CUSTOMSW          "CS1""CS2""CS3""CS4""CS5""CS6""CS7""CS8""CS9""CSA""CSB""CSC""CSD""CSE""CSF""CSG""CSH""CSI""CSJ""CSK""CSL""CSM""CSN""CSO""CSP""CSQ""CSR""CSS""CST""CSU""CSV""CSW"
-#elif defined(PCBGRUVIN9X)
+#elif defined(PCBGRUVIN9X) || defined(CPUM128)
   #define TR_CUSTOMSW          "CS1""CS2""CS3""CS4""CS5""CS6""CS7""CS8""CS9""CSA""CSB""CSC""CSD""CSE""CSF"
 #else
   #define TR_CUSTOMSW          "CS1""CS2""CS3""CS4""CS5""CS6""CS7""CS8""CS9""CSA""CSB""CSC"
diff --git a/src/translations/fr.h b/src/translations/fr.h
index 371f8ebff..6644fbb09 100644
--- a/src/translations/fr.h
+++ b/src/translations/fr.h
@@ -299,7 +299,7 @@
 
 #if defined(CPUARM)
   #define TR_CUSTOMSW          "IP1""IP2""IP3""IP4""IP5""IP6""IP7""IP8""IP9""IPA""IPB""IPC""IPD""IPE""IPF""IPG""IPH""IPI""IPJ""IPK""IPL""IPM""IPN""IPO""IPP""IPQ""IPR""IPS""IPT""IPU""IPV""IPW"
-#elif defined(PCBGRUVIN9X)
+#elif defined(PCBGRUVIN9X) || defined(CPUM128)
   #define TR_CUSTOMSW          "IP1""IP2""IP3""IP4""IP5""IP6""IP7""IP8""IP9""IPA""IPB""IPC""IPD""IPE""IPF"
 #else
   #define TR_CUSTOMSW          "IP1""IP2""IP3""IP4""IP5""IP6""IP7""IP8""IP9""IPA""IPB""IPC"
diff --git a/src/translations/it.h b/src/translations/it.h
index 5b6dfca62..c2148d2f4 100644
--- a/src/translations/it.h
+++ b/src/translations/it.h
@@ -284,7 +284,7 @@
 
 #if defined(CPUARM)
   #define TR_CUSTOMSW          "SW1""SW2""SW3""SW4""SW5""SW6""SW7""SW8""SW9""SWA""SWB""SWC""SWD""SWE""SWF""SWG""SWH""SWI""SWJ""SWK""SWL""SWM""SWN""SWO""SWP""SWQ""SWR""SWS""SWT""SWU""SWV""SWW"
-#elif defined(PCBGRUVIN9X)
+#elif defined(PCBGRUVIN9X) || defined(CPUM128)
   #define TR_CUSTOMSW          "SW1""SW2""SW3""SW4""SW5""SW6""SW7""SW8""SW9""SWA""SWB""SWC""SWD""SWE""SWF"
 #else
   #define TR_CUSTOMSW          "SW1""SW2""SW3""SW4""SW5""SW6""SW7""SW8""SW9""SWA""SWB""SWC"
diff --git a/src/translations/pt.h b/src/translations/pt.h
index 1543cdba4..8fb4fb999 100644
--- a/src/translations/pt.h
+++ b/src/translations/pt.h
@@ -263,7 +263,7 @@
 
 #if defined(CPUARM)
   #define TR_CUSTOMSW          "CE1""CE2""CE3""CE4""CE5""CE6""CE7""CE8""CE9""CEA""CEB""CEC""CED""CEE""CEF""CEG""CEH""CEI""CEJ""CEK""CEL""CEM""CEN""CEO""CEP""CEQ""CER""CES""CET""CEU""CEV""CEW"
-#elif defined(PCBGRUVIN9X)
+#elif defined(PCBGRUVIN9X) || defined(CPUM128)
   #define TR_CUSTOMSW          "CE1""CE2""CE3""CE4""CE5""CE6""CE7""CE8""CE9""CEA""CEB""CEC""CED""CEE""CEF"
 #else
   #define TR_CUSTOMSW          "CE1""CE2""CE3""CE4""CE5""CE6""CE7""CE8""CE9""CEA""CEB""CEC"
diff --git a/src/translations/se.h b/src/translations/se.h
index 69657d2aa..055ce4118 100644
--- a/src/translations/se.h
+++ b/src/translations/se.h
@@ -299,7 +299,7 @@
 
 #if defined(CPUARM)
   #define TR_CUSTOMSW          "LB1""LB2""LB3""LB4""LB5""LB6""LB7""LB8""LB9""LBA""LBB""LBC""LBD""LBE""LBF""LBG""LBH""LBI""LBJ""LBK""LBL""LBM""LBN""LBO""LBP""LBQ""LBR""LBS""LBT""LBU""LBV""LBW"
-#elif defined(PCBGRUVIN9X)
+#elif defined(PCBGRUVIN9X) || defined(CPUM128)
   #define TR_CUSTOMSW          "LB1""LB2""LB3""LB4""LB5""LB6""LB7""LB8""LB9""LBA""LBB""LBC""LBD""LBE""LBF"
 #else
   #define TR_CUSTOMSW          "LB1""LB2""LB3""LB4""LB5""LB6""LB7""LB8""LB9""LBA""LBB""LBC"