diff --git a/radio/src/fonts/480x272/CMakeLists.txt b/radio/src/fonts/480x272/CMakeLists.txt
deleted file mode 100644
index a8b57384e..000000000
--- a/radio/src/fonts/480x272/CMakeLists.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-set(FONT "Roboto/Roboto-Regular")
-set(FONT_BOLD "Roboto/Roboto-Bold")
-set(FONT_OFFSET 1)
-
-#set(FONT "Kanit/Kanit-Regular")
-#set(FONT_BOLD "Kanit/Kanit-Bold")
-#set(FONT_OFFSET -2)
-
-#set(FONT "Ubuntu/Ubuntu-Regular")
-#set(FONT_BOLD "Ubuntu/Ubuntu-Bold")
-#set(FONT_OFFSET 1)
-
-add_truetype_font_target(480x272 tinsize     ${FONT}      9  0)
-add_truetype_font_target(480x272 smlsize     ${FONT}      13 0)
-add_truetype_font_target(480x272 stdsize     ${FONT}      16 1)
-add_truetype_font_target(480x272 stdsizebold ${FONT_BOLD} 16 1)
-add_truetype_font_target(480x272 midsize     ${FONT}      24 0)
-add_truetype_font_target(480x272 dblsize     ${FONT_BOLD} 32 0)
-add_truetype_font_target(480x272 xxlsize     ${FONT_BOLD} 64 0)
-
-add_custom_target(ttf_horus_fonts DEPENDS ${ttf_480x272_fonts_targets})
diff --git a/radio/src/fonts/480x272/font_stdsize.png b/radio/src/fonts/480x272/font_stdsize.png
deleted file mode 100644
index afd1e98b5..000000000
Binary files a/radio/src/fonts/480x272/font_stdsize.png and /dev/null differ
diff --git a/radio/src/gui/colorlcd/fonts.cpp b/radio/src/gui/colorlcd/fonts.cpp
index 869d76529..5362505a6 100644
--- a/radio/src/gui/colorlcd/fonts.cpp
+++ b/radio/src/gui/colorlcd/fonts.cpp
@@ -28,7 +28,7 @@ const unsigned char font_xxs[] = {
 #include "font_9.lbm"
 };
 
-#if defined(HARDWARE_TOUCH)
+#if LCD_H > 272
 const uint16_t font_std_en_specs[] = {
 #include "font_17en.specs"
 };
diff --git a/radio/src/gui/colorlcd/timeedit.cpp b/radio/src/gui/colorlcd/timeedit.cpp
index 40fff2601..72245d17d 100644
--- a/radio/src/gui/colorlcd/timeedit.cpp
+++ b/radio/src/gui/colorlcd/timeedit.cpp
@@ -91,6 +91,7 @@ bool TimeEdit::onTouchEnd(coord_t x, coord_t y)
 
 void TimeEdit::onFocusLost()
 {
+  BaseNumberEdit::onFocusLost();
 //  NumberKeyboard::instance()->disable(true);
 }
 #endif
diff --git a/radio/src/translations/cn.h.txt b/radio/src/translations/cn.h.txt
index 5d58af4a7..0d794342e 100644
--- a/radio/src/translations/cn.h.txt
+++ b/radio/src/translations/cn.h.txt
@@ -44,41 +44,37 @@
 
 // NON ZERO TERMINATED STRINGS
 #define LEN_OFFON                      "\002"
-#define TR_OFFON                       "关""开"
+#define TR_OFFON                       "关" "开"
 
 #define LEN_MMMINV                     "\003"
-#define TR_MMMINV                      "---""反\0"
+#define TR_MMMINV                      "---" "反\0"
 
-#define LEN_VBEEPMODE                  "\008"
-#define TR_VBEEPMODE                   "安静\0 ""警告\0 ""忽略按键""全部\0 "
+#define LEN_VBEEPMODE                  "\010"
+#define TR_VBEEPMODE                   "安静\0   " "警告\0   " "忽略按键" "全部\0   "
 
-#define LEN_VBLMODE                    TR("\004", "\010")
-#define TR_VBLMODE                     TR("关闭""按键""操控""全部""开启", "关闭\0   ""按键\0   ""操控\0   ""全部\0   ""开启\0   ")
+#define LEN_VBLMODE                    "\004"
+#define TR_VBLMODE                     "关闭" "按键" "操控" "全部" "开启"
 
 #define LEN_TRNMODE                    "\003"
-#define TR_TRNMODE                     "关 ""+=\0"":=\0"
+#define TR_TRNMODE                     "关\0" "+=\0" ":=\0"
 
 #define LEN_TRNCHN                     "\003"
 #define TR_TRNCHN                      "CH1CH2CH3CH4"
 
-#define LEN_AUX_SERIAL_MODES           "\015"
-#if defined(CLI) || defined(DEBUG)
-#define TR_AUX_SERIAL_MODES            "调试\0      ""回传镜像\0    ""回传输入\0    ""SBUS教练\0    ""LUA脚本\0     "
-#else
-#define TR_AUX_SERIAL_MODES            "调试\0      ""回传镜像\0    ""回传输入\0    ""SBUS教练\0    ""LUA脚本\0     "
-#endif
+#define LEN_AUX_SERIAL_MODES           "\010"
+#define TR_AUX_SERIAL_MODES            "调试\0   " "回传镜像" "回传输入" "SBUS教练" "LUA脚本\0"
 
-#define LEN_SWTYPES                    "\006"
-#define TR_SWTYPES                     "无\0   ""回弹\0 ""2段\0  ""3段\0  "
+#define LEN_SWTYPES                    "\004"
+#define TR_SWTYPES                     "无\0 " "回弹" "2段\0""3段\0"
 
-#define LEN_POTTYPES                    TR("\013", "\017")
-#define TR_POTTYPES                     TR("无\0        ""有中点\0    ""多段\0      ""无中点\0    ",  "无\0            ""有中点旋钮\0    ""多段旋钮\0      ""无中点旋钮\0    ")
+#define LEN_POTTYPES                   "\012"
+#define TR_POTTYPES                    "无\0       " "有中点旋钮" "多段旋钮\0 " "无中点旋钮"
 
 #define LEN_SLIDERTYPES                "\006"
-#define TR_SLIDERTYPES                 "无\0  ""侧滑块"
+#define TR_SLIDERTYPES                 "无\0   " "侧滑块"
 
 #define LEN_VLCD                       "\006"
-#define TR_VLCD                        "NormalOptrex"
+#define TR_VLCD                        "Normal" "Optrex"
 
 #define LEN_VPERSISTENT                "\014"
 #define TR_VPERSISTENT                 "OFF\0        ""Flight\0     ""Manual Reset"
@@ -178,8 +174,6 @@
 
 #if defined(AUDIO)
   #define TR_SOUND                     "播放声音\0 "
-#else
-  #define TR_SOUND                     "哔哔音\0     "
 #endif
 
 #if defined(HAPTIC)