diff --git a/radio/sdcard/horus/THEMES/Default/aboutbg.bmp b/radio/sdcard/horus/THEMES/Default/aboutbg.bmp
deleted file mode 100644
index 645425cf7..000000000
Binary files a/radio/sdcard/horus/THEMES/Default/aboutbg.bmp and /dev/null differ
diff --git a/radio/src/bitmaps/horus/mask_current_bg.png b/radio/sdcard/horus/THEMES/Default/mask_currentmenu_bg.png
similarity index 100%
rename from radio/src/bitmaps/horus/mask_current_bg.png
rename to radio/sdcard/horus/THEMES/Default/mask_currentmenu_bg.png
diff --git a/radio/src/bitmaps/horus/mask_current_dot.png b/radio/sdcard/horus/THEMES/Default/mask_currentmenu_dot.png
similarity index 100%
rename from radio/src/bitmaps/horus/mask_current_dot.png
rename to radio/sdcard/horus/THEMES/Default/mask_currentmenu_dot.png
diff --git a/radio/sdcard/horus/THEMES/Default/mask_currentmenu_shadow.png b/radio/sdcard/horus/THEMES/Default/mask_currentmenu_shadow.png
new file mode 100644
index 000000000..97bf6c577
Binary files /dev/null and b/radio/sdcard/horus/THEMES/Default/mask_currentmenu_shadow.png differ
diff --git a/radio/src/bitmaps/horus/mask_library.png b/radio/sdcard/horus/THEMES/Default/mask_library.png
similarity index 100%
rename from radio/src/bitmaps/horus/mask_library.png
rename to radio/sdcard/horus/THEMES/Default/mask_library.png
diff --git a/radio/src/bitmaps/horus/mask_menu_model.png b/radio/sdcard/horus/THEMES/Default/mask_menu_model.png
similarity index 100%
rename from radio/src/bitmaps/horus/mask_menu_model.png
rename to radio/sdcard/horus/THEMES/Default/mask_menu_model.png
diff --git a/radio/src/bitmaps/horus/mask_menu_radio.png b/radio/sdcard/horus/THEMES/Default/mask_menu_radio.png
similarity index 100%
rename from radio/src/bitmaps/horus/mask_menu_radio.png
rename to radio/sdcard/horus/THEMES/Default/mask_menu_radio.png
diff --git a/radio/src/bitmaps/horus/mask_stats.png b/radio/sdcard/horus/THEMES/Default/mask_menu_stats.png
similarity index 100%
rename from radio/src/bitmaps/horus/mask_stats.png
rename to radio/sdcard/horus/THEMES/Default/mask_menu_stats.png
diff --git a/radio/src/bitmaps/horus/mask_mainviews.png b/radio/sdcard/horus/THEMES/Default/mask_menu_theme.png
similarity index 100%
rename from radio/src/bitmaps/horus/mask_mainviews.png
rename to radio/sdcard/horus/THEMES/Default/mask_menu_theme.png
diff --git a/radio/src/bitmaps/horus/mask_curves.png b/radio/sdcard/horus/THEMES/Default/mask_model_curves.png
similarity index 100%
rename from radio/src/bitmaps/horus/mask_curves.png
rename to radio/sdcard/horus/THEMES/Default/mask_model_curves.png
diff --git a/radio/src/bitmaps/horus/mask_flight_modes.png b/radio/sdcard/horus/THEMES/Default/mask_model_flight_modes.png
similarity index 100%
rename from radio/src/bitmaps/horus/mask_flight_modes.png
rename to radio/sdcard/horus/THEMES/Default/mask_model_flight_modes.png
diff --git a/radio/src/bitmaps/horus/mask_gvars.png b/radio/sdcard/horus/THEMES/Default/mask_model_gvars.png
similarity index 100%
rename from radio/src/bitmaps/horus/mask_gvars.png
rename to radio/sdcard/horus/THEMES/Default/mask_model_gvars.png
diff --git a/radio/src/bitmaps/horus/mask_heli.png b/radio/sdcard/horus/THEMES/Default/mask_model_heli.png
similarity index 100%
rename from radio/src/bitmaps/horus/mask_heli.png
rename to radio/sdcard/horus/THEMES/Default/mask_model_heli.png
diff --git a/radio/src/bitmaps/horus/mask_inputs.png b/radio/sdcard/horus/THEMES/Default/mask_model_inputs.png
similarity index 100%
rename from radio/src/bitmaps/horus/mask_inputs.png
rename to radio/sdcard/horus/THEMES/Default/mask_model_inputs.png
diff --git a/radio/src/bitmaps/horus/mask_logical_switches.png b/radio/sdcard/horus/THEMES/Default/mask_model_logical_switches.png
similarity index 100%
rename from radio/src/bitmaps/horus/mask_logical_switches.png
rename to radio/sdcard/horus/THEMES/Default/mask_model_logical_switches.png
diff --git a/radio/src/bitmaps/horus/mask_lua_scripts.png b/radio/sdcard/horus/THEMES/Default/mask_model_lua_scripts.png
similarity index 100%
rename from radio/src/bitmaps/horus/mask_lua_scripts.png
rename to radio/sdcard/horus/THEMES/Default/mask_model_lua_scripts.png
diff --git a/radio/src/bitmaps/horus/mask_mixer.png b/radio/sdcard/horus/THEMES/Default/mask_model_mixer.png
similarity index 100%
rename from radio/src/bitmaps/horus/mask_mixer.png
rename to radio/sdcard/horus/THEMES/Default/mask_model_mixer.png
diff --git a/radio/src/bitmaps/horus/mask_outputs.png b/radio/sdcard/horus/THEMES/Default/mask_model_outputs.png
similarity index 100%
rename from radio/src/bitmaps/horus/mask_outputs.png
rename to radio/sdcard/horus/THEMES/Default/mask_model_outputs.png
diff --git a/radio/src/bitmaps/horus/mask_model_setup.png b/radio/sdcard/horus/THEMES/Default/mask_model_setup.png
similarity index 100%
rename from radio/src/bitmaps/horus/mask_model_setup.png
rename to radio/sdcard/horus/THEMES/Default/mask_model_setup.png
diff --git a/radio/src/bitmaps/horus/mask_special_functions.png b/radio/sdcard/horus/THEMES/Default/mask_model_special_functions.png
similarity index 100%
rename from radio/src/bitmaps/horus/mask_special_functions.png
rename to radio/sdcard/horus/THEMES/Default/mask_model_special_functions.png
diff --git a/radio/src/bitmaps/horus/mask_telemetry.png b/radio/sdcard/horus/THEMES/Default/mask_model_telemetry.png
similarity index 100%
rename from radio/src/bitmaps/horus/mask_telemetry.png
rename to radio/sdcard/horus/THEMES/Default/mask_model_telemetry.png
diff --git a/radio/src/bitmaps/horus/mask_topmenu_opentx.png b/radio/sdcard/horus/THEMES/Default/mask_opentx.png
similarity index 100%
rename from radio/src/bitmaps/horus/mask_topmenu_opentx.png
rename to radio/sdcard/horus/THEMES/Default/mask_opentx.png
diff --git a/radio/src/bitmaps/horus/mask_calibration.png b/radio/sdcard/horus/THEMES/Default/mask_radio_calibration.png
similarity index 100%
rename from radio/src/bitmaps/horus/mask_calibration.png
rename to radio/sdcard/horus/THEMES/Default/mask_radio_calibration.png
diff --git a/radio/src/bitmaps/horus/mask_global_functions.png b/radio/sdcard/horus/THEMES/Default/mask_radio_global_functions.png
similarity index 100%
rename from radio/src/bitmaps/horus/mask_global_functions.png
rename to radio/sdcard/horus/THEMES/Default/mask_radio_global_functions.png
diff --git a/radio/src/bitmaps/horus/mask_hardware.png b/radio/sdcard/horus/THEMES/Default/mask_radio_hardware.png
similarity index 100%
rename from radio/src/bitmaps/horus/mask_hardware.png
rename to radio/sdcard/horus/THEMES/Default/mask_radio_hardware.png
diff --git a/radio/src/bitmaps/horus/mask_sd_browser.png b/radio/sdcard/horus/THEMES/Default/mask_radio_sd_browser.png
similarity index 100%
rename from radio/src/bitmaps/horus/mask_sd_browser.png
rename to radio/sdcard/horus/THEMES/Default/mask_radio_sd_browser.png
diff --git a/radio/src/bitmaps/horus/mask_radio_setup.png b/radio/sdcard/horus/THEMES/Default/mask_radio_setup.png
similarity index 100%
rename from radio/src/bitmaps/horus/mask_radio_setup.png
rename to radio/sdcard/horus/THEMES/Default/mask_radio_setup.png
diff --git a/radio/src/bitmaps/horus/mask_trainer.png b/radio/sdcard/horus/THEMES/Default/mask_radio_trainer.png
similarity index 100%
rename from radio/src/bitmaps/horus/mask_trainer.png
rename to radio/sdcard/horus/THEMES/Default/mask_radio_trainer.png
diff --git a/radio/src/bitmaps/horus/mask_version.png b/radio/sdcard/horus/THEMES/Default/mask_radio_version.png
similarity index 100%
rename from radio/src/bitmaps/horus/mask_version.png
rename to radio/sdcard/horus/THEMES/Default/mask_radio_version.png
diff --git a/radio/src/bitmaps/horus/mask_analogs.png b/radio/sdcard/horus/THEMES/Default/mask_stats_analogs.png
similarity index 100%
rename from radio/src/bitmaps/horus/mask_analogs.png
rename to radio/sdcard/horus/THEMES/Default/mask_stats_analogs.png
diff --git a/radio/src/bitmaps/horus/mask_stats_debug.png b/radio/sdcard/horus/THEMES/Default/mask_stats_debug.png
similarity index 100%
rename from radio/src/bitmaps/horus/mask_stats_debug.png
rename to radio/sdcard/horus/THEMES/Default/mask_stats_debug.png
diff --git a/radio/src/bitmaps/horus/mask_stats_lua.png b/radio/sdcard/horus/THEMES/Default/mask_stats_lua.png
similarity index 100%
rename from radio/src/bitmaps/horus/mask_stats_lua.png
rename to radio/sdcard/horus/THEMES/Default/mask_stats_lua.png
diff --git a/radio/src/bitmaps/horus/mask_stats_graph.png b/radio/sdcard/horus/THEMES/Default/mask_stats_throttle_graph.png
similarity index 100%
rename from radio/src/bitmaps/horus/mask_stats_graph.png
rename to radio/sdcard/horus/THEMES/Default/mask_stats_throttle_graph.png
diff --git a/radio/src/bitmaps/horus/mask_stats_time.png b/radio/sdcard/horus/THEMES/Default/mask_stats_timers.png
similarity index 100%
rename from radio/src/bitmaps/horus/mask_stats_time.png
rename to radio/sdcard/horus/THEMES/Default/mask_stats_timers.png
diff --git a/radio/src/bitmaps/horus/mask_stats_value.png b/radio/sdcard/horus/THEMES/Default/mask_stats_value.png
similarity index 100%
rename from radio/src/bitmaps/horus/mask_stats_value.png
rename to radio/sdcard/horus/THEMES/Default/mask_stats_value.png
diff --git a/radio/src/bitmaps/horus/mask_switches.png b/radio/sdcard/horus/THEMES/Default/mask_switches.png
similarity index 100%
rename from radio/src/bitmaps/horus/mask_switches.png
rename to radio/sdcard/horus/THEMES/Default/mask_switches.png
diff --git a/radio/src/bitmaps/horus/mask_mainviews_add.png b/radio/sdcard/horus/THEMES/Default/mask_theme_add_view.png
similarity index 100%
rename from radio/src/bitmaps/horus/mask_mainviews_add.png
rename to radio/sdcard/horus/THEMES/Default/mask_theme_add_view.png
diff --git a/radio/src/bitmaps/horus/mask_mainviews_topbar.png b/radio/sdcard/horus/THEMES/Default/mask_theme_setup.png
similarity index 100%
rename from radio/src/bitmaps/horus/mask_mainviews_topbar.png
rename to radio/sdcard/horus/THEMES/Default/mask_theme_setup.png
diff --git a/radio/src/bitmaps/horus/mask_mainviews_1.png b/radio/sdcard/horus/THEMES/Default/mask_theme_view1.png
similarity index 100%
rename from radio/src/bitmaps/horus/mask_mainviews_1.png
rename to radio/sdcard/horus/THEMES/Default/mask_theme_view1.png
diff --git a/radio/src/bitmaps/horus/mask_mainviews_2.png b/radio/sdcard/horus/THEMES/Default/mask_theme_view2.png
similarity index 100%
rename from radio/src/bitmaps/horus/mask_mainviews_2.png
rename to radio/sdcard/horus/THEMES/Default/mask_theme_view2.png
diff --git a/radio/src/bitmaps/horus/mask_mainviews_3.png b/radio/sdcard/horus/THEMES/Default/mask_theme_view3.png
similarity index 100%
rename from radio/src/bitmaps/horus/mask_mainviews_3.png
rename to radio/sdcard/horus/THEMES/Default/mask_theme_view3.png
diff --git a/radio/src/bitmaps/horus/mask_mainviews_4.png b/radio/sdcard/horus/THEMES/Default/mask_theme_view4.png
similarity index 100%
rename from radio/src/bitmaps/horus/mask_mainviews_4.png
rename to radio/sdcard/horus/THEMES/Default/mask_theme_view4.png
diff --git a/radio/src/bitmaps/horus/mask_mainviews_5.png b/radio/sdcard/horus/THEMES/Default/mask_theme_view5.png
similarity index 100%
rename from radio/src/bitmaps/horus/mask_mainviews_5.png
rename to radio/sdcard/horus/THEMES/Default/mask_theme_view5.png
diff --git a/radio/src/bitmaps/horus/mask_mainviews_6.png b/radio/sdcard/horus/THEMES/Default/mask_theme_view6.png
similarity index 100%
rename from radio/src/bitmaps/horus/mask_mainviews_6.png
rename to radio/sdcard/horus/THEMES/Default/mask_theme_view6.png
diff --git a/radio/src/bitmaps/horus/mask_mainviews_7.png b/radio/sdcard/horus/THEMES/Default/mask_theme_view7.png
similarity index 100%
rename from radio/src/bitmaps/horus/mask_mainviews_7.png
rename to radio/sdcard/horus/THEMES/Default/mask_theme_view7.png
diff --git a/radio/src/bitmaps/horus/mask_mainviews_8.png b/radio/sdcard/horus/THEMES/Default/mask_theme_view8.png
similarity index 100%
rename from radio/src/bitmaps/horus/mask_mainviews_8.png
rename to radio/sdcard/horus/THEMES/Default/mask_theme_view8.png
diff --git a/radio/sdcard/horus/THEMES/TBS/main.lua b/radio/sdcard/horus/THEMES/TBS/main.lua
index 56e06e46f..3defe5d3c 100644
--- a/radio/sdcard/horus/THEMES/TBS/main.lua
+++ b/radio/sdcard/horus/THEMES/TBS/main.lua
@@ -1,3 +1,5 @@
+local bitmap = 0
+
 local function load()
   lcd.setColor(TEXT_COLOR_INDEX, WHITE)
   lcd.setColor(TEXT_BGCOLOR_INDEX, BLACK)
@@ -24,11 +26,14 @@ local function load()
   lcd.setColor(HEADER_ICON_BGCOLOR_INDEX, BLACK)
   lcd.setColor(HEADER_CURRENT_BGCOLOR_INDEX, lcd.RGB(10, 78, 121))
   lcd.setColor(OVERLAY_COLOR_INDEX, BLACK)
+  bitmap = lcd.loadBitmap("THEMES/TBS/thumb.bmp")
   return 0
 end
 
 local function drawBackground()
   lcd.drawFilledRectangle(0, 0, LCD_W, LCD_H, TEXT_BGCOLOR);
+
+  lcd.drawBitmap(50, 50, bitmap)
 end
 
 local function drawTopbarBackground(icon)
diff --git a/radio/src/CMakeLists.txt b/radio/src/CMakeLists.txt
index 7e53ab2c0..9ee055d8c 100644
--- a/radio/src/CMakeLists.txt
+++ b/radio/src/CMakeLists.txt
@@ -20,6 +20,7 @@ option(AUTOSWITCH "Automatic switch detection in menus" ON)
 option(JITTER_MEASURE "Enable ADC jitter measurement" OFF)
 option(JITTER_FILTER "Enable ADC jitter filtering" ON)
 option(WATCHDOG_DISABLED "Disable hardware Watchdog on Horus" OFF)  # TODO remove it when it's OK
+option(SIMU_AUDIO "Enable simulator audio" OFF)
 
 enable_language(ASM)
 set(OPT s)
@@ -37,6 +38,7 @@ configure_file(stamp.h.in stamp.h @ONLY)
 
 add_subdirectory(translations)
 add_subdirectory(bitmaps)
+add_subdirectory(fonts)
 add_subdirectory(lua)
 
 set(EEPROM_VARIANT  0)
@@ -472,6 +474,10 @@ if(CPU_FAMILY STREQUAL STM32)
     sbus.cpp
     telemetry/crossfire.cpp
     )
+  set(PULSES_SRC
+    ${PULSES_SRC}
+    crossfire.cpp
+    )
 endif()
 
 if(ARCH STREQUAL ARM)
@@ -485,6 +491,10 @@ if(ARCH STREQUAL ARM)
   option(DEBUG_TRACE_BUFFER "Debug Trace Screen" OFF)
   option(MULTIMODULE "DIY Multiprotocol TX Module (https://github.com/pascallanger/DIY-Multiprotocol-TX-Module)" OFF)
   option(SUPPORT_D16_EU_ONLY "XJT module only supports D16-EU and LR12-EU" OFF) # TODO rename to XJT_EU_ONLY
+  option(DEBUG_INTERRUPTS "Count interrupts" OFF)
+  option(DEBUG_TASKS "Task switching statistics" OFF)
+  option(DEBUG_TIMERS "Time critical parts of the code" OFF)
+
   if(TIMERS EQUAL 3)
     add_definitions(-DTIMERS=3)
   else()
@@ -511,6 +521,18 @@ if(ARCH STREQUAL ARM)
   if(DEBUG_TRACE_BUFFER)
     add_definitions(-DDEBUG_TRACE_BUFFER)
   endif()
+  if(DEBUG_INTERRUPTS)
+    add_definitions(-DDEBUG_INTERRUPTS)
+    set(DEBUG ON)
+  endif()
+  if(DEBUG_TASKS)
+    add_definitions(-DDEBUG_TASKS)
+    set(DEBUG ON)
+  endif()
+  if(DEBUG_TIMERS)
+    add_definitions(-DDEBUG_TIMERS)
+    set(DEBUG ON)
+  endif()
   if(CLI)
     add_definitions(-DCLI)
     set(FIRMWARE_SRC ${FIRMWARE_SRC} cli.cpp)
@@ -584,11 +606,11 @@ if(ARCH STREQUAL ARM)
     ${COOS_DIR}/portable/arch.c
     )
   set(PULSES_SRC
+    ${PULSES_SRC}
     pulses_arm.cpp
     ppm_arm.cpp
     pxx_arm.cpp
     dsm2_arm.cpp
-    crossfire.cpp
     )
 else()
   option(EXT "Telemetry protocol" OFF) # TODO rename this EXT option to TELEMETRY
@@ -842,6 +864,10 @@ if(WATCHDOG_DISABLED)
   add_definitions(-DWATCHDOG_DISABLED)
 endif()
 
+if(SIMU_AUDIO)
+  add_definitions(-DSIMU_AUDIO)
+endif()
+
 if(SDCARD)
   add_definitions(-DSDCARD)
   include_directories(${FATFS_DIR} ${FATFS_DIR}/option)
diff --git a/radio/src/audio_arm.cpp b/radio/src/audio_arm.cpp
index 985a18b36..3d6369dd1 100644
--- a/radio/src/audio_arm.cpp
+++ b/radio/src/audio_arm.cpp
@@ -781,7 +781,7 @@ void AudioQueue::wakeup()
       // TRACE("pushing buffer %d\n", bufferWIdx);
       bufferWIdx = nextBufferIdx(bufferWIdx);
       buffer->size = size;
-      buffer->state = audioPushBuffer(buffer) ? AUDIO_BUFFER_PLAYING : AUDIO_BUFFER_FILLED;
+      audioPushBuffer(buffer);
       __enable_irq();
     }
   }
@@ -1004,176 +1004,174 @@ void audioEvent(unsigned int index, unsigned int freq)
     char filename[AUDIO_FILENAME_MAXLEN + 1];
     if (index < AU_SPECIAL_SOUND_FIRST && isAudioFileReferenced(index, filename)) {
       audioQueue.playFile(filename);
+      return;
     }
-    else
 #endif
-    if (index < AU_SPECIAL_SOUND_FIRST) {
-      switch (index) {
-        case AU_INACTIVITY:
-          audioQueue.playTone(2250, 80, 20, PLAY_REPEAT(2));
-          break;
-        case AU_TX_BATTERY_LOW:
+    switch (index) {
+      case AU_INACTIVITY:
+        audioQueue.playTone(2250, 80, 20, PLAY_REPEAT(2));
+        break;
+      case AU_TX_BATTERY_LOW:
 #if defined(PCBSKY9X)
-        case AU_TX_MAH_HIGH:
-        case AU_TX_TEMP_HIGH:
+      case AU_TX_MAH_HIGH:
+      case AU_TX_TEMP_HIGH:
 #endif
-          audioQueue.playTone(1950, 160, 20, PLAY_REPEAT(2), 1);
-          audioQueue.playTone(2550, 160, 20, PLAY_REPEAT(2), -1);
-          break;
-        case AU_THROTTLE_ALERT:
-        case AU_SWITCH_ALERT:
-        case AU_ERROR:
-          audioQueue.playTone(BEEP_DEFAULT_FREQ, 200, 20, PLAY_NOW);
-          break;
-        case AU_KEYPAD_UP:
-          audioQueue.playTone(BEEP_KEY_UP_FREQ, 80, 20, PLAY_NOW);
-          break;
-        case AU_KEYPAD_DOWN:
-          audioQueue.playTone(BEEP_KEY_DOWN_FREQ, 80, 20, PLAY_NOW);
-          break;
-        case AU_MENUS:
-          audioQueue.playTone(BEEP_DEFAULT_FREQ, 80, 20, PLAY_NOW);
-          break;
-        case AU_TRIM_MOVE:
-          audioQueue.playTone(freq, 40, 20, PLAY_NOW);
-          break;
-        case AU_TRIM_MIDDLE:
-          audioQueue.playTone(freq, 80, 20, PLAY_NOW);
-          break;
-        case AU_TRIM_END:
-          audioQueue.playTone(freq, 80, 20, PLAY_NOW);
-          break;
-        case AU_WARNING1:
-          audioQueue.playTone(BEEP_DEFAULT_FREQ, 80, 20, PLAY_NOW);
-          break;
-        case AU_WARNING2:
-          audioQueue.playTone(BEEP_DEFAULT_FREQ, 160, 20, PLAY_NOW);
-          break;
-        case AU_WARNING3:
-          audioQueue.playTone(BEEP_DEFAULT_FREQ, 200, 20, PLAY_NOW);
-          break;
-          // TODO remove all these ones
-        case AU_STICK1_MIDDLE:
-        case AU_STICK2_MIDDLE:
-        case AU_STICK3_MIDDLE:
-        case AU_STICK4_MIDDLE:
-        case AU_POT1_MIDDLE:
-        case AU_POT2_MIDDLE:
+        audioQueue.playTone(1950, 160, 20, PLAY_REPEAT(2), 1);
+        audioQueue.playTone(2550, 160, 20, PLAY_REPEAT(2), -1);
+        break;
+      case AU_THROTTLE_ALERT:
+      case AU_SWITCH_ALERT:
+      case AU_ERROR:
+        audioQueue.playTone(BEEP_DEFAULT_FREQ, 200, 20, PLAY_NOW);
+        break;
+      case AU_KEYPAD_UP:
+        audioQueue.playTone(BEEP_KEY_UP_FREQ, 80, 20, PLAY_NOW);
+        break;
+      case AU_KEYPAD_DOWN:
+        audioQueue.playTone(BEEP_KEY_DOWN_FREQ, 80, 20, PLAY_NOW);
+        break;
+      case AU_MENUS:
+        audioQueue.playTone(BEEP_DEFAULT_FREQ, 80, 20, PLAY_NOW);
+        break;
+      case AU_TRIM_MOVE:
+        audioQueue.playTone(freq, 40, 20, PLAY_NOW);
+        break;
+      case AU_TRIM_MIDDLE:
+        audioQueue.playTone(freq, 80, 20, PLAY_NOW);
+        break;
+      case AU_TRIM_END:
+        audioQueue.playTone(freq, 80, 20, PLAY_NOW);
+        break;
+      case AU_WARNING1:
+        audioQueue.playTone(BEEP_DEFAULT_FREQ, 80, 20, PLAY_NOW);
+        break;
+      case AU_WARNING2:
+        audioQueue.playTone(BEEP_DEFAULT_FREQ, 160, 20, PLAY_NOW);
+        break;
+      case AU_WARNING3:
+        audioQueue.playTone(BEEP_DEFAULT_FREQ, 200, 20, PLAY_NOW);
+        break;
+        // TODO remove all these ones
+      case AU_STICK1_MIDDLE:
+      case AU_STICK2_MIDDLE:
+      case AU_STICK3_MIDDLE:
+      case AU_STICK4_MIDDLE:
+      case AU_POT1_MIDDLE:
+      case AU_POT2_MIDDLE:
 #if defined(PCBTARANIS) || defined(PCBFLAMENCO) || defined(PCBHORUS)
-        case AU_SLIDER1_MIDDLE:
-        case AU_SLIDER2_MIDDLE:
+      case AU_SLIDER1_MIDDLE:
+      case AU_SLIDER2_MIDDLE:
 #else
-        case AU_POT3_MIDDLE:
+      case AU_POT3_MIDDLE:
 #endif
-          audioQueue.playTone(BEEP_DEFAULT_FREQ + 1500, 80, 20, PLAY_NOW);
-          break;
-        case AU_MIX_WARNING_1:
-          audioQueue.playTone(BEEP_DEFAULT_FREQ + 1440, 48, 32);
-          break;
-        case AU_MIX_WARNING_2:
-          audioQueue.playTone(BEEP_DEFAULT_FREQ + 1560, 48, 32, PLAY_REPEAT(1));
-          break;
-        case AU_MIX_WARNING_3:
-          audioQueue.playTone(BEEP_DEFAULT_FREQ + 1680, 48, 32, PLAY_REPEAT(2));
-          break;
-        case AU_TIMER_00:
-          audioQueue.playTone(BEEP_DEFAULT_FREQ + 150, 300, 20, PLAY_NOW);
-          break;
-        case AU_TIMER_LT10:
-          audioQueue.playTone(BEEP_DEFAULT_FREQ + 150, 120, 20, PLAY_NOW);
-          break;
-        case AU_TIMER_20:
-          audioQueue.playTone(BEEP_DEFAULT_FREQ + 150, 120, 20, PLAY_REPEAT(1) | PLAY_NOW);
-          break;
-        case AU_TIMER_30:
-          audioQueue.playTone(BEEP_DEFAULT_FREQ + 150, 120, 20, PLAY_REPEAT(2) | PLAY_NOW);
-          break;
-        case AU_A1_ORANGE:
-        case AU_A2_ORANGE:
-        case AU_A3_ORANGE:
-        case AU_A4_ORANGE:
-          audioQueue.playTone(BEEP_DEFAULT_FREQ + 600, 200, 20, PLAY_NOW);
-          break;
-        case AU_A1_RED:
-        case AU_A2_RED:
-        case AU_A3_RED:
-        case AU_A4_RED:
-          audioQueue.playTone(BEEP_DEFAULT_FREQ + 600, 200, 20, PLAY_REPEAT(1) | PLAY_NOW);
-          break;
-        case AU_RSSI_ORANGE:
-          audioQueue.playTone(BEEP_DEFAULT_FREQ + 1500, 800, 20, PLAY_NOW);
-          break;
-        case AU_RSSI_RED:
-          audioQueue.playTone(BEEP_DEFAULT_FREQ + 1800, 800, 20, PLAY_REPEAT(1) | PLAY_NOW);
-          break;
-        case AU_SWR_RED:
-          audioQueue.playTone(450, 160, 40, PLAY_REPEAT(2), 1);
-          break;
-        case AU_SPECIAL_SOUND_BEEP1:
-          audioQueue.playTone(BEEP_DEFAULT_FREQ, 60, 20);
-          break;
-        case AU_SPECIAL_SOUND_BEEP2:
-          audioQueue.playTone(BEEP_DEFAULT_FREQ, 120, 20);
-          break;
-        case AU_SPECIAL_SOUND_BEEP3:
-          audioQueue.playTone(BEEP_DEFAULT_FREQ, 200, 20);
-          break;
-        case AU_SPECIAL_SOUND_WARN1:
-          audioQueue.playTone(BEEP_DEFAULT_FREQ + 600, 120, 40, PLAY_REPEAT(2));
-          break;
-        case AU_SPECIAL_SOUND_WARN2:
-          audioQueue.playTone(BEEP_DEFAULT_FREQ + 900, 120, 40, PLAY_REPEAT(2));
-          break;
-        case AU_SPECIAL_SOUND_CHEEP:
-          audioQueue.playTone(BEEP_DEFAULT_FREQ + 900, 80, 20, PLAY_REPEAT(2), 2);
-          break;
-        case AU_SPECIAL_SOUND_RING:
-          audioQueue.playTone(BEEP_DEFAULT_FREQ + 750, 40, 20, PLAY_REPEAT(10));
-          audioQueue.playTone(BEEP_DEFAULT_FREQ + 750, 40, 80, PLAY_REPEAT(1));
-          audioQueue.playTone(BEEP_DEFAULT_FREQ + 750, 40, 20, PLAY_REPEAT(10));
-          break;
-        case AU_SPECIAL_SOUND_SCIFI:
-          audioQueue.playTone(2550, 80, 20, PLAY_REPEAT(2), -1);
-          audioQueue.playTone(1950, 80, 20, PLAY_REPEAT(2), 1);
-          audioQueue.playTone(2250, 80, 20, 0);
-          break;
-        case AU_SPECIAL_SOUND_ROBOT:
-          audioQueue.playTone(2250, 40, 20, PLAY_REPEAT(1));
-          audioQueue.playTone(1650, 120, 20, PLAY_REPEAT(1));
-          audioQueue.playTone(2550, 120, 20, PLAY_REPEAT(1));
-          break;
-        case AU_SPECIAL_SOUND_CHIRP:
-          audioQueue.playTone(BEEP_DEFAULT_FREQ + 1200, 40, 20, PLAY_REPEAT(2));
-          audioQueue.playTone(BEEP_DEFAULT_FREQ + 1620, 40, 20, PLAY_REPEAT(3));
-          break;
-        case AU_SPECIAL_SOUND_TADA:
-          audioQueue.playTone(1650, 80, 40);
-          audioQueue.playTone(2850, 80, 40);
-          audioQueue.playTone(3450, 64, 36, PLAY_REPEAT(2));
-          break;
-        case AU_SPECIAL_SOUND_CRICKET:
-          audioQueue.playTone(2550, 40, 80, PLAY_REPEAT(3));
-          audioQueue.playTone(2550, 40, 160, PLAY_REPEAT(1));
-          audioQueue.playTone(2550, 40, 80, PLAY_REPEAT(3));
-          break;
-        case AU_SPECIAL_SOUND_SIREN:
-          audioQueue.playTone(450, 160, 40, PLAY_REPEAT(2), 2);
-          break;
-        case AU_SPECIAL_SOUND_ALARMC:
-          audioQueue.playTone(1650, 32, 68, PLAY_REPEAT(2));
-          audioQueue.playTone(2250, 64, 156, PLAY_REPEAT(1));
-          audioQueue.playTone(1650, 64, 76, PLAY_REPEAT(2));
-          audioQueue.playTone(2250, 32, 168, PLAY_REPEAT(1));
-          break;
-        case AU_SPECIAL_SOUND_RATATA:
-          audioQueue.playTone(BEEP_DEFAULT_FREQ + 1500, 40, 80, PLAY_REPEAT(10));
-          break;
-        case AU_SPECIAL_SOUND_TICK:
-          audioQueue.playTone(BEEP_DEFAULT_FREQ + 1500, 40, 400, PLAY_REPEAT(2));
-          break;
-        default:
-          break;
-      }
+        audioQueue.playTone(BEEP_DEFAULT_FREQ + 1500, 80, 20, PLAY_NOW);
+        break;
+      case AU_MIX_WARNING_1:
+        audioQueue.playTone(BEEP_DEFAULT_FREQ + 1440, 48, 32);
+        break;
+      case AU_MIX_WARNING_2:
+        audioQueue.playTone(BEEP_DEFAULT_FREQ + 1560, 48, 32, PLAY_REPEAT(1));
+        break;
+      case AU_MIX_WARNING_3:
+        audioQueue.playTone(BEEP_DEFAULT_FREQ + 1680, 48, 32, PLAY_REPEAT(2));
+        break;
+      case AU_TIMER_00:
+        audioQueue.playTone(BEEP_DEFAULT_FREQ + 150, 300, 20, PLAY_NOW);
+        break;
+      case AU_TIMER_LT10:
+        audioQueue.playTone(BEEP_DEFAULT_FREQ + 150, 120, 20, PLAY_NOW);
+        break;
+      case AU_TIMER_20:
+        audioQueue.playTone(BEEP_DEFAULT_FREQ + 150, 120, 20, PLAY_REPEAT(1) | PLAY_NOW);
+        break;
+      case AU_TIMER_30:
+        audioQueue.playTone(BEEP_DEFAULT_FREQ + 150, 120, 20, PLAY_REPEAT(2) | PLAY_NOW);
+        break;
+      case AU_A1_ORANGE:
+      case AU_A2_ORANGE:
+      case AU_A3_ORANGE:
+      case AU_A4_ORANGE:
+        audioQueue.playTone(BEEP_DEFAULT_FREQ + 600, 200, 20, PLAY_NOW);
+        break;
+      case AU_A1_RED:
+      case AU_A2_RED:
+      case AU_A3_RED:
+      case AU_A4_RED:
+        audioQueue.playTone(BEEP_DEFAULT_FREQ + 600, 200, 20, PLAY_REPEAT(1) | PLAY_NOW);
+        break;
+      case AU_RSSI_ORANGE:
+        audioQueue.playTone(BEEP_DEFAULT_FREQ + 1500, 800, 20, PLAY_NOW);
+        break;
+      case AU_RSSI_RED:
+        audioQueue.playTone(BEEP_DEFAULT_FREQ + 1800, 800, 20, PLAY_REPEAT(1) | PLAY_NOW);
+        break;
+      case AU_SWR_RED:
+        audioQueue.playTone(450, 160, 40, PLAY_REPEAT(2), 1);
+        break;
+      case AU_SPECIAL_SOUND_BEEP1:
+        audioQueue.playTone(BEEP_DEFAULT_FREQ, 60, 20);
+        break;
+      case AU_SPECIAL_SOUND_BEEP2:
+        audioQueue.playTone(BEEP_DEFAULT_FREQ, 120, 20);
+        break;
+      case AU_SPECIAL_SOUND_BEEP3:
+        audioQueue.playTone(BEEP_DEFAULT_FREQ, 200, 20);
+        break;
+      case AU_SPECIAL_SOUND_WARN1:
+        audioQueue.playTone(BEEP_DEFAULT_FREQ + 600, 120, 40, PLAY_REPEAT(2));
+        break;
+      case AU_SPECIAL_SOUND_WARN2:
+        audioQueue.playTone(BEEP_DEFAULT_FREQ + 900, 120, 40, PLAY_REPEAT(2));
+        break;
+      case AU_SPECIAL_SOUND_CHEEP:
+        audioQueue.playTone(BEEP_DEFAULT_FREQ + 900, 80, 20, PLAY_REPEAT(2), 2);
+        break;
+      case AU_SPECIAL_SOUND_RING:
+        audioQueue.playTone(BEEP_DEFAULT_FREQ + 750, 40, 20, PLAY_REPEAT(10));
+        audioQueue.playTone(BEEP_DEFAULT_FREQ + 750, 40, 80, PLAY_REPEAT(1));
+        audioQueue.playTone(BEEP_DEFAULT_FREQ + 750, 40, 20, PLAY_REPEAT(10));
+        break;
+      case AU_SPECIAL_SOUND_SCIFI:
+        audioQueue.playTone(2550, 80, 20, PLAY_REPEAT(2), -1);
+        audioQueue.playTone(1950, 80, 20, PLAY_REPEAT(2), 1);
+        audioQueue.playTone(2250, 80, 20, 0);
+        break;
+      case AU_SPECIAL_SOUND_ROBOT:
+        audioQueue.playTone(2250, 40, 20, PLAY_REPEAT(1));
+        audioQueue.playTone(1650, 120, 20, PLAY_REPEAT(1));
+        audioQueue.playTone(2550, 120, 20, PLAY_REPEAT(1));
+        break;
+      case AU_SPECIAL_SOUND_CHIRP:
+        audioQueue.playTone(BEEP_DEFAULT_FREQ + 1200, 40, 20, PLAY_REPEAT(2));
+        audioQueue.playTone(BEEP_DEFAULT_FREQ + 1620, 40, 20, PLAY_REPEAT(3));
+        break;
+      case AU_SPECIAL_SOUND_TADA:
+        audioQueue.playTone(1650, 80, 40);
+        audioQueue.playTone(2850, 80, 40);
+        audioQueue.playTone(3450, 64, 36, PLAY_REPEAT(2));
+        break;
+      case AU_SPECIAL_SOUND_CRICKET:
+        audioQueue.playTone(2550, 40, 80, PLAY_REPEAT(3));
+        audioQueue.playTone(2550, 40, 160, PLAY_REPEAT(1));
+        audioQueue.playTone(2550, 40, 80, PLAY_REPEAT(3));
+        break;
+      case AU_SPECIAL_SOUND_SIREN:
+        audioQueue.playTone(450, 160, 40, PLAY_REPEAT(2), 2);
+        break;
+      case AU_SPECIAL_SOUND_ALARMC:
+        audioQueue.playTone(1650, 32, 68, PLAY_REPEAT(2));
+        audioQueue.playTone(2250, 64, 156, PLAY_REPEAT(1));
+        audioQueue.playTone(1650, 64, 76, PLAY_REPEAT(2));
+        audioQueue.playTone(2250, 32, 168, PLAY_REPEAT(1));
+        break;
+      case AU_SPECIAL_SOUND_RATATA:
+        audioQueue.playTone(BEEP_DEFAULT_FREQ + 1500, 40, 80, PLAY_REPEAT(10));
+        break;
+      case AU_SPECIAL_SOUND_TICK:
+        audioQueue.playTone(BEEP_DEFAULT_FREQ + 1500, 40, 400, PLAY_REPEAT(2));
+        break;
+      default:
+        break;
     }
   }
 }
diff --git a/radio/src/audio_arm.h b/radio/src/audio_arm.h
index b48cead34..01ca0af1a 100644
--- a/radio/src/audio_arm.h
+++ b/radio/src/audio_arm.h
@@ -166,7 +166,7 @@ class MixedContext {
     int mixBuffer(AudioBuffer *buffer, int volume, unsigned int fade);
 };
 
-bool audioPushBuffer(AudioBuffer * buffer);
+void audioPushBuffer(AudioBuffer * buffer);
 
 class AudioQueue {
 
@@ -174,7 +174,9 @@ class AudioQueue {
 #if defined(SIMU_AUDIO)
   friend void *audioThread(void *);
 #endif
-
+#if defined(CLI)
+  friend void printAudioVars();
+#endif
   public:
 
     AudioQueue();
diff --git a/radio/src/bitmaps/horus/CMakeLists.txt b/radio/src/bitmaps/horus/CMakeLists.txt
index 9289b19ec..6ec6b1c59 100644
--- a/radio/src/bitmaps/horus/CMakeLists.txt
+++ b/radio/src/bitmaps/horus/CMakeLists.txt
@@ -1,12 +1,3 @@
-add_truetype_font_target(horus tinsize "DejaVu Sans" 9 False)
-add_truetype_font_target(horus smlsize "DejaVu Sans" 13 False)
-add_truetype_font_target(horus stdsize "DejaVu Sans" 16 False)
-add_truetype_font_target(horus stdsizebold "DejaVu Sans" 16 True)
-add_truetype_font_target(horus midsize "DejaVu Sans" 24 False)
-add_truetype_font_target(horus dblsize "DejaVu Sans" 32 True)
-add_truetype_font_target(horus xxlsize "DejaVu Sans" 48 False)
-add_custom_target(ttf_horus_fonts DEPENDS ${ttf_horus_fonts_targets})
-
 add_bitmaps_target(horus_bitmaps "${RADIO_SRC_DIRECTORY}/bitmaps/horus/bmp_*.png" 480 5/6/5)
 add_bitmaps_target(horus_calibration_bitmaps "${RADIO_SRC_DIRECTORY}/bitmaps/horus/calibration/bmp_*.png" 480 5/6/5)
 add_bitmaps_target(horus_button_bitmaps "${RADIO_SRC_DIRECTORY}/bitmaps/horus/button/alpha_*.png" 480 4/4/4/4)
diff --git a/radio/src/bitmaps/horus/mainview_flat.png b/radio/src/bitmaps/horus/mainview_flat.png
deleted file mode 100644
index 44f8ca652..000000000
Binary files a/radio/src/bitmaps/horus/mainview_flat.png and /dev/null differ
diff --git a/radio/src/bitmaps/horus/mask_current_shadow.png b/radio/src/bitmaps/horus/mask_current_shadow.png
deleted file mode 100644
index 4632c601f..000000000
Binary files a/radio/src/bitmaps/horus/mask_current_shadow.png and /dev/null differ
diff --git a/radio/src/cli.cpp b/radio/src/cli.cpp
index 669ac9634..04637a976 100644
--- a/radio/src/cli.cpp
+++ b/radio/src/cli.cpp
@@ -357,6 +357,132 @@ int cliSet(const char ** argv)
   return 0;
 }
 
+
+#if defined(DEBUG_INTERRUPTS)
+void printInterrupts() 
+{
+  __disable_irq();
+  struct InterruptCounters ic = interruptCounters;
+  memset(&interruptCounters, 0, sizeof(interruptCounters));
+  interruptCounters.resetTime = get_tmr10ms();
+  __enable_irq();
+  serialPrint("Interrupts count in the last %u ms:", (get_tmr10ms() - ic.resetTime) * 10);
+  for(int n = 0; n < INT_LAST; n++) {
+    serialPrint("%s: %u", interruptNames[n], ic.cnt[n]); 
+  }
+}
+#endif //#if defined(DEBUG_INTERRUPTS)
+
+#if defined(DEBUG_TASKS)
+
+void printTaskSwitchLog() 
+{
+  serialPrint("Tasks legend [<task_id>, <task name>]:");
+  for(int n = 0; n <= CFG_MAX_USER_TASKS+1; n++) {
+    if (0 == n) {
+      serialPrint("%d: Idle", n);
+    }
+    if (cliTaskId == n) {
+      serialPrint("%d: CLI", n);
+    }
+    else if (menusTaskId == n) {
+      serialPrint("%d: menus", n);
+    }
+    else if (mixerTaskId == n) {
+      serialPrint("%d: mixer", n);
+    }
+    else if (audioTaskId == n) {
+      serialPrint("%d: audio", n);
+    }
+#if defined(BLUETOOTH)
+    else if (btTaskId == n) {
+      serialPrint("%d: BT", n);
+    }
+#endif
+  }
+  serialCrlf();
+
+  serialPrint("Tasks switch log at %u [<time>, <task_id>]:", get_tmr10ms());
+  uint32_t lastSwitchTime = 0;
+  uint32_t * tsl = new uint32_t[DEBUG_TASKS_LOG_SIZE];
+  memcpy(tsl, taskSwitchLog, sizeof(taskSwitchLog));
+  uint32_t * p = tsl + taskSwitchLogPos;
+  uint32_t * end = tsl + DEBUG_TASKS_LOG_SIZE;
+  for(int n = 0; n < DEBUG_TASKS_LOG_SIZE; n++) {
+    uint32_t taskId = *p >> 24;
+    uint32_t switchTime = *p & 0xFFFFFF;
+    if (lastSwitchTime != switchTime) {
+      serialPrintf("\r\n%06x: ", switchTime);
+      lastSwitchTime = switchTime;
+    }
+    serialPrintf("%u ", taskId);
+    if ( ++p >= end ) {
+      p = tsl;
+    }
+  }
+  delete[] tsl;
+  serialCrlf();
+}
+#endif // #if defined(DEBUG_TASKS)
+
+#if defined(DEBUG_TIMERS)
+
+void printDebugTime(uint32_t time)
+{
+  if (time >= 30000) {
+    serialPrintf("%dms", time/1000);
+  }
+  else {
+    serialPrintf("%d.%03dms", time/1000, time%1000);
+  }
+}
+
+void printDebugTimer(const char * name, DebugTimer & timer) 
+{
+  serialPrintf("%s: ", name);
+  printDebugTime( timer.getMin());
+  serialPrintf(" - ");
+  printDebugTime(timer.getMax());
+  serialCrlf();
+  timer.reset();
+}
+void printDebugTimers()
+{
+  for(int n = 0; n < DEBUG_TIMERS_COUNT; n++) {
+    printDebugTimer(debugTimerNames[n], debugTimers[n]);
+  }
+}
+#endif
+
+#include "OsMutex.h"
+extern OS_MutexID audioMutex;
+
+void printAudioVars()
+{
+  for(int n = 0; n < AUDIO_BUFFER_COUNT; n++) {
+    serialPrint("Audio Buffer %d: size: %u, state: %u, ", n, (uint32_t)audioBuffers[n].size, (uint32_t)audioBuffers[n].state);
+    dump((uint8_t *)audioBuffers[n].data, 32);
+  }
+  serialPrint("fragments:");
+  for(int n = 0; n < AUDIO_QUEUE_LENGTH; n++) {
+    serialPrint("%d: type %u: id: %u, repeat: %u, ", n, (uint32_t)audioQueue.fragments[n].type, 
+                                                        (uint32_t)audioQueue.fragments[n].id, 
+                                                        (uint32_t)audioQueue.fragments[n].repeat);
+    if ( audioQueue.fragments[n].type == FRAGMENT_FILE) {
+      serialPrint(" file: %s", audioQueue.fragments[n].file);
+    }
+  }
+
+  serialPrint("audioQueue:");
+  serialPrint("  ridx: %d, widx: %d", audioQueue.ridx, audioQueue.widx);
+  serialPrint("  bufferRIdx: %d, bufferWIdx: %d", audioQueue.bufferRIdx, audioQueue.bufferWIdx);
+
+  serialPrint("normalContext: %u", (uint32_t)audioQueue.normalContext.fragment.type);
+
+  serialPrint("audioMutex[%u] = %u", (uint32_t)audioMutex, (uint32_t)MutexTbl[audioMutex].mutexFlag);
+}
+
+
 int cliDisplay(const char ** argv)
 {
   long long int address = 0;
@@ -461,6 +587,9 @@ int cliDisplay(const char ** argv)
         case 2:
           tim = TIM2;
           break;
+        case 13:
+          tim = TIM13;
+          break;
         default:
           return 0;
       }
@@ -484,6 +613,24 @@ int cliDisplay(const char ** argv)
       serialPrint(" CCR4   0x%x", tim->CCR4);
     }
   }
+#if defined(DEBUG_INTERRUPTS)
+  else if (!strcmp(argv[1], "int")) {
+    printInterrupts();
+  }
+#endif
+#if defined(DEBUG_TASKS)
+  else if (!strcmp(argv[1], "tsl")) {
+    printTaskSwitchLog();
+  }
+#endif
+#if defined(DEBUG_TIMERS)
+  else if (!strcmp(argv[1], "dt")) {
+    printDebugTimers();
+  }
+#endif
+  else if (!strcmp(argv[1], "audio")) {
+    printAudioVars();
+  }
   else if (toLongLongInt(argv, 1, &address) > 0) {
     int size = 256;
     if (toInt(argv, 2, &size) >= 0) {
@@ -555,6 +702,7 @@ const CliCommand cliCommands[] = {
   { "readsd", cliReadSD, "<start sector> <sectors count> <read buffer size (sectors)>" },
   { "play", cliPlay, "<filename>" },
   { "print", cliDisplay, "<address> [<size>] | <what>" },
+  { "p", cliDisplay, "<address> [<size>] | <what>" },
   { "reboot", cliReboot, "[wdt]" },
   { "set", cliSet, "<what> <value>" },
   { "stackinfo", cliStackInfo, "" },
diff --git a/radio/src/cli.h b/radio/src/cli.h
index 634c37caa..06579fff3 100644
--- a/radio/src/cli.h
+++ b/radio/src/cli.h
@@ -30,6 +30,7 @@ extern uint8_t cliTracesEnabled;
 extern Fifo<uint8_t, 256> cliRxFifo;
 #include "tasks_arm.h"
 #define CLI_STACK_SIZE                 1000
+extern OS_TID cliTaskId;
 extern TaskStack<CLI_STACK_SIZE> cliStack;
 #endif
 
diff --git a/radio/src/datastructs.h b/radio/src/datastructs.h
index 28780af59..0ce92b40a 100644
--- a/radio/src/datastructs.h
+++ b/radio/src/datastructs.h
@@ -914,7 +914,8 @@ PACK(struct TrainerData {
     NOBACKUP(char switchNames[NUM_SWITCHES][LEN_SWITCH_NAME]); \
     NOBACKUP(char anaNames[NUM_STICKS+NUM_POTS][LEN_ANA_NAME]); \
     NOBACKUP(char currModelFilename[LEN_MODEL_FILENAME+1]); \
-    NOBACKUP(uint8_t bluetoothEnable); \
+    NOBACKUP(uint8_t bluetoothEnable:1); \
+    NOBACKUP(uint8_t blOffBright:7); \
     NOBACKUP(char bluetoothName[LEN_BLUETOOTH_NAME]);
 #elif defined(PCBFLAMENCO)
   #define EXTRA_GENERAL_FIELDS \
diff --git a/radio/src/debug.cpp b/radio/src/debug.cpp
index e375015bf..101359994 100644
--- a/radio/src/debug.cpp
+++ b/radio/src/debug.cpp
@@ -102,3 +102,129 @@ void dumpTraceBuffer()
   TRACE("End of Trace Buffer dump");
 }
 #endif
+
+#if defined(DEBUG_INTERRUPTS)
+
+#if defined(PCBHORUS)
+  const char * interruptNames[INT_LAST] = {
+    "Tick ",   // INT_TICK,
+    "1ms  ",   // INT_1MS,
+    "Ser2 ",   // INT_SER2,
+    "TelDm",   // INT_TELEM_DMA,
+    "Sdio ",   // INT_SDIO,
+    "SdDma",   // INT_SDIO_DMA,
+    "D2S7 ",   // INT_DMA2S7,
+    "Tim1 ",   // INT_TIM1CC,
+    "Tim2 ",   // INT_TIM2,
+    "Tim3 ",   // INT_TIM3,
+    "Usb  "   // INT_OTG_FS,
+  };
+#elif defined(PCBTARANIS) 
+  const char * interruptNames[INT_LAST] = {
+    "Tick ",   // INT_TICK,
+    "5ms  ",   // INT_5MS,
+    "Audio",   // INT_AUDIO,
+    "BlueT",   // INT_BLUETOOTH,
+    "Lcd  ",   // INT_LCD,
+    "T1CC ",   // INT_TIM1CC,
+    "Tim1 ",   // INT_TIM1,
+    "Tim8 ",   // INT_TIM8,
+    "Ser2 ",   // INT_SER2,
+    "TelDm",   // INT_TELEM_DMA,
+    "TelUs",   // INT_TELEM_USART,
+    "Train",   // INT_TRAINER,
+    "Usb  ",   // INT_OTG_FS,
+  };
+#endif
+
+struct InterruptCounters interruptCounters;
+#endif //#if defined(DEBUG_INTERRUPTS)
+
+#if defined(DEBUG_TASKS)
+
+uint32_t taskSwitchLog[DEBUG_TASKS_LOG_SIZE] __SDRAM;
+uint16_t taskSwitchLogPos;
+
+/**
+ *******************************************************************************
+ * @brief      Hook for task switch logging
+ * @param[in]  taskID Task which is now in RUNNING state
+ * @retval     None
+ *
+ * @par Description
+ * @details    This function logs the time when a task entered the RUNNING state.
+ *******************************************************************************
+ */
+void CoTaskSwitchHook(uint8_t taskID)
+{
+  /* Log task switch here */
+  taskSwitchLog[taskSwitchLogPos] = (taskID << 24) + ((uint32_t)CoGetOSTime() & 0xFFFFFF);
+  if(++taskSwitchLogPos >= DEBUG_TASKS_LOG_SIZE) {
+    taskSwitchLogPos = 0;
+  }
+}
+
+#endif // #if defined(DEBUG_TASKS)
+
+#if defined(DEBUG_TIMERS)
+
+void DebugTimer::start()
+{
+  _start_hiprec = getTmr2MHz();
+  _start_loprec = get_tmr10ms();
+}
+
+void DebugTimer::stop()
+{
+  // getTmr2MHz is 16 bit timer, resolution 0.5us, max measurable value 32.7675 milli seconds
+  // tmr10ms_t tmr10ms = get_tmr10ms(); 32 bit timer, resolution 10ms, max measurable value: 42949672.95 s = 1.3 years
+  // if time difference is bigger than 30ms, then use low resolution timer
+  // otherwise use high resolution
+  if ((_start_hiprec == 0) && (_start_loprec == 0)) return;
+
+  last = get_tmr10ms() - _start_loprec;  //use low precision timer
+  if (last < 3) {
+    //use high precision
+    last = (uint16_t)(getTmr2MHz() - _start_hiprec) / 2;
+  }
+  else {
+    last *= 10000ul; //adjust unit to 1us
+  }
+  evalStats(); 
+}
+
+DebugTimer debugTimers[DEBUG_TIMERS_COUNT];
+
+const char * debugTimerNames[DEBUG_TIMERS_COUNT] = {
+   "Pulses int."   // debugTimerIntPulses,
+  ,"Pulses dur."   // debugTimerIntPulsesDuration,
+  ,"10ms dur.  "   // debugTimerPer10ms,
+  ,"Rotary enc."   // debugTimerRotEnc,
+  ,"Haptic     "   // debugTimerHaptic,
+  ,"Mixer calc "   // debugTimerMixer,
+  ,"Tel. wakeup"   // debugTimerTelemetryWakeup,
+  ,"perMain dur"   // debugTimerPerMain,
+  ," perMain s1"   // debugTimerPerMain1,
+  ," guiMain   "   // debugTimerGuiMain,
+  ,"  LUA bg   "   // debugTimerLuaBg,
+  ,"  LCD wait "   // debugTimerLcdRefreshWait,
+  ,"  LUA fg   "   // debugTimerLuaFg,
+  ,"  LCD refr."   // debugTimerLcdRefresh,
+  ,"  Menus    "   // debugTimerMenus,
+  ,"   Menu hnd"   // debugTimerMenuHandlers,
+  ,"Menu Vers. "   // debugTimerVersion,
+  ,"Menu simple"   // debugTimerSimpleMenu,
+  ,"Menu drawte"   // debugTimerDrawText,
+  ,"Menu drawt1"   // debugTimerDrawText1,
+  ,"Mix ADC    "   // debugTimerGetAdc,
+  ,"Mix getsw  "   // debugTimerGetSwitches,
+  ,"Mix eval   "   // debugTimerEvalMixes,
+  ,"Mix 10ms   "   // debugTimerMixes10ms,
+  ,"ADC read   "   // debugTimerAdcRead,
+  ,"ADC loop   "   // debugTimerAdcLoop,
+  ,"ADC wait   "   // debugTimerAdcWait,
+  ,"mix-pulses "   // debugTimerMixerCalcToUsage
+  ,"mix-int.   "   // debugTimerMixerIterval
+};
+
+#endif
diff --git a/radio/src/debug.h b/radio/src/debug.h
index 135e795c3..6edabc6f0 100644
--- a/radio/src/debug.h
+++ b/radio/src/debug.h
@@ -54,7 +54,7 @@ uint8_t serial2TracesEnabled();
 }
 #endif
 
-#define TRACE_PING(x)         do { debugPrintf(x); } while(0)
+#define TRACE_PING(...)       do { debugPrintf(__VA_ARGS__); } while(0)
 #define TRACE(...)            do { debugPrintf(__VA_ARGS__); debugPrintf("\r\n"); } while(0)
 #define DUMP(data, size)      dump(data, size)
 #define TRACE_DEBUG(...)      debugPrintf("-D- " __VA_ARGS__)
@@ -185,5 +185,168 @@ public:
 
 #endif  // defined(JITTER_MEASURE)
 
+
+#if defined(DEBUG_INTERRUPTS) && !defined(BOOT)
+
+#if defined(PCBHORUS)
+enum InterruptNames {
+  INT_TICK,
+  INT_1MS,
+  INT_SER2,
+  INT_TELEM_DMA,
+  INT_SDIO,
+  INT_SDIO_DMA,
+  INT_DMA2S7,
+  INT_TIM1CC,
+  INT_TIM2,
+  INT_TIM3,
+  INT_OTG_FS,
+  INT_LAST
+};
+#elif defined(PCBTARANIS) 
+enum InterruptNames {
+  INT_TICK,
+  INT_5MS,
+  INT_AUDIO,
+  INT_BLUETOOTH,
+  INT_LCD,
+  INT_TIM1CC,
+  INT_TIM1,
+  INT_TIM8,
+  INT_SER2,
+  INT_TELEM_DMA,
+  INT_TELEM_USART,
+  INT_TRAINER,
+  INT_OTG_FS,
+  INT_LAST
+};
+#endif
+
+struct InterruptCounters
+{
+  uint32_t cnt[INT_LAST];
+  uint32_t resetTime;
+};
+
+extern const char * interruptNames[INT_LAST];
+extern struct InterruptCounters interruptCounters;
+
+#define DEBUG_INTERRUPT(int)    (++interruptCounters.cnt[int])
+#else
+#define DEBUG_INTERRUPT(int)
+#endif //#if defined(DEBUG_INTERRUPTS)
+
+#if defined(DEBUG_TASKS)
+
+#define DEBUG_TASKS_LOG_SIZE    512
+
+// each 32bit is used as:
+//    top 8 bits: task id
+//    botom 24 bits: system tick counter
+extern uint32_t taskSwitchLog[DEBUG_TASKS_LOG_SIZE];
+extern uint16_t taskSwitchLogPos;
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+extern void CoTaskSwitchHook(uint8_t taskID);
+#if defined(__cplusplus)
+}
+#endif
+
+#endif // #if defined(DEBUG_TASKS)
+
+
+#if defined(DEBUG_TIMERS)
+
+#if defined(__cplusplus)
+typedef uint32_t debug_timer_t;
+
+class DebugTimer
+{
+private:
+  debug_timer_t min;
+  debug_timer_t max;
+  // debug_timer_t avg;
+  debug_timer_t last;   //unit 1us
+
+  uint16_t _start_hiprec;
+  uint32_t _start_loprec;
+
+  void evalStats() {
+    if (min > last) min = last;
+    if (max < last) max = last;
+    //todo avg
+  }
+
+public:
+  DebugTimer(): min(-1), max(0), /*avg(0),*/ last(0), _start_hiprec(0), _start_loprec(0) {};
+
+  void start();
+  void stop();
+  void sample() { stop(); start(); }
+
+  void reset() { min = -1;  max = last = 0; }
+
+  debug_timer_t getMin() const { return min; }
+  debug_timer_t getMax() const { return max; }
+  debug_timer_t getLast() const { return last; } 
+};
+
+enum DebugTimers {
+  debugTimerIntPulses,
+  debugTimerIntPulsesDuration,
+  debugTimerPer10ms,
+  debugTimerRotEnc,
+  debugTimerHaptic,
+  debugTimerMixer,
+  debugTimerTelemetryWakeup,
+  debugTimerPerMain,
+  debugTimerPerMain1,
+  debugTimerGuiMain,
+  debugTimerLuaBg,
+  debugTimerLcdRefreshWait,
+  debugTimerLuaFg,
+  debugTimerLcdRefresh,
+  debugTimerMenus,
+  debugTimerMenuHandlers,
+  debugTimerVersion,
+  debugTimerSimpleMenu,
+  debugTimerDrawText,
+  debugTimerDrawText1,
+
+  debugTimerGetAdc,
+  debugTimerGetSwitches,
+  debugTimerEvalMixes,
+  debugTimerMixes10ms,
+
+  debugTimerAdcRead,
+  debugTimerAdcLoop,
+  debugTimerAdcWait,
+
+  debugTimerMixerCalcToUsage,
+  debugTimerMixerIterval,
+
+  DEBUG_TIMERS_COUNT
+};
+
+extern DebugTimer debugTimers[DEBUG_TIMERS_COUNT];
+extern const char * debugTimerNames[DEBUG_TIMERS_COUNT];
+
+#endif // #if defined(__cplusplus)
+
+#define DEBUG_TIMER_START(timer)  debugTimers[timer].start()
+#define DEBUG_TIMER_STOP(timer)   debugTimers[timer].stop()  
+#define DEBUG_TIMER_SAMPLE(timer) debugTimers[timer].sample()
+
+
+#else //#if defined(DEBUG_TIMERS)
+
+#define DEBUG_TIMER_START(timer)
+#define DEBUG_TIMER_STOP(timer)
+#define DEBUG_TIMER_SAMPLE(timer)
+
+#endif //#if defined(DEBUG_TIMERS)
+
 #endif // _DEBUG_H_
 
diff --git a/radio/src/fonts.h b/radio/src/fonts.h
index 44f8bbc42..c1ca10f6e 100644
--- a/radio/src/fonts.h
+++ b/radio/src/fonts.h
@@ -26,6 +26,9 @@
 extern const uint16_t * const fontspecsTable[16];
 extern const uint8_t * const fontsTable[16];
 
+extern BitmapBuffer * fontCache[2];
+void loadFontCache();
+
 #else
 
 extern const pm_uchar font_5x7[];
diff --git a/radio/src/fonts/CMakeLists.txt b/radio/src/fonts/CMakeLists.txt
new file mode 100644
index 000000000..f238820be
--- /dev/null
+++ b/radio/src/fonts/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(horus)
\ No newline at end of file
diff --git a/radio/src/fonts/horus/CMakeLists.txt b/radio/src/fonts/horus/CMakeLists.txt
new file mode 100644
index 000000000..4d6512310
--- /dev/null
+++ b/radio/src/fonts/horus/CMakeLists.txt
@@ -0,0 +1,10 @@
+set(FONT "DejaVu Sans")
+
+add_truetype_font_target(horus tinsize ${FONT} 9 False)
+add_truetype_font_target(horus smlsize ${FONT} 13 False)
+add_truetype_font_target(horus stdsize ${FONT} 16 False)
+add_truetype_font_target(horus stdsizebold ${FONT} 16 True)
+add_truetype_font_target(horus midsize ${FONT} 24 False)
+add_truetype_font_target(horus dblsize ${FONT} 32 True)
+add_truetype_font_target(horus xxlsize ${FONT} 48 False)
+add_custom_target(ttf_horus_fonts DEPENDS ${ttf_horus_fonts_targets})
diff --git a/radio/src/fonts/horus/font_dblsize.png b/radio/src/fonts/horus/font_dblsize.png
index 686dcc9a5..0e324eb5a 100644
Binary files a/radio/src/fonts/horus/font_dblsize.png and b/radio/src/fonts/horus/font_dblsize.png differ
diff --git a/radio/src/fonts/horus/font_dblsize.specs b/radio/src/fonts/horus/font_dblsize.specs
index 6c7696489..5f06cd075 100644
--- a/radio/src/fonts/horus/font_dblsize.specs
+++ b/radio/src/fonts/horus/font_dblsize.specs
@@ -1 +1 @@
-0,4,14,28,54,76,110,139,146,160,173,193,217,228,242,251,266,289,310,331,352,375,397,420,441,464,487,497,508,532,556,580,598,613,641,665,689,715,736,757,783,808,818,832,859,880,910,935,963,987,1015,1040,1062,1087,1112,1140,1178,1206,1234,1258,1272,1287,1300,1324,1343,1356,1378,1401,1420,1443,1466,1484,1507,1529,1539,1553,1576,1586,1618,1640,1663,1686,1709,1726,1746,1764,1786,1810,1841,1865,1889,1909,1933,1936,1960,1988,2015,2033,2051,2074,2097,2120,2143,2171, 2171, 2171, 2171, 2171, 2171, 2171, 2171, 2171, 2171, 2171, 2171, 2171, 2171
\ No newline at end of file
+0,4,14,28,54,76,110,139,146,160,173,193,217,228,242,251,266,289,310,331,352,375,397,420,441,464,487,497,508,532,556,580,598,613,641,665,689,715,736,757,783,808,818,832,859,880,910,935,963,987,1015,1040,1062,1087,1112,1140,1178,1206,1234,1258,1272,1287,1300,1324,1343,1356,1378,1401,1420,1443,1466,1484,1507,1529,1539,1553,1576,1586,1618,1640,1663,1686,1709,1726,1746,1764,1786,1810,1841,1865,1889,1909,1933,1937,1961,1989,2016,2034,2052,2075,2098,2121,2144,2172,2172,2172,2172,2172,2172,2172,2172,2172,2172,2172,2172,2172,2195,2218,2240,2255,2274
\ No newline at end of file
diff --git a/radio/src/fonts/horus/font_midsize.png b/radio/src/fonts/horus/font_midsize.png
index bac14ea4e..6ebada671 100644
Binary files a/radio/src/fonts/horus/font_midsize.png and b/radio/src/fonts/horus/font_midsize.png differ
diff --git a/radio/src/fonts/horus/font_midsize.specs b/radio/src/fonts/horus/font_midsize.specs
index 1cd304764..82b12a96b 100644
--- a/radio/src/fonts/horus/font_midsize.specs
+++ b/radio/src/fonts/horus/font_midsize.specs
@@ -1 +1 @@
-0,4,10,20,41,56,80,100,106,115,125,140,159,167,177,184,196,212,227,242,258,274,290,306,322,338,354,361,369,388,407,426,440,451,471,487,505,524,539,553,572,589,595,605,623,638,658,675,695,710,730,747,763,782,799,819,845,864,883,901,910,922,931,950,967,976,991,1006,1020,1036,1052,1064,1080,1095,1101,1110,1125,1131,1154,1169,1185,1200,1216,1227,1241,1253,1268,1285,1306,1323,1340,1354,1373,1376,1395,1416,1437,1452,1467,1484,1501,1518,1535,1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557, 1557
\ No newline at end of file
+0,4,10,20,41,56,80,100,106,115,125,140,159,167,177,184,196,212,227,242,258,274,290,306,322,338,354,361,369,388,407,426,440,451,471,487,505,524,539,553,572,589,595,605,623,638,658,675,695,710,730,747,763,782,799,819,845,864,883,901,910,922,931,950,967,976,991,1006,1020,1036,1052,1064,1080,1095,1101,1110,1125,1131,1154,1169,1185,1200,1216,1227,1241,1253,1268,1285,1306,1323,1340,1354,1373,1377,1396,1417,1438,1453,1468,1485,1502,1519,1536,1558,1558,1558,1558,1558,1558,1558,1558,1558,1558,1558,1558,1558,1574,1590,1605,1616,1630
\ No newline at end of file
diff --git a/radio/src/fonts/horus/font_smlsize.png b/radio/src/fonts/horus/font_smlsize.png
index c64e6b721..a93cdff23 100644
Binary files a/radio/src/fonts/horus/font_smlsize.png and b/radio/src/fonts/horus/font_smlsize.png differ
diff --git a/radio/src/fonts/horus/font_smlsize.specs b/radio/src/fonts/horus/font_smlsize.specs
index 99d668d7a..7da8a6e98 100644
--- a/radio/src/fonts/horus/font_smlsize.specs
+++ b/radio/src/fonts/horus/font_smlsize.specs
@@ -1 +1 @@
-0,4,8,13,23,31,44,55,58,63,67,75,85,88,94,97,103,112,120,128,137,146,154,163,171,180,189,192,195,205,215,225,232,238,248,256,266,276,284,291,301,310,313,318,327,335,345,354,365,373,384,393,402,412,421,431,445,455,465,475,479,485,489,499,508,513,521,529,537,546,555,561,570,578,581,586,594,597,609,617,626,634,643,649,657,663,671,680,692,701,710,718,728,729,739,751,763,771,779,789,799,809,819,830, 830, 830, 830, 830, 830, 830, 830, 830, 830, 830, 830, 830, 830
\ No newline at end of file
+0,4,8,13,23,31,44,55,58,63,67,75,85,88,94,97,103,112,120,128,137,146,154,163,171,180,189,192,195,205,215,225,232,238,248,256,266,276,284,291,301,310,313,318,327,335,345,354,365,373,384,393,402,412,421,431,445,455,465,475,479,485,489,499,508,513,521,529,537,546,555,561,570,578,581,586,594,597,609,617,626,634,643,649,657,663,671,680,692,701,710,718,728,732,742,754,766,774,782,792,802,812,822,833,833,833,833,833,833,833,833,833,833,833,833,833,842,851,859,865,873
\ No newline at end of file
diff --git a/radio/src/fonts/horus/font_stdsize.png b/radio/src/fonts/horus/font_stdsize.png
index 53e33e02e..459105c68 100644
Binary files a/radio/src/fonts/horus/font_stdsize.png and b/radio/src/fonts/horus/font_stdsize.png differ
diff --git a/radio/src/fonts/horus/font_stdsize.specs b/radio/src/fonts/horus/font_stdsize.specs
index 6d123dc23..bca645be3 100644
--- a/radio/src/fonts/horus/font_stdsize.specs
+++ b/radio/src/fonts/horus/font_stdsize.specs
@@ -1 +1 @@
-0,4,7,13,26,35,51,63,66,71,76,85,97,101,107,111,118,128,137,146,155,166,175,185,194,204,214,218,222,234,246,258,266,273,285,295,307,319,329,338,351,362,366,372,383,392,405,416,429,439,452,463,473,485,496,508,525,537,549,561,566,573,578,590,601,607,617,627,636,646,656,663,673,682,685,690,700,703,718,727,737,747,757,764,773,780,789,799,813,823,833,842,854,855,867,881,895,904,913,924,935,946,957,971, 986, 1001, 1016, 1031, 1046, 1061, 1076, 1091, 1106, 1121, 1136, 1151, 1166
\ No newline at end of file
+0,4,7,13,26,35,51,63,66,71,76,85,97,101,107,111,118,128,137,146,155,166,175,185,194,204,214,218,222,234,246,258,266,273,285,295,307,319,329,338,351,362,366,372,383,392,405,416,429,439,452,463,473,485,496,508,525,537,549,561,566,573,578,590,601,607,617,627,636,646,656,663,673,682,685,690,700,703,718,727,737,747,757,764,773,780,789,799,813,823,833,842,854,858,870,884,898,907,916,927,938,949,960,974,989,1004,1019,1034,1049,1064,1079,1094,1109,1124,1139,1154,1164,1174,1184,1191,1200
\ No newline at end of file
diff --git a/radio/src/fonts/horus/font_stdsizebold.png b/radio/src/fonts/horus/font_stdsizebold.png
index f1e1ee817..9c56245fc 100644
Binary files a/radio/src/fonts/horus/font_stdsizebold.png and b/radio/src/fonts/horus/font_stdsizebold.png differ
diff --git a/radio/src/fonts/horus/font_stdsizebold.specs b/radio/src/fonts/horus/font_stdsizebold.specs
index bf410b509..63f8a7522 100644
--- a/radio/src/fonts/horus/font_stdsizebold.specs
+++ b/radio/src/fonts/horus/font_stdsizebold.specs
@@ -1 +1 @@
-0,4,9,16,29,40,57,72,76,83,89,99,111,117,124,129,136,148,159,169,179,191,202,213,223,235,247,252,257,269,281,293,302,309,323,335,347,360,370,380,393,405,410,417,430,440,455,467,481,493,507,519,530,542,554,568,587,601,615,627,634,641,647,659,668,675,686,697,707,719,731,740,752,763,768,775,786,791,807,818,830,841,853,861,871,880,891,903,919,931,943,953,965,966,978,992,1006,1015,1024,1035,1046,1057,1068,1082, 1097, 1112, 1127, 1142, 1157, 1172, 1187, 1202, 1217, 1232, 1247, 1262, 1277
\ No newline at end of file
+0,4,9,16,29,40,57,72,76,83,89,99,111,117,124,129,136,148,159,169,179,191,202,213,223,235,247,252,257,269,281,293,302,309,323,335,347,360,370,380,393,405,410,417,430,440,455,467,481,493,507,519,530,542,554,568,587,601,615,627,634,641,647,659,668,675,686,697,707,719,731,740,752,763,768,775,786,791,807,818,830,841,853,861,871,880,891,903,919,931,943,953,965,969,981,995,1009,1018,1027,1038,1049,1060,1071,1085,1100,1115,1130,1145,1160,1175,1190,1205,1220,1235,1250,1265,1277,1289,1300,1307,1317
\ No newline at end of file
diff --git a/radio/src/fonts/horus/font_tinsize.png b/radio/src/fonts/horus/font_tinsize.png
index ebcc00fd3..9b9988bbd 100644
Binary files a/radio/src/fonts/horus/font_tinsize.png and b/radio/src/fonts/horus/font_tinsize.png differ
diff --git a/radio/src/fonts/horus/font_tinsize.specs b/radio/src/fonts/horus/font_tinsize.specs
index e880969ed..27ab28004 100644
--- a/radio/src/fonts/horus/font_tinsize.specs
+++ b/radio/src/fonts/horus/font_tinsize.specs
@@ -1 +1 @@
-0,4,7,12,20,26,36,44,47,51,55,61,69,72,76,79,84,91,97,103,109,116,122,129,135,142,149,151,154,162,170,178,184,189,197,204,211,219,226,232,240,247,250,254,262,268,276,283,291,298,306,313,320,328,335,343,353,360,368,375,379,384,388,396,403,407,413,420,426,432,439,444,450,456,459,463,470,473,482,488,495,502,508,513,519,524,530,537,545,552,559,565,573,574,582,591,600,606,612,619,626,633,640,648, 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, 648, 648
\ No newline at end of file
+0,4,7,12,20,26,36,44,47,51,55,61,69,72,76,79,84,91,97,103,109,116,122,129,135,142,149,151,154,162,170,178,184,189,197,204,211,219,226,232,240,247,250,254,262,268,276,283,291,298,306,313,320,328,335,343,353,360,368,375,379,384,388,396,403,407,413,420,426,432,439,444,450,456,459,463,470,473,482,488,495,502,508,513,519,524,530,537,545,552,559,565,573,577,585,594,603,609,615,622,629,636,643,651,651,651,651,651,651,651,651,651,651,651,651,651,658,665,671,676,682
\ No newline at end of file
diff --git a/radio/src/fonts/horus/font_xxlsize.png b/radio/src/fonts/horus/font_xxlsize.png
index d419789c7..f67b7ed56 100644
Binary files a/radio/src/fonts/horus/font_xxlsize.png and b/radio/src/fonts/horus/font_xxlsize.png differ
diff --git a/radio/src/fonts/horus/font_xxlsize.specs b/radio/src/fonts/horus/font_xxlsize.specs
index edcd5fb4f..ebed58b41 100644
--- a/radio/src/fonts/horus/font_xxlsize.specs
+++ b/radio/src/fonts/horus/font_xxlsize.specs
@@ -1 +1 @@
-0,4,12,29,66,93,137,173,181,195,210,235,269,280,296,305,325,353,378,404,431,460,487,515,542,570,598,607,618,652,686,720,743,762,798,827,859,893,920,944,979,1010,1019,1035,1067,1093,1129,1160,1197,1224,1261,1292,1320,1354,1384,1420,1468,1502,1536,1568,1582,1602,1616,1650,1679,1695,1722,1749,1774,1802,1830,1850,1878,1904,1912,1925,1952,1960,2002,2028,2056,2083,2111,2130,2154,2174,2200,2229,2268,2297,2326,2351,2385,2388,2422,2461,2500,2525,2550,2581,2612,2643,2674,2714, 2714, 2714, 2714, 2714, 2714, 2714, 2714, 2714, 2714, 2714, 2714, 2714, 2714
\ No newline at end of file
+0,4,12,29,66,93,137,173,181,195,210,235,269,280,296,305,325,353,378,404,431,460,487,515,542,570,598,607,618,652,686,720,743,762,798,827,859,893,920,944,979,1010,1019,1035,1067,1093,1129,1160,1197,1224,1261,1292,1320,1354,1384,1420,1468,1502,1536,1568,1582,1602,1616,1650,1679,1695,1722,1749,1774,1802,1830,1850,1878,1904,1912,1925,1952,1960,2002,2028,2056,2083,2111,2130,2154,2174,2200,2229,2268,2297,2326,2351,2385,2389,2423,2462,2501,2526,2551,2582,2613,2644,2675,2715,2715,2715,2715,2715,2715,2715,2715,2715,2715,2715,2715,2715,2743,2771,2798,2817,2842
\ No newline at end of file
diff --git a/radio/src/gui/horus/bitmapbuffer.cpp b/radio/src/gui/horus/bitmapbuffer.cpp
index a35c0504f..86b05960c 100644
--- a/radio/src/gui/horus/bitmapbuffer.cpp
+++ b/radio/src/gui/horus/bitmapbuffer.cpp
@@ -222,6 +222,35 @@ void BitmapBuffer::drawPie(int x0, int y0, int radius, int startAngle, int endAn
   }
 }
 
+void BitmapBuffer::drawMask(coord_t x, coord_t y, BitmapBuffer * mask, LcdFlags flags, coord_t offset, coord_t width)
+{
+  if (mask == NULL) {
+    return;
+  }
+
+  coord_t w = mask->getWidth();
+  coord_t height = mask->getHeight();
+
+  if (!width || width > w) {
+    width = w;
+  }
+
+  if (x+width > this->width) {
+    width = this->width-x;
+  }
+
+  display_t color = lcdColorTable[COLOR_IDX(flags)];
+
+  for (coord_t row=0; row<height; row++) {
+    display_t * p = getPixelPtr(x, y+row);
+    display_t * q = mask->getPixelPtr(offset, row);
+    for (coord_t col=0; col<width; col++) {
+      drawAlphaPixel(p, *((uint8_t *)q), color);
+      p++; q++;
+    }
+  }
+}
+
 void BitmapBuffer::drawBitmapPattern(coord_t x, coord_t y, const uint8_t * bmp, LcdFlags flags, coord_t offset, coord_t width)
 {
   coord_t w = *((uint16_t *)bmp);
@@ -247,8 +276,7 @@ void BitmapBuffer::drawBitmapPattern(coord_t x, coord_t y, const uint8_t * bmp,
   }
 }
 
-#define FONT_MAX_HEIGHT 42
-void BitmapBuffer::drawFontPattern(coord_t x, coord_t y, const uint8_t * font, const uint16_t * spec, int index, LcdFlags flags)
+void BitmapBuffer::drawCharWithoutCache(coord_t x, coord_t y, const uint8_t * font, const uint16_t * spec, int index, LcdFlags flags)
 {
   coord_t offset = spec[index];
   coord_t width = spec[index+1] - offset;
@@ -256,6 +284,14 @@ void BitmapBuffer::drawFontPattern(coord_t x, coord_t y, const uint8_t * font, c
   lcdNextPos = x + width;
 }
 
+void BitmapBuffer::drawCharWithCache(coord_t x, coord_t y, const BitmapBuffer * font, const uint16_t * spec, int index, LcdFlags flags)
+{
+  coord_t offset = spec[index];
+  coord_t width = spec[index+1] - offset;
+  drawBitmap(x, y, font, offset, 0, width);
+  lcdNextPos = x + width;
+}
+
 void BitmapBuffer::drawSizedText(coord_t x, coord_t y, const char * s, uint8_t len, LcdFlags flags)
 {
   int width = getTextWidth(s, len, flags);
@@ -263,6 +299,7 @@ void BitmapBuffer::drawSizedText(coord_t x, coord_t y, const char * s, uint8_t l
   int fontindex = FONTSIZE(flags) >> 8;
   const pm_uchar * font = fontsTable[fontindex];
   const uint16_t * fontspecs = fontspecsTable[fontindex];
+  BitmapBuffer * fontcache = NULL;
 
   if (flags & RIGHT)
     x -= width;
@@ -271,12 +308,35 @@ void BitmapBuffer::drawSizedText(coord_t x, coord_t y, const char * s, uint8_t l
 
   if ((flags&INVERS) && ((~flags & BLINK) || BLINK_ON_PHASE)) {
     flags = TEXT_INVERTED_COLOR | (flags & 0x0ffff);
-    if (FONTSIZE(flags) == TINSIZE)
+    if (fontindex == STDSIZE_INDEX) {
+      drawSolidFilledRect(x-INVERT_HORZ_MARGIN, y, INVERT_HORZ_MARGIN, INVERT_LINE_HEIGHT, TEXT_INVERTED_BGCOLOR);
+      drawSolidFilledRect(x+width, y, INVERT_HORZ_MARGIN, INVERT_LINE_HEIGHT, TEXT_INVERTED_BGCOLOR);
+      fontcache = fontCache[1];
+    }
+    else if (fontindex == TINSIZE_INDEX) {
       drawSolidFilledRect(x-INVERT_HORZ_MARGIN+2, y-INVERT_VERT_MARGIN+2, width+2*INVERT_HORZ_MARGIN-5, INVERT_LINE_HEIGHT-7, TEXT_INVERTED_BGCOLOR);
-    else if (FONTSIZE(flags) == SMLSIZE)
+    }
+    else if (fontindex == SMLSIZE_INDEX) {
       drawSolidFilledRect(x-INVERT_HORZ_MARGIN, y+1, width+2*INVERT_HORZ_MARGIN-2, INVERT_LINE_HEIGHT-5, TEXT_INVERTED_BGCOLOR);
-    else
+    }
+    else {
       drawSolidFilledRect(x-INVERT_HORZ_MARGIN, y, width+2*INVERT_HORZ_MARGIN, INVERT_LINE_HEIGHT, TEXT_INVERTED_BGCOLOR);
+    }
+  }
+  else if (!(flags & NO_FONTCACHE)) {
+    if (fontindex == STDSIZE_INDEX) {
+      uint16_t fgColor = lcdColorTable[COLOR_IDX(flags)];
+      uint16_t bgColor = *getPixelPtr(x, y);
+      if (fgColor == lcdColorTable[TEXT_COLOR_INDEX] && bgColor == lcdColorTable[TEXT_BGCOLOR_INDEX]) {
+        fontcache = fontCache[0];
+      }
+      else if (fgColor == lcdColorTable[TEXT_INVERTED_COLOR_INDEX] && bgColor == lcdColorTable[TEXT_INVERTED_BGCOLOR_INDEX]) {
+        fontcache = fontCache[1];
+      }
+      else {
+        // TRACE("No cache for \"%s\"", s);
+      }
+    }
   }
 
   const coord_t orig_x = x;
@@ -295,7 +355,17 @@ void BitmapBuffer::drawSizedText(coord_t x, coord_t y, const char * s, uint8_t l
       break;
     }
     else if (c >= 0x20) {
-      drawFontPattern(x, y, font, fontspecs, getMappedChar(c), flags);
+#if defined(TRANSLATIONS_FR)
+      if (c >= 0x80 && c <= 0x85) {
+        c = 0x20 + 115 + c - 0x80;
+      }
+#endif
+      if (fontcache) {
+        drawCharWithCache(x, y, fontcache, fontspecs, getMappedChar(c), flags);
+      }
+      else {
+        drawCharWithoutCache(x, y, font, fontspecs, getMappedChar(c), flags);
+      }
       x = lcdNextPos;
     }
     else if (c == 0x1F) {  // X-coord prefix
@@ -391,6 +461,19 @@ BitmapBuffer * BitmapBuffer::load(const char * filename)
     return load_stb(filename);
 }
 
+BitmapBuffer * BitmapBuffer::loadMask(const char * filename)
+{
+  BitmapBuffer * bitmap = BitmapBuffer::load(filename);
+  if (bitmap) {
+    display_t * p = bitmap->getData();
+    for (int i = bitmap->getWidth() * bitmap->getHeight(); i > 0; i--) {
+      *((uint8_t *)p) = OPACITY_MAX - ((*p) >> 12);
+      p++;
+    }
+  }
+  return bitmap;
+}
+
 FIL imgFile __DMA;
 
 BitmapBuffer * BitmapBuffer::load_bmp(const char * filename)
diff --git a/radio/src/gui/horus/bitmapbuffer.h b/radio/src/gui/horus/bitmapbuffer.h
index 913d39e28..2d56de2e8 100644
--- a/radio/src/gui/horus/bitmapbuffer.h
+++ b/radio/src/gui/horus/bitmapbuffer.h
@@ -174,9 +174,15 @@ class BitmapBuffer: public BitmapBufferBase<uint16_t>
 
     static BitmapBuffer * load(const char * filename);
 
+    static BitmapBuffer * loadMask(const char * filename);
+
+    void drawMask(coord_t x, coord_t y, BitmapBuffer * mask, LcdFlags flags, coord_t offset=0, coord_t width=0);
+
     void drawBitmapPattern(coord_t x, coord_t y, const uint8_t * bmp, LcdFlags flags, coord_t offset=0, coord_t width=0);
 
-    void drawFontPattern(coord_t x, coord_t y, const uint8_t * font, const uint16_t * spec, int index, LcdFlags flags);
+    void drawCharWithoutCache(coord_t x, coord_t y, const uint8_t * font, const uint16_t * spec, int index, LcdFlags flags);
+
+    void drawCharWithCache(coord_t x, coord_t y, const BitmapBuffer * font, const uint16_t * spec, int index, LcdFlags flags);
 
     void drawText(coord_t x, coord_t y, const char * s, LcdFlags flags)
     {
diff --git a/radio/src/gui/horus/bitmaps.cpp b/radio/src/gui/horus/bitmaps.cpp
index 8f117a52c..aaabdbba2 100644
--- a/radio/src/gui/horus/bitmaps.cpp
+++ b/radio/src/gui/horus/bitmaps.cpp
@@ -32,18 +32,6 @@ const uint8_t LBM_DOT[] = {
 #include "mask_dot.lbm"
 };
 
-const uint8_t LBM_CURRENT_BG[] = {
-#include "mask_current_bg.lbm"
-};
-
-const uint8_t LBM_CURRENT_SHADOW[] = {
-#include "mask_current_shadow.lbm"
-};
-
-const uint8_t LBM_CURRENT_DOT[] = {
-#include "mask_current_dot.lbm"
-};
-
 /*
  * Main view bitmaps
  */
@@ -104,208 +92,10 @@ const uint8_t LBM_RSCALE[] = {
 #include "mask_rscale.lbm"
 };
 
-/*
- *  Stats / Debug menu bitmaps
- */
-
-const uint8_t LBM_STATS_ICON[] = {
-#include "mask_stats.lbm"
-};
-
-const uint8_t LBM_STATS_GRAPH_ICON[] = {
-#include "mask_stats_graph.lbm"
-};
-
-const uint8_t LBM_STATS_TIME_ICON[] = {
-#include "mask_stats_time.lbm"
-};
-
-const uint8_t LBM_STATS_DEBUG_ICON[] = {
-#include "mask_stats_debug.lbm"
-};
-
-const uint8_t LBM_STATS_ANALOGS_ICON[] = {
-#include "mask_analogs.lbm"
-};
-
-const uint8_t * const LBM_STATS_ICONS[] = {
-  LBM_STATS_ICON,
-  LBM_STATS_GRAPH_ICON,
-  LBM_STATS_TIME_ICON,
-  LBM_STATS_ANALOGS_ICON,
-#if defined(DEBUG_TRACE_BUFFER)
-  LBM_STATS_DEBUG_ICON
-#endif  
-};
-
-/*
- *  Radio menu bitmaps
- */
-
-const uint8_t LBM_RADIO_ICON[] = {
-#include "mask_menu_radio.lbm"
-};
-
-const uint8_t LBM_RADIO_SETUP_ICON[] = {
-#include "mask_radio_setup.lbm"
-};
-
-const uint8_t LBM_SD_BROWSER_ICON[] = {
-#include "mask_sd_browser.lbm"
-};
-
-const uint8_t LBM_GLOBAL_FUNCTIONS_ICON[] = {
-#include "mask_global_functions.lbm"
-};
-
-const uint8_t LBM_TRAINER_ICON[] = {
-#include "mask_trainer.lbm"
-};
-
-const uint8_t LBM_CALIBRATION_ICON[] = {
-#include "mask_calibration.lbm"
-};
-
-const uint8_t LBM_VERSION_ICON[] = {
-#include "mask_version.lbm"
-};
-
-const uint8_t * const LBM_RADIO_ICONS[] = {
-  LBM_RADIO_ICON,
-  LBM_RADIO_SETUP_ICON,
-  LBM_SD_BROWSER_ICON,
-  LBM_GLOBAL_FUNCTIONS_ICON,
-  LBM_TRAINER_ICON,
-  LBM_CALIBRATION_ICON,
-  LBM_VERSION_ICON
-};
-
-/*
- *  Model menu bitmaps
- */
-
-const uint8_t LBM_MODEL_ICON[] = {
-#include "mask_menu_model.lbm"
-};
-
-const uint8_t LBM_MODEL_SETUP_ICON[] = {
-#include "mask_model_setup.lbm"
-};
-
-const uint8_t LBM_HELI_ICON[] = {
-#include "mask_heli.lbm"
-};
-
-const uint8_t LBM_FLIGHT_MODES_ICON[] = {
-#include "mask_flight_modes.lbm"
-};
-
-const uint8_t LBM_INPUTS_ICON[] = {
-#include "mask_inputs.lbm"
-};
-
-const uint8_t LBM_MIXER_ICON[] = {
-#include "mask_mixer.lbm"
-};
-
-const uint8_t LBM_OUTPUTS_ICON[] = {
-#include "mask_outputs.lbm"
-};
-
-const uint8_t LBM_CURVES_ICON[] = {
-#include "mask_curves.lbm"
-};
-
-const uint8_t LBM_GVARS_ICON[] = {
-#include "mask_gvars.lbm"
-};
-
-const uint8_t LBM_LOGICAL_SWITCHES_ICON[] = {
-#include "mask_logical_switches.lbm"
-};
-
-const uint8_t LBM_SPECIAL_FUNCTIONS_ICON[] = {
-#include "mask_special_functions.lbm"
-};
-
-const uint8_t LBM_LUA_SCRIPTS_ICON[] = {
-#include "mask_lua_scripts.lbm"
-};
-
-const uint8_t LBM_TELEMETRY_ICON[] = {
-#include "mask_telemetry.lbm"
-};
-
-const uint8_t * const LBM_MODEL_ICONS[] = {
-  LBM_MODEL_ICON,
-  LBM_MODEL_SETUP_ICON,
-  CASE_HELI(LBM_HELI_ICON)
-  CASE_FLIGHT_MODES(LBM_FLIGHT_MODES_ICON)
-  LBM_INPUTS_ICON,
-  LBM_MIXER_ICON,
-  LBM_OUTPUTS_ICON,
-  CASE_CURVES(LBM_CURVES_ICON)
-  CASE_GVARS(LBM_GVARS_ICON)
-  LBM_LOGICAL_SWITCHES_ICON,
-  LBM_SPECIAL_FUNCTIONS_ICON,
-#if defined(LUA_MODEL_SCRIPTS)
-  LBM_LUA_SCRIPTS_ICON,
-#endif
-  LBM_TELEMETRY_ICON
-};
-
-/*
- *  UI (theme / layout / widgets bitmaps
- */
-
-const uint8_t LBM_MAINVIEWS_ICON[] = {
-#include "mask_mainviews.lbm"
-};
-
-const uint8_t LBM_MAINVIEWS_TOPBAR_ICON[] = {
-#include "mask_mainviews_topbar.lbm"
-};
-
-const uint8_t LBM_MAINVIEWS_1_ICON[] = {
-#include "mask_mainviews_1.lbm"
-};
-
-const uint8_t LBM_MAINVIEWS_2_ICON[] = {
-#include "mask_mainviews_2.lbm"
-};
-
-const uint8_t LBM_MAINVIEWS_3_ICON[] = {
-#include "mask_mainviews_3.lbm"
-};
-
-const uint8_t LBM_MAINVIEWS_4_ICON[] = {
-#include "mask_mainviews_4.lbm"
-};
-
-const uint8_t LBM_MAINVIEWS_5_ICON[] = {
-#include "mask_mainviews_5.lbm"
-};
-
-const uint8_t LBM_MAINVIEWS_ADD_ICON[] = {
-#include "mask_mainviews_add.lbm"
-};
-
-const uint8_t * const LBM_MAINVIEWS_ICONS[] = {
-  LBM_MAINVIEWS_1_ICON,
-  LBM_MAINVIEWS_2_ICON,
-  LBM_MAINVIEWS_3_ICON,
-  LBM_MAINVIEWS_4_ICON,
-  LBM_MAINVIEWS_5_ICON
-};
-
 /*
  *  Model selection screen bitmaps
  */
 
-const uint8_t LBM_LIBRARY_ICON[] = {
-#include "mask_library.lbm"
-};
-
 const uint8_t LBM_LIBRARY_SLOT[] = {
 #include "mask_library_slot.lbm"
 };
diff --git a/radio/src/gui/horus/bitmaps.h b/radio/src/gui/horus/bitmaps.h
index 27fee169b..2b735c9f8 100644
--- a/radio/src/gui/horus/bitmaps.h
+++ b/radio/src/gui/horus/bitmaps.h
@@ -24,9 +24,6 @@
 // Header bitmaps
 extern const uint8_t LBM_TOPMENU_POLYGON[];
 extern const uint8_t LBM_DOT[];
-extern const uint8_t LBM_CURRENT_BG[];
-extern const uint8_t LBM_CURRENT_SHADOW[];
-extern const uint8_t LBM_CURRENT_DOT[];
 
 // Main view icons
 extern const uint8_t LBM_TOPMENU_USB[];
@@ -40,34 +37,11 @@ extern const uint8_t LBM_TOPMENU_TXBATT[];
 extern const uint8_t LBM_HTRIM_FRAME[];
 extern const uint8_t LBM_VTRIM_FRAME[];
 extern const uint8_t LBM_TRIM_SHADOW[];
-extern const uint8_t LBM_RADIO_ICON[];
-extern const uint8_t LBM_MODEL_ICON[];
 extern const uint8_t LBM_TIMER_BACKGROUND[];
 extern const uint8_t LBM_TIMER[];
 extern const uint8_t LBM_RSCALE[];
 
-// Menu icons
-extern const uint8_t * const LBM_RADIO_ICONS[];
-extern const uint8_t * const LBM_MODEL_ICONS[];
-extern const uint8_t * const LBM_STATS_ICONS[];
-extern const uint8_t LBM_RADIO_ICON[];
-extern const uint8_t LBM_SD_BROWSER_ICON[];
-extern const uint8_t LBM_CALIBRATION_ICON[];
-extern const uint8_t LBM_INPUTS_ICON[];
-extern const uint8_t LBM_MIXER_ICON[];
-extern const uint8_t LBM_CURVES_ICON[];
-extern const uint8_t LBM_LUA_SCRIPTS_ICON[];
-extern const uint8_t LBM_TELEMETRY_ICON[];
-extern const uint8_t LBM_STATS_ANALOGS_ICON[];
-
-// UI (theme / layout / widgets bitmaps
-extern const uint8_t LBM_MAINVIEWS_ICON[];
-extern const uint8_t LBM_MAINVIEWS_TOPBAR_ICON[];
-extern const uint8_t LBM_MAINVIEWS_ADD_ICON[];
-extern const uint8_t * const LBM_MAINVIEWS_ICONS[];
-
 // Model selection icons
-extern const uint8_t LBM_LIBRARY_ICON[];
 extern const uint8_t LBM_LIBRARY_SLOT[];
 extern const uint8_t LBM_ACTIVE_MODEL[];
 extern const uint8_t LBM_LIBRARY_CURSOR[];
diff --git a/radio/src/gui/horus/fonts.cpp b/radio/src/gui/horus/fonts.cpp
index 14f1801bd..7e68afd22 100644
--- a/radio/src/gui/horus/fonts.cpp
+++ b/radio/src/gui/horus/fonts.cpp
@@ -78,3 +78,23 @@ pm_uchar font_stdsizebold[] = {
 
 const uint16_t * const fontspecsTable[16] = { font_stdsize_specs, font_tinsize_specs, font_smlsize_specs, font_midsize_specs, font_dblsize_specs, font_xxlsize_specs, font_stdsizebold_specs };
 const uint8_t * const fontsTable[16] = { font_stdsize, font_tinsize, font_smlsize, font_midsize, font_dblsize, font_xxlsize, font_stdsizebold };
+
+BitmapBuffer * fontCache[2];
+
+BitmapBuffer * createFontCache(const uint8_t * font, LcdFlags fg, LcdFlags bg)
+{
+  coord_t width = *((uint16_t *)font);
+  coord_t height = *(((uint16_t *)font)+1);
+
+  BitmapBuffer * buffer = new BitmapBuffer(BMP_RGB565, width, height);
+  buffer->clear(bg);
+  buffer->drawBitmapPattern(0, 0, font, fg);
+
+  return buffer;
+}
+
+void loadFontCache()
+{
+  fontCache[0] = createFontCache(fontsTable[0], TEXT_COLOR, TEXT_BGCOLOR);
+  fontCache[1] = createFontCache(fontsTable[0], TEXT_INVERTED_COLOR, TEXT_INVERTED_BGCOLOR);
+}
diff --git a/radio/src/gui/horus/gui.h b/radio/src/gui/horus/gui.h
index e4e0ef75b..a741afd6d 100644
--- a/radio/src/gui/horus/gui.h
+++ b/radio/src/gui/horus/gui.h
@@ -59,7 +59,12 @@
 #define MENU_TITLE_NEXT_POS            (lcdNextPos + 10)
 #define MENU_INIT_VPOS                 -1
 
+#if defined(HELI) && defined(GVARS) && defined(LUA_MODEL_SCRIPTS)
 #define MENU_ICONS_SPACING             31
+#else
+#define MENU_ICONS_SPACING             33
+#endif
+
 #define SUBMENU_LINE_WIDTH             230
 
 #define LOAD_MODEL_BITMAP()
diff --git a/radio/src/gui/horus/lcd.h b/radio/src/gui/horus/lcd.h
index d90382835..d98a495e7 100644
--- a/radio/src/gui/horus/lcd.h
+++ b/radio/src/gui/horus/lcd.h
@@ -24,58 +24,69 @@
 #include "bitmapbuffer.h"
 
 #if defined(PCBHORUS)
-  #define LCD_W           480
-  #define LCD_H           272
-  #define LCD_COLS        30
+  #define LCD_W                        480
+  #define LCD_H                        272
+  #define LCD_COLS                     30
 #else
-  #define LCD_W           800
-  #define LCD_H           480
-  #define LCD_COLS        40
+  #define LCD_W                        800
+  #define LCD_H                        480
+  #define LCD_COLS                     40
 #endif
 
 #define CENTER
 
-#define lcdint_t        int32_t
+#define lcdint_t                       int32_t
 
-#define BSS             0x00
+#define BSS                            0x00
 
 /* lcd common flags */
-#define BLINK           0x01
+#define BLINK                          0x01
 
 /* drawText flags */
-#define INVERS          0x02
-#define LEFT            0x00
-#define CENTERED        0x04 /* align left */
-#define RIGHT           0x08 /* align left */
+#define INVERS                         0x02
+#define LEFT                           0x00
+#define CENTERED                       0x04 /* align left */
+#define RIGHT                          0x08 /* align left */
 
 /* drawNumber flags */
-#define LEADING0        0x10
-#define PREC1           0x20
-#define PREC2           0x30
-#define MODE(flags)     ((((int8_t)(flags) & 0x30) - 0x10) >> 4)
+#define LEADING0                       0x10
+#define PREC1                          0x20
+#define PREC2                          0x30
+#define MODE(flags)                    ((((int8_t)(flags) & 0x30) - 0x10) >> 4)
 
-#define ZCHAR           0x10
+#define ZCHAR                          0x10
 
 /* rect, square flags */
-#define ROUND           0x04
+#define ROUND                          0x04
 
 /* telemetry flags */
-#define NO_UNIT         0x40
+#define NO_UNIT                        0x40
 
-#define FONTSIZE(x)     ((x) & 0x0700)
-#define TINSIZE         0x0100
-#define SMLSIZE         0x0200
-#define MIDSIZE         0x0300
-#define DBLSIZE         0x0400
-#define XXLSIZE         0x0500
-#define BOLD            0x0600
-#define VERTICAL        0x0800
+enum FontSizeIndex {
+  STDSIZE_INDEX,
+  TINSIZE_INDEX,
+  SMLSIZE_INDEX,
+  MIDSIZE_INDEX,
+  DBLSIZE_INDEX,
+  XXLSIZE_INDEX,
+  BOLDSTDSIZE_INDEX,
+};
 
-#define TIMEBLINK       0x1000
-#define TIMEHOUR        0x2000
-#define STREXPANDED     0x4000
+#define FONTSIZE(x)                    ((x) & 0x0700)
+#define TINSIZE                        (TINSIZE_INDEX << 8)
+#define SMLSIZE                        (SMLSIZE_INDEX << 8)
+#define MIDSIZE                        (MIDSIZE_INDEX << 8)
+#define DBLSIZE                        (DBLSIZE_INDEX << 8)
+#define XXLSIZE                        (XXLSIZE_INDEX << 8)
+#define BOLD                           (BOLDSTDSIZE_INDEX << 8)
+
+#define VERTICAL                       0x0800
+#define TIMEBLINK                      0x1000
+#define TIMEHOUR                       0x2000
+#define NO_FONTCACHE                   0x8000
 
 #include "colors.h"
+
 #define DISPLAY_PIXELS_COUNT           (LCD_W*LCD_H)
 #define DISPLAY_BUFFER_SIZE            (sizeof(display_t)*DISPLAY_PIXELS_COUNT)
 
diff --git a/radio/src/gui/horus/menu_general.cpp b/radio/src/gui/horus/menu_general.cpp
index 547d68f24..dd2196596 100644
--- a/radio/src/gui/horus/menu_general.cpp
+++ b/radio/src/gui/horus/menu_general.cpp
@@ -18,10 +18,10 @@
  * GNU General Public License for more details.
  */
 
-#include "../../opentx.h"
+#include "opentx.h"
 
 bool menuGeneralCustomFunctions(evt_t event)
 {
-  MENU(STR_MENUGLOBALFUNCS, LBM_RADIO_ICONS, menuTabGeneral, e_GeneralCustomFunctions, NUM_CFN, { NAVIGATION_LINE_BY_LINE|4/*repeated*/ });
+  MENU(STR_MENUGLOBALFUNCS, RADIO_ICONS, menuTabGeneral, e_GeneralCustomFunctions, NUM_CFN, { NAVIGATION_LINE_BY_LINE|4/*repeated*/ });
   return menuCustomFunctions(event, g_eeGeneral.customFn, globalFunctionsContext);
 }
diff --git a/radio/src/gui/horus/menu_general_calib.cpp b/radio/src/gui/horus/menu_general_calib.cpp
index c4ad225c7..83d05fc2b 100644
--- a/radio/src/gui/horus/menu_general_calib.cpp
+++ b/radio/src/gui/horus/menu_general_calib.cpp
@@ -65,7 +65,7 @@ void drawPots()
 
 bool menuCommonCalib(evt_t event)
 {
-  drawScreenTemplate(NULL, LBM_CALIBRATION_ICON, OPTION_MENU_NO_FOOTER);
+  drawMenuTemplate(NULL, ICON_RADIO_CALIBRATION, NULL, OPTION_MENU_NO_FOOTER);
 
   for (uint8_t i=0; i<NUM_STICKS+NUM_POTS; i++) { // get low and high vals for sticks and trims
     int16_t vt = anaIn(i);
diff --git a/radio/src/gui/horus/menu_general_hardware.cpp b/radio/src/gui/horus/menu_general_hardware.cpp
index 56a594c68..95e265ea1 100644
--- a/radio/src/gui/horus/menu_general_hardware.cpp
+++ b/radio/src/gui/horus/menu_general_hardware.cpp
@@ -18,7 +18,7 @@
  * GNU General Public License for more details.
  */
 
-#include "../../opentx.h"
+#include "opentx.h"
 
 enum menuGeneralHwItems {
   ITEM_SETUP_HW_CALIBRATION,
@@ -58,7 +58,7 @@ enum menuGeneralHwItems {
 
 bool menuGeneralHardware(evt_t event)
 {
-  MENU(STR_HARDWARE, LBM_RADIO_ICONS, menuTabGeneral, e_Hardware, ITEM_SETUP_HW_MAX, { 0, LABEL(Sticks), 0, 0, 0, 0, LABEL(Pots), POTS_ROWS, LABEL(Switches), SWITCHES_ROWS, BLUETOOTH_ROWS 0 });
+  MENU(STR_HARDWARE, RADIO_ICONS, menuTabGeneral, e_Hardware, ITEM_SETUP_HW_MAX, { 0, LABEL(Sticks), 0, 0, 0, 0, LABEL(Pots), POTS_ROWS, LABEL(Switches), SWITCHES_ROWS, BLUETOOTH_ROWS 0 });
 
   uint8_t sub = menuVerticalPosition;
 
diff --git a/radio/src/gui/horus/menu_general_sdmanager.cpp b/radio/src/gui/horus/menu_general_sdmanager.cpp
index 1f38c19a9..a9c1f52d2 100644
--- a/radio/src/gui/horus/menu_general_sdmanager.cpp
+++ b/radio/src/gui/horus/menu_general_sdmanager.cpp
@@ -31,7 +31,7 @@ BitmapBuffer * currentBitmap = NULL;
 
 bool menuGeneralSdManagerInfo(evt_t event)
 {
-  SIMPLE_SUBMENU(STR_SD_INFO_TITLE, LBM_SD_BROWSER_ICON, 1);
+  SIMPLE_SUBMENU(STR_SD_INFO_TITLE, ICON_RADIO_SD_BROWSER, 1);
 
   lcdDrawText(MENUS_MARGIN_LEFT, 2*FH, STR_SD_TYPE);
   lcdDrawText(100, 2*FH, SD_IS_HC() ? STR_SDHC_CARD : STR_SD_CARD);
@@ -170,7 +170,7 @@ bool menuGeneralSdManager(evt_t _event)
   }
 
   evt_t event = (EVT_KEY_MASK(_event) == KEY_ENTER ? 0 : _event);
-  SIMPLE_MENU(SD_IS_HC() ? STR_SDHC_CARD : STR_SD_CARD, LBM_RADIO_ICONS, menuTabGeneral, e_Sd, reusableBuffer.sdmanager.count);
+  SIMPLE_MENU(SD_IS_HC() ? STR_SDHC_CARD : STR_SD_CARD, RADIO_ICONS, menuTabGeneral, e_Sd, reusableBuffer.sdmanager.count);
 
   int index = menuVerticalPosition-menuVerticalOffset;
 
diff --git a/radio/src/gui/horus/menu_general_setup.cpp b/radio/src/gui/horus/menu_general_setup.cpp
index b13f9b21c..89bb88dfb 100644
--- a/radio/src/gui/horus/menu_general_setup.cpp
+++ b/radio/src/gui/horus/menu_general_setup.cpp
@@ -73,12 +73,14 @@ enum menuGeneralSetupItems {
   ITEM_SETUP_INACTIVITY_ALARM,
   // ITEM_SETUP_MEMORY_WARNING,
   ITEM_SETUP_ALARM_WARNING,
-  // ITEM_SETUP_BACKLIGHT_LABEL,
-  // ITEM_SETUP_BACKLIGHT_MODE,
-  // ITEM_SETUP_BACKLIGHT_DELAY,
-  // ITEM_SETUP_BRIGHTNESS,
-  // ITEM_SETUP_FLASH_BEEP,
+  ITEM_SETUP_BACKLIGHT_LABEL,
+  ITEM_SETUP_BACKLIGHT_MODE,
+  ITEM_SETUP_BACKLIGHT_DELAY,
+  ITEM_SETUP_BRIGHTNESS,
+  ITEM_SETUP_DIM_LEVEL,
+  ITEM_SETUP_FLASH_BEEP,
   // CASE_SPLASH_PARAM(ITEM_SETUP_DISABLE_SPLASH)
+  CASE_GPS(ITEM_SETUP_LABEL_GPS)
   CASE_GPS(ITEM_SETUP_TIMEZONE)
   CASE_GPS(ITEM_SETUP_GPSFORMAT)
   CASE_PXX(ITEM_SETUP_COUNTRYCODE)
@@ -114,12 +116,14 @@ bool menuGeneralSetup(evt_t event)
   }
 #endif
 
-  MENU(STR_MENURADIOSETUP, LBM_RADIO_ICONS, menuTabGeneral, e_Setup, ITEM_SETUP_MAX, {
+  MENU(STR_MENURADIOSETUP, RADIO_ICONS, menuTabGeneral, e_Setup, ITEM_SETUP_MAX, {
     2|NAVIGATION_LINE_BY_LINE, 2|NAVIGATION_LINE_BY_LINE, 1|NAVIGATION_LINE_BY_LINE,
     LABEL(SOUND), 0, 0, 0, 0, 0, 0, 0,
     CASE_VARIO(LABEL(VARIO)) CASE_VARIO(0) CASE_VARIO(0) CASE_VARIO(0) CASE_VARIO(0)
     CASE_HAPTIC(LABEL(HAPTIC)) CASE_HAPTIC(0) CASE_HAPTIC(0) CASE_HAPTIC(0)
-    LABEL(ALARMS), 0, 0, 0, CASE_GPS(0) CASE_GPS(0) CASE_PXX(0) 0, 0, 0, 0, 0, 0, 1/*to force edit mode*/ });
+    LABEL(ALARMS), 0, 0, 0, 
+    LABEL(BACKLIGHT), 0, 0, 0, 0, 0,
+    CASE_GPS(LABEL(GPS)) CASE_GPS(0) CASE_GPS(0) CASE_PXX(0) 0, 0, 0, 0, 0, 0, 1/*to force edit mode*/ });
 
   int sub = menuVerticalPosition;
 
@@ -372,7 +376,6 @@ bool menuGeneralSetup(evt_t event)
         if (attr) g_eeGeneral.inactivityTimer = checkIncDec(event, g_eeGeneral.inactivityTimer, 0, 250, EE_GENERAL); //0..250minutes
         break;
 
-#if 0
       case ITEM_SETUP_BACKLIGHT_LABEL:
         lcdDrawText(MENUS_MARGIN_LEFT, y, STR_BACKLIGHT_LABEL);
         break;
@@ -394,21 +397,20 @@ bool menuGeneralSetup(evt_t event)
         break;
 
       case ITEM_SETUP_BRIGHTNESS:
-        lcdDrawText(MENUS_MARGIN_LEFT, y, STR_BRIGHTNESS);
+        lcdDrawText(MENUS_MARGIN_LEFT, y, STR_BLONBRIGHTNESS);
         lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, 100-g_eeGeneral.backlightBright, attr|LEFT) ;
         if (attr) {
           uint8_t b = 100 - g_eeGeneral.backlightBright;
-          CHECK_INCDEC_GENVAR(event, b, 0, 100);
+          CHECK_INCDEC_GENVAR(event, b, 5, 100);
           g_eeGeneral.backlightBright = 100 - b;
         }
         break;
 
-      case ITEM_SETUP_BACKLIGHT_COLOR:
-        lcdDrawText(MENUS_MARGIN_LEFT, y, STR_BLCOLOR);
-        drawSlider(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.backlightColor, 20, attr);
-        if (attr) g_eeGeneral.backlightColor = checkIncDec(event, g_eeGeneral.backlightColor, 0, 20, EE_GENERAL | NO_INCDEC_MARKS);
+      case ITEM_SETUP_DIM_LEVEL:
+        lcdDrawText(MENUS_MARGIN_LEFT, y, STR_BLOFFBRIGHTNESS);
+        lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.blOffBright, attr|LEFT) ;
+        if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.blOffBright, 5, 100);
         break;
-#endif
 
 #if 0
       case ITEM_SETUP_DISABLE_SPLASH:
@@ -425,6 +427,10 @@ bool menuGeneralSetup(evt_t event)
       }
 #endif
 
+      case ITEM_SETUP_LABEL_GPS:
+        lcdDrawText(MENUS_MARGIN_LEFT, y, STR_GPS);
+        break;
+
       case ITEM_SETUP_TIMEZONE:
         lcdDrawText(MENUS_MARGIN_LEFT, y, STR_TIMEZONE);
         lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.timezone, attr|LEFT);
diff --git a/radio/src/gui/horus/menu_general_trainer.cpp b/radio/src/gui/horus/menu_general_trainer.cpp
index 737602fc0..d9d8e2614 100644
--- a/radio/src/gui/horus/menu_general_trainer.cpp
+++ b/radio/src/gui/horus/menu_general_trainer.cpp
@@ -30,7 +30,7 @@ bool menuGeneralTrainer(evt_t event)
   uint8_t y;
   bool slave = SLAVE_MODE();
 
-  MENU(STR_MENUTRAINER, LBM_RADIO_ICONS, menuTabGeneral, e_Trainer, (slave ? 0 : 6), { 2, 2, 2, 2, 0/*, 0*/ });
+  MENU(STR_MENUTRAINER, RADIO_ICONS, menuTabGeneral, e_Trainer, (slave ? 0 : 6), { 2, 2, 2, 2, 0/*, 0*/ });
 
   if (slave) {
     // TODO lcd_putsCenter(5*FH, STR_SLAVE, TEXT_COLOR);
diff --git a/radio/src/gui/horus/menu_general_version.cpp b/radio/src/gui/horus/menu_general_version.cpp
index 546bdd8b8..6a796b6b3 100644
--- a/radio/src/gui/horus/menu_general_version.cpp
+++ b/radio/src/gui/horus/menu_general_version.cpp
@@ -22,18 +22,25 @@
 
 bool menuGeneralVersion(evt_t event)
 {
-  SIMPLE_MENU(STR_MENUVERSION, LBM_RADIO_ICONS, menuTabGeneral, e_Vers, 0);
+  DEBUG_TIMER_START(debugTimerVersion);
+  DEBUG_TIMER_START(debugTimerSimpleMenu);
+  SIMPLE_MENU(STR_MENUVERSION, RADIO_ICONS, menuTabGeneral, e_Vers, 0);
+  DEBUG_TIMER_STOP(debugTimerSimpleMenu);
 
+  DEBUG_TIMER_START(debugTimerDrawText);
+  DEBUG_TIMER_START(debugTimerDrawText1);
   lcdDrawText(MENUS_MARGIN_LEFT, MENU_CONTENT_TOP + FH, vers_stamp);
+  DEBUG_TIMER_STOP(debugTimerDrawText1);
   lcdDrawText(MENUS_MARGIN_LEFT, MENU_CONTENT_TOP + 2*FH, date_stamp);
   lcdDrawText(MENUS_MARGIN_LEFT, MENU_CONTENT_TOP + 3*FH, time_stamp);
   lcdDrawText(MENUS_MARGIN_LEFT, MENU_CONTENT_TOP + 4*FH, eeprom_stamp);
+  DEBUG_TIMER_STOP(debugTimerDrawText);
 
   // TODO EEPROM erase + backup
   // lcd_putsCenter(MENU_HEADER_HEIGHT+6*FH, STR_EEBACKUP);
   // if (event == EVT_KEY_LONG(KEY_ENTER)) {
   //   backupEeprom();
   // }
-
+  DEBUG_TIMER_STOP(debugTimerVersion);
   return true;
 }
diff --git a/radio/src/gui/horus/menu_model_curves.cpp b/radio/src/gui/horus/menu_model_curves.cpp
index e5d3feabc..2d1e62e90 100644
--- a/radio/src/gui/horus/menu_model_curves.cpp
+++ b/radio/src/gui/horus/menu_model_curves.cpp
@@ -139,7 +139,7 @@ bool menuModelCurveOne(evt_t event)
   CurveData & crv = g_model.curves[s_curveChan];
   int8_t * points = curveAddress(s_curveChan);
 
-  SUBMENU_WITH_OPTIONS(STR_MENUCURVE, LBM_CURVES_ICON, crv.type==CURVE_TYPE_CUSTOM ? 6 : 5, OPTION_MENU_NO_FOOTER, { 0, 0, 0, 0, uint8_t(5+crv.points-1), uint8_t(5+crv.points-1) });
+  SUBMENU_WITH_OPTIONS(STR_MENUCURVE, ICON_MODEL_CURVES, crv.type==CURVE_TYPE_CUSTOM ? 6 : 5, OPTION_MENU_NO_FOOTER, { 0, 0, 0, 0, uint8_t(5+crv.points-1), uint8_t(5+crv.points-1) });
   drawStringWithIndex(50, 3+FH, STR_CV, s_curveChan+1, MENU_TITLE_COLOR);
   lcdDrawSolidFilledRect(0, MENU_FOOTER_TOP, 250, MENU_FOOTER_HEIGHT, HEADER_BGCOLOR);
 
@@ -335,7 +335,7 @@ void editCurveRef(coord_t x, coord_t y, CurveRef & curve, evt_t event, uint8_t a
 
 bool menuModelCurvesAll(evt_t event)
 {
-  SIMPLE_MENU(STR_MENUCURVES, LBM_MODEL_ICONS, menuTabModel, e_CurvesAll, MAX_CURVES);
+  SIMPLE_MENU(STR_MENUCURVES, MODEL_ICONS, menuTabModel, e_CurvesAll, MAX_CURVES);
 
   int8_t  sub = menuVerticalPosition;
 
diff --git a/radio/src/gui/horus/menu_model_custom_functions.cpp b/radio/src/gui/horus/menu_model_custom_functions.cpp
index 8039c7a9c..2839f1180 100644
--- a/radio/src/gui/horus/menu_model_custom_functions.cpp
+++ b/radio/src/gui/horus/menu_model_custom_functions.cpp
@@ -30,7 +30,18 @@
 void onCustomFunctionsFileSelectionMenu(const char * result)
 {
   int sub = menuVerticalPosition;
-  CustomFunctionData * cf = &g_model.customFn[sub];
+  CustomFunctionData * cf;
+  uint8_t eeFlags;
+  
+  if (menuHandlers[menuLevel] == menuModelCustomFunctions) {
+    cf = &g_model.customFn[sub];
+    eeFlags = EE_MODEL;
+  }
+  else {
+    cf = &g_eeGeneral.customFn[sub];
+    eeFlags = EE_GENERAL;
+  }
+
   uint8_t func = CFN_FUNC(cf);
 
   if (result == STR_UPDATE_LIST) {
@@ -95,6 +106,35 @@ void onCustomFunctionsMenu(const char *result)
   }
 }
 
+void onAdjustGvarSourceLongEnterPress(const char * result)
+{
+  CustomFunctionData * cfn = &g_model.customFn[menuVerticalPosition];
+
+  if (result == STR_CONSTANT) {
+    CFN_GVAR_MODE(cfn) = FUNC_ADJUST_GVAR_CONSTANT;
+    CFN_PARAM(cfn) = 0;
+    storageDirty(EE_MODEL);
+  }
+  else if (result == STR_MIXSOURCE) {
+    CFN_GVAR_MODE(cfn) = FUNC_ADJUST_GVAR_SOURCE;
+    CFN_PARAM(cfn) = 0;
+    storageDirty(EE_MODEL);
+  }
+  else if (result == STR_GLOBALVAR) {
+    CFN_GVAR_MODE(cfn) = FUNC_ADJUST_GVAR_GVAR;
+    CFN_PARAM(cfn) = 0;
+    storageDirty(EE_MODEL);
+  }
+  else if (result == STR_INCDEC) {
+    CFN_GVAR_MODE(cfn) = FUNC_ADJUST_GVAR_INCDEC;
+    CFN_PARAM(cfn) = 0;
+    storageDirty(EE_MODEL);
+  }
+  else {
+    onSourceLongEnterPress(result);
+  }
+}
+
 bool menuCustomFunctions(evt_t event, CustomFunctionData * functions, CustomFunctionsContext & functionsContext)
 {
   uint32_t sub = menuVerticalPosition;
@@ -134,7 +174,9 @@ bool menuCustomFunctions(evt_t event, CustomFunctionData * functions, CustomFunc
       LcdFlags active = (attr && s_editMode>0);
       switch (j) {
         case 0:
-          if (active || AUTOSWITCH_ENTER_LONG()) CHECK_INCDEC_SWITCH(event, CFN_SWITCH(cfn), SWSRC_FIRST, SWSRC_LAST, eeFlags, isSwitchAvailableInCustomFunctions);
+          if (active || AUTOSWITCH_ENTER_LONG()) {
+            CHECK_INCDEC_SWITCH(event, CFN_SWITCH(cfn), SWSRC_FIRST, SWSRC_LAST, eeFlags, isSwitchAvailableInCustomFunctions);
+          }
           putsSwitches(MODEL_CUSTOM_FUNC_1ST_COLUMN, y, CFN_SWITCH(cfn), attr | ((functionsContext.activeSwitches & ((MASK_CFN_TYPE)1 << k)) ? BOLD : 0));
           break;
 
@@ -254,7 +296,10 @@ bool menuCustomFunctions(evt_t event, CustomFunctionData * functions, CustomFunc
           else if (func == FUNC_PLAY_VALUE) {
             val_max = MIXSRC_LAST_TELEM;
             putsMixerSource(MODEL_CUSTOM_FUNC_3RD_COLUMN, y, val_displayed, attr);
-            INCDEC_ENABLE_CHECK(isSourceAvailable);
+            if (active) {
+              INCDEC_SET_FLAG(eeFlags | INCDEC_SOURCE);
+              INCDEC_ENABLE_CHECK(functions == g_eeGeneral.customFn ? isSourceAvailableInGlobalFunctions : isSourceAvailable);
+            }
           }
 #endif
           else if (func == FUNC_VOLUME) {
@@ -290,26 +335,22 @@ bool menuCustomFunctions(evt_t event, CustomFunctionData * functions, CustomFunc
               case FUNC_ADJUST_GVAR_SOURCE:
                 val_max = MIXSRC_LAST_CH;
                 putsMixerSource(MODEL_CUSTOM_FUNC_3RD_COLUMN, y, val_displayed, attr);
-                INCDEC_SET_FLAG(eeFlags | INCDEC_SOURCE);
-                INCDEC_ENABLE_CHECK(isSourceAvailable);
+                if (active) {
+                  INCDEC_SET_FLAG(eeFlags | INCDEC_SOURCE);
+                  INCDEC_ENABLE_CHECK(isSourceAvailable);
+                }
                 break;
               case FUNC_ADJUST_GVAR_GVAR:
                 val_max = MAX_GVARS-1;
                 drawStringWithIndex(MODEL_CUSTOM_FUNC_3RD_COLUMN, y, STR_GV, val_displayed+1, attr);
                 break;
               default: // FUNC_ADJUST_GVAR_INC
-                val_max = 1;
-                lcdDrawTextAtIndex(MODEL_CUSTOM_FUNC_3RD_COLUMN, y, PSTR("\003-=1+=1"), val_displayed, attr);
-                break;
-            }
-
-            if (attr && event==EVT_KEY_LONG(KEY_ENTER)) {
-              killEvents(event);
-              s_editMode = !s_editMode;
-              active = true;
-              CFN_GVAR_MODE(cfn) += 1;
-              CFN_GVAR_MODE(cfn) &= 0x03;
-              val_displayed = 0;
+                val_min = -100; val_max = +100;
+                if (val_displayed < 0)
+                  lcdDrawText(MODEL_CUSTOM_FUNC_3RD_COLUMN, y, "-= ", attr);
+                else
+                  lcdDrawText(MODEL_CUSTOM_FUNC_3RD_COLUMN, y, "+= ", attr);
+                lcdDrawNumber(lcdNextPos, y, abs(val_displayed), attr|LEFT);
             }
           }
 #endif
@@ -317,8 +358,21 @@ bool menuCustomFunctions(evt_t event, CustomFunctionData * functions, CustomFunc
             REPEAT_LAST_CURSOR_MOVE(0);
           }
 
-          if (active) {
+          if (active || event==EVT_KEY_LONG(KEY_ENTER)) {
             CFN_PARAM(cfn) = CHECK_INCDEC_PARAM(event, val_displayed, val_min, val_max);
+            if (func == FUNC_ADJUST_GVAR && attr && event==EVT_KEY_LONG(KEY_ENTER)) {
+              killEvents(event);
+              if (CFN_GVAR_MODE(cfn) != FUNC_ADJUST_GVAR_CONSTANT)
+                POPUP_MENU_ADD_ITEM(STR_CONSTANT);
+              if (CFN_GVAR_MODE(cfn) != FUNC_ADJUST_GVAR_SOURCE)
+                POPUP_MENU_ADD_ITEM(STR_MIXSOURCE);
+              if (CFN_GVAR_MODE(cfn) != FUNC_ADJUST_GVAR_GVAR)
+                POPUP_MENU_ADD_ITEM(STR_GLOBALVAR);
+              if (CFN_GVAR_MODE(cfn) != FUNC_ADJUST_GVAR_INCDEC)
+                POPUP_MENU_ADD_ITEM(STR_INCDEC);
+              popupMenuHandler = onAdjustGvarSourceLongEnterPress;
+              s_editMode = EDIT_MODIFY_FIELD;
+            }
           }
           break;
         }
@@ -353,6 +407,6 @@ bool menuCustomFunctions(evt_t event, CustomFunctionData * functions, CustomFunc
 
 bool menuModelCustomFunctions(evt_t event)
 {
-  MENU(STR_MENUCUSTOMFUNC, LBM_MODEL_ICONS, menuTabModel, e_CustomFunctions, NUM_CFN, { NAVIGATION_LINE_BY_LINE|4/*repeated*/ });
+  MENU(STR_MENUCUSTOMFUNC, MODEL_ICONS, menuTabModel, e_CustomFunctions, NUM_CFN, { NAVIGATION_LINE_BY_LINE|4/*repeated*/ });
   return menuCustomFunctions(event, g_model.customFn, modelFunctionsContext);
 }
diff --git a/radio/src/gui/horus/menu_model_custom_scripts.cpp b/radio/src/gui/horus/menu_model_custom_scripts.cpp
index 7643db3da..f25147f36 100644
--- a/radio/src/gui/horus/menu_model_custom_scripts.cpp
+++ b/radio/src/gui/horus/menu_model_custom_scripts.cpp
@@ -53,7 +53,7 @@ bool menuModelCustomScriptOne(evt_t event)
 
   // drawStringWithIndex(lcdLastPos+FW, 0, "LUA", s_currIdx+1, 0);
 
-  SUBMENU(STR_MENUCUSTOMSCRIPTS, LBM_LUA_SCRIPTS_ICON, 3+scriptInputsOutputs[s_currIdx].inputsCount, { 0, 0, LABEL(inputs), 0/*repeated*/ });
+  SUBMENU(STR_MENUCUSTOMSCRIPTS, ICON_MODEL_LUA_SCRIPTS, 3+scriptInputsOutputs[s_currIdx].inputsCount, { 0, 0, LABEL(inputs), 0/*repeated*/ });
 
   int8_t sub = menuVerticalPosition;
 
@@ -127,7 +127,7 @@ bool menuModelCustomScripts(evt_t event)
   // lcdDrawNumber(19*FW, 0, luaGetMemUsed(), 0);
   // lcdDrawText(19*FW+1, 0, STR_BYTES);
 
-  MENU(STR_MENUCUSTOMSCRIPTS, LBM_MODEL_ICONS, menuTabModel, e_CustomScripts, MAX_SCRIPTS, { NAVIGATION_LINE_BY_LINE|3/*repeated*/ });
+  MENU(STR_MENUCUSTOMSCRIPTS, MODEL_ICONS, menuTabModel, e_CustomScripts, MAX_SCRIPTS, { NAVIGATION_LINE_BY_LINE|3/*repeated*/ });
 
   int8_t  sub = menuVerticalPosition;
 
diff --git a/radio/src/gui/horus/menu_model_flightmodes.cpp b/radio/src/gui/horus/menu_model_flightmodes.cpp
index 5a1ea2391..ff7adbc68 100644
--- a/radio/src/gui/horus/menu_model_flightmodes.cpp
+++ b/radio/src/gui/horus/menu_model_flightmodes.cpp
@@ -80,7 +80,7 @@ bool isTrimModeAvailable(int mode)
 
 bool menuModelFlightModesAll(evt_t event)
 {
-  MENU(STR_MENUFLIGHTPHASES, LBM_MODEL_ICONS, menuTabModel, e_FlightModesAll, MAX_FLIGHT_MODES+1, { NAVIGATION_LINE_BY_LINE|ITEM_FLIGHT_MODES_LAST, NAVIGATION_LINE_BY_LINE|ITEM_FLIGHT_MODES_LAST, NAVIGATION_LINE_BY_LINE|ITEM_FLIGHT_MODES_LAST, NAVIGATION_LINE_BY_LINE|NAVIGATION_LINE_BY_LINE|ITEM_FLIGHT_MODES_LAST, NAVIGATION_LINE_BY_LINE|ITEM_FLIGHT_MODES_LAST, NAVIGATION_LINE_BY_LINE|ITEM_FLIGHT_MODES_LAST, NAVIGATION_LINE_BY_LINE|ITEM_FLIGHT_MODES_LAST, NAVIGATION_LINE_BY_LINE|ITEM_FLIGHT_MODES_LAST, NAVIGATION_LINE_BY_LINE|ITEM_FLIGHT_MODES_LAST, 0});
+  MENU(STR_MENUFLIGHTPHASES, MODEL_ICONS, menuTabModel, e_FlightModesAll, MAX_FLIGHT_MODES+1, { NAVIGATION_LINE_BY_LINE|ITEM_FLIGHT_MODES_LAST, NAVIGATION_LINE_BY_LINE|ITEM_FLIGHT_MODES_LAST, NAVIGATION_LINE_BY_LINE|ITEM_FLIGHT_MODES_LAST, NAVIGATION_LINE_BY_LINE|NAVIGATION_LINE_BY_LINE|ITEM_FLIGHT_MODES_LAST, NAVIGATION_LINE_BY_LINE|ITEM_FLIGHT_MODES_LAST, NAVIGATION_LINE_BY_LINE|ITEM_FLIGHT_MODES_LAST, NAVIGATION_LINE_BY_LINE|ITEM_FLIGHT_MODES_LAST, NAVIGATION_LINE_BY_LINE|ITEM_FLIGHT_MODES_LAST, NAVIGATION_LINE_BY_LINE|ITEM_FLIGHT_MODES_LAST, 0});
 
   int sub = menuVerticalPosition;
 
diff --git a/radio/src/gui/horus/menu_model_gvars.cpp b/radio/src/gui/horus/menu_model_gvars.cpp
index c24756e66..fd680007f 100644
--- a/radio/src/gui/horus/menu_model_gvars.cpp
+++ b/radio/src/gui/horus/menu_model_gvars.cpp
@@ -44,7 +44,7 @@ void onGVARSMenu(const char *result)
 
 bool menuModelGVars(evt_t event)
 {
-  MENU(STR_MENUGLOBALVARS, LBM_MODEL_ICONS, menuTabModel, e_GVars/* TODO, first2seconds ? CHECK_FLAG_NO_SCREEN_INDEX : 0*/, MAX_GVARS, { NAVIGATION_LINE_BY_LINE|MAX_FLIGHT_MODES, NAVIGATION_LINE_BY_LINE|MAX_FLIGHT_MODES, NAVIGATION_LINE_BY_LINE|MAX_FLIGHT_MODES, NAVIGATION_LINE_BY_LINE|MAX_FLIGHT_MODES, NAVIGATION_LINE_BY_LINE|MAX_FLIGHT_MODES, NAVIGATION_LINE_BY_LINE|MAX_FLIGHT_MODES, NAVIGATION_LINE_BY_LINE|MAX_FLIGHT_MODES, NAVIGATION_LINE_BY_LINE|MAX_FLIGHT_MODES, NAVIGATION_LINE_BY_LINE|MAX_FLIGHT_MODES});
+  MENU(STR_MENUGLOBALVARS, MODEL_ICONS, menuTabModel, e_GVars/* TODO, first2seconds ? CHECK_FLAG_NO_SCREEN_INDEX : 0*/, MAX_GVARS, { NAVIGATION_LINE_BY_LINE|MAX_FLIGHT_MODES, NAVIGATION_LINE_BY_LINE|MAX_FLIGHT_MODES, NAVIGATION_LINE_BY_LINE|MAX_FLIGHT_MODES, NAVIGATION_LINE_BY_LINE|MAX_FLIGHT_MODES, NAVIGATION_LINE_BY_LINE|MAX_FLIGHT_MODES, NAVIGATION_LINE_BY_LINE|MAX_FLIGHT_MODES, NAVIGATION_LINE_BY_LINE|MAX_FLIGHT_MODES, NAVIGATION_LINE_BY_LINE|MAX_FLIGHT_MODES, NAVIGATION_LINE_BY_LINE|MAX_FLIGHT_MODES});
 
   int sub = menuVerticalPosition;
 
diff --git a/radio/src/gui/horus/menu_model_heli.cpp b/radio/src/gui/horus/menu_model_heli.cpp
index f37d4217c..e36e0f132 100644
--- a/radio/src/gui/horus/menu_model_heli.cpp
+++ b/radio/src/gui/horus/menu_model_heli.cpp
@@ -36,7 +36,7 @@ enum menuModelHeliItems {
 
 bool menuModelHeli(evt_t event)
 {
-  SIMPLE_MENU(STR_MENUHELISETUP, LBM_MODEL_ICONS, menuTabModel, e_Heli, ITEM_HELI_MAX);
+  SIMPLE_MENU(STR_MENUHELISETUP, MODEL_ICONS, menuTabModel, e_Heli, ITEM_HELI_MAX);
 
   int sub = menuVerticalPosition;
 
diff --git a/radio/src/gui/horus/menu_model_inputs.cpp b/radio/src/gui/horus/menu_model_inputs.cpp
index 545957c8b..91f880822 100644
--- a/radio/src/gui/horus/menu_model_inputs.cpp
+++ b/radio/src/gui/horus/menu_model_inputs.cpp
@@ -175,7 +175,7 @@ bool menuModelExpoOne(evt_t event)
 {
   ExpoData * ed = expoAddress(s_currIdx);
 
-  SUBMENU_WITH_OPTIONS(STR_MENUINPUTS, LBM_INPUTS_ICON, EXPO_FIELD_MAX, OPTION_MENU_NO_FOOTER|OPTION_MENU_NO_SCROLLBAR, { 0, 0, (ed->srcRaw >= MIXSRC_FIRST_TELEM ? (uint8_t)1 : (uint8_t)0), 0, 0, CASE_CURVES(CURVE_ROWS) CASE_FLIGHT_MODES((MAX_FLIGHT_MODES-1) | NAVIGATION_LINE_BY_LINE) 0 /*, ...*/});
+  SUBMENU_WITH_OPTIONS(STR_MENUINPUTS, ICON_MODEL_INPUTS, EXPO_FIELD_MAX, OPTION_MENU_NO_FOOTER|OPTION_MENU_NO_SCROLLBAR, { 0, 0, (ed->srcRaw >= MIXSRC_FIRST_TELEM ? (uint8_t)1 : (uint8_t)0), 0, 0, CASE_CURVES(CURVE_ROWS) CASE_FLIGHT_MODES((MAX_FLIGHT_MODES-1) | NAVIGATION_LINE_BY_LINE) 0 /*, ...*/});
   lcdDrawSizedText(50, 3+FH, g_model.inputNames[ed->chn], LEN_INPUT_NAME, ZCHAR|MENU_TITLE_COLOR);
   lcdDrawSolidFilledRect(0, MENU_FOOTER_TOP, 230, MENU_FOOTER_HEIGHT, HEADER_BGCOLOR);
 
@@ -233,7 +233,7 @@ bool menuModelExpoOne(evt_t event)
 
       case EXPO_FIELD_SOURCE:
         lcdDrawText(MENUS_MARGIN_LEFT, y, NO_INDENT(STR_SOURCE));
-        putsMixerSource(EXPO_ONE_2ND_COLUMN, y, ed->srcRaw, STREXPANDED|(menuHorizontalPosition==0?attr:0));
+        putsMixerSource(EXPO_ONE_2ND_COLUMN, y, ed->srcRaw, menuHorizontalPosition==0 ? attr : 0);
         if (attr && menuHorizontalPosition==0) ed->srcRaw = checkIncDec(event, ed->srcRaw, INPUTSRC_FIRST, INPUTSRC_LAST, EE_MODEL|INCDEC_SOURCE|NO_INCDEC_MARKS, isInputSourceAvailable);
         if (ed->srcRaw >= MIXSRC_FIRST_TELEM) {
           putsTelemetryChannelValue(EXPO_ONE_2ND_COLUMN+60, y, (ed->srcRaw - MIXSRC_FIRST_TELEM)/3, convertTelemValue(ed->srcRaw - MIXSRC_FIRST_TELEM + 1, ed->scale), LEFT|(menuHorizontalPosition==1?attr:0));
@@ -370,7 +370,7 @@ bool menuModelExposAll(evt_t event)
   uint8_t chn = expoAddress(s_currIdx)->chn + 1;
 
   int linesCount = getExposLinesCount();
-  SIMPLE_MENU(STR_MENUINPUTS, LBM_MODEL_ICONS, menuTabModel, e_InputsAll, linesCount);
+  SIMPLE_MENU(STR_MENUINPUTS, MODEL_ICONS, menuTabModel, e_InputsAll, linesCount);
 
   switch (event) {
     case EVT_ENTRY:
diff --git a/radio/src/gui/horus/menu_model_limits.cpp b/radio/src/gui/horus/menu_model_limits.cpp
index 7331a7750..e09333f58 100644
--- a/radio/src/gui/horus/menu_model_limits.cpp
+++ b/radio/src/gui/horus/menu_model_limits.cpp
@@ -93,7 +93,7 @@ void onLimitsMenu(const char *result)
 
 bool menuModelLimits(evt_t event)
 {
-  MENU(STR_MENULIMITS, LBM_MODEL_ICONS, menuTabModel, e_Limits, NUM_CHNOUT+1,
+  MENU(STR_MENULIMITS, MODEL_ICONS, menuTabModel, e_Limits, NUM_CHNOUT+1,
       { NAVIGATION_LINE_BY_LINE|ITEM_LIMITS_MAXROW, NAVIGATION_LINE_BY_LINE|ITEM_LIMITS_MAXROW, NAVIGATION_LINE_BY_LINE|ITEM_LIMITS_MAXROW, NAVIGATION_LINE_BY_LINE|ITEM_LIMITS_MAXROW, NAVIGATION_LINE_BY_LINE|ITEM_LIMITS_MAXROW, NAVIGATION_LINE_BY_LINE|ITEM_LIMITS_MAXROW, NAVIGATION_LINE_BY_LINE|ITEM_LIMITS_MAXROW, NAVIGATION_LINE_BY_LINE|ITEM_LIMITS_MAXROW,
         NAVIGATION_LINE_BY_LINE|ITEM_LIMITS_MAXROW, NAVIGATION_LINE_BY_LINE|ITEM_LIMITS_MAXROW, NAVIGATION_LINE_BY_LINE|ITEM_LIMITS_MAXROW, NAVIGATION_LINE_BY_LINE|ITEM_LIMITS_MAXROW, NAVIGATION_LINE_BY_LINE|ITEM_LIMITS_MAXROW, NAVIGATION_LINE_BY_LINE|ITEM_LIMITS_MAXROW, NAVIGATION_LINE_BY_LINE|ITEM_LIMITS_MAXROW, NAVIGATION_LINE_BY_LINE|ITEM_LIMITS_MAXROW,
         NAVIGATION_LINE_BY_LINE|ITEM_LIMITS_MAXROW, NAVIGATION_LINE_BY_LINE|ITEM_LIMITS_MAXROW, NAVIGATION_LINE_BY_LINE|ITEM_LIMITS_MAXROW, NAVIGATION_LINE_BY_LINE|ITEM_LIMITS_MAXROW, NAVIGATION_LINE_BY_LINE|ITEM_LIMITS_MAXROW, NAVIGATION_LINE_BY_LINE|ITEM_LIMITS_MAXROW, NAVIGATION_LINE_BY_LINE|ITEM_LIMITS_MAXROW, NAVIGATION_LINE_BY_LINE|ITEM_LIMITS_MAXROW,
diff --git a/radio/src/gui/horus/menu_model_logical_switches.cpp b/radio/src/gui/horus/menu_model_logical_switches.cpp
index ddd59acd4..f7b159d97 100644
--- a/radio/src/gui/horus/menu_model_logical_switches.cpp
+++ b/radio/src/gui/horus/menu_model_logical_switches.cpp
@@ -77,7 +77,7 @@ bool menuModelLogicalSwitches(evt_t event)
 {
   INCDEC_DECLARE_VARS(EE_MODEL);
 
-  MENU(STR_MENULOGICALSWITCHES, LBM_MODEL_ICONS, menuTabModel, e_LogicalSwitches, NUM_LOGICAL_SWITCH, { NAVIGATION_LINE_BY_LINE|LS_FIELD_LAST/*repeated...*/} );
+  MENU(STR_MENULOGICALSWITCHES, MODEL_ICONS, menuTabModel, e_LogicalSwitches, NUM_LOGICAL_SWITCH, { NAVIGATION_LINE_BY_LINE|LS_FIELD_LAST/*repeated...*/} );
 
   int k = 0;
   int sub = menuVerticalPosition;
diff --git a/radio/src/gui/horus/menu_model_mixes.cpp b/radio/src/gui/horus/menu_model_mixes.cpp
index fb2cfe776..012fb8025 100644
--- a/radio/src/gui/horus/menu_model_mixes.cpp
+++ b/radio/src/gui/horus/menu_model_mixes.cpp
@@ -174,7 +174,7 @@ bool menuModelMixOne(evt_t event)
 {
   MixData * md2 = mixAddress(s_currIdx) ;
 
-  SUBMENU_WITH_OPTIONS(STR_MIXER, LBM_MIXER_ICON, MIX_FIELD_COUNT, OPTION_MENU_NO_SCROLLBAR, { 0, 0, 0, 0, 0, CASE_CURVES(1) CASE_FLIGHT_MODES((MAX_FLIGHT_MODES-1) | NAVIGATION_LINE_BY_LINE) 0 /*, ...*/ });
+  SUBMENU_WITH_OPTIONS(STR_MIXER, ICON_MODEL_MIXER, MIX_FIELD_COUNT, OPTION_MENU_NO_SCROLLBAR, { 0, 0, 0, 0, 0, CASE_CURVES(1) CASE_FLIGHT_MODES((MAX_FLIGHT_MODES-1) | NAVIGATION_LINE_BY_LINE) 0 /*, ...*/ });
   putsChn(50, 3+FH, md2->destCh+1, MENU_TITLE_COLOR);
 
   // The separation line between 2 columns
@@ -201,7 +201,7 @@ bool menuModelMixOne(evt_t event)
         break;
       case MIX_FIELD_SOURCE:
         lcdDrawText(MENUS_MARGIN_LEFT, y, NO_INDENT(STR_SOURCE));
-        putsMixerSource(MIXES_2ND_COLUMN, y, md2->srcRaw, STREXPANDED|attr);
+        putsMixerSource(MIXES_2ND_COLUMN, y, md2->srcRaw, attr);
         if (attr) CHECK_INCDEC_MODELSOURCE(event, md2->srcRaw, 1, MIXSRC_LAST);
         break;
       case MIX_FIELD_WEIGHT:
@@ -341,7 +341,7 @@ bool menuModelMixAll(evt_t event)
   uint8_t chn = mixAddress(s_currIdx)->destCh + 1;
 
   int linesCount = getMixesLinesCount();
-  SIMPLE_MENU(STR_MIXER, LBM_MODEL_ICONS, menuTabModel, e_MixAll, linesCount);
+  SIMPLE_MENU(STR_MIXER, MODEL_ICONS, menuTabModel, e_MixAll, linesCount);
 
   switch (event) {
     case EVT_ENTRY:
diff --git a/radio/src/gui/horus/menu_model_select.cpp b/radio/src/gui/horus/menu_model_select.cpp
index 72625694a..53bc00f55 100644
--- a/radio/src/gui/horus/menu_model_select.cpp
+++ b/radio/src/gui/horus/menu_model_select.cpp
@@ -218,7 +218,7 @@ bool menuModelSelect(evt_t event)
   }
 
   // Header
-  theme->drawTopbarBackground(LBM_LIBRARY_ICON);
+  theme->drawTopbarBackground(ICON_LIBRARY);
 
   // Body
   lcdDrawSolidFilledRect(0, MENU_HEADER_HEIGHT, CATEGORIES_WIDTH, LCD_H-MENU_HEADER_HEIGHT-MENU_FOOTER_HEIGHT, TITLE_BGCOLOR);
diff --git a/radio/src/gui/horus/menu_model_setup.cpp b/radio/src/gui/horus/menu_model_setup.cpp
index f5b5b64f0..c05ed3f08 100644
--- a/radio/src/gui/horus/menu_model_setup.cpp
+++ b/radio/src/gui/horus/menu_model_setup.cpp
@@ -105,7 +105,7 @@ void editTimerMode(int timerIdx, coord_t y, LcdFlags attr, evt_t event)
   }
   drawStringWithIndex(MENUS_MARGIN_LEFT, y, STR_TIMER, timerIdx+1);
   putsTimerMode(MODEL_SETUP_2ND_COLUMN, y, timer->mode, (menuHorizontalPosition<=0 ? attr : 0));
-  putsTimer(MODEL_SETUP_2ND_COLUMN+50, y, timer->start, (menuHorizontalPosition==1 ? attr|TIMEHOUR : TIMEHOUR));
+  putsTimer(MODEL_SETUP_2ND_COLUMN+50, y, timer->start, (menuHorizontalPosition!=0 ? attr|TIMEHOUR : TIMEHOUR));
   if (attr && s_editMode>0) {
     switch (menuHorizontalPosition) {
       case 0:
@@ -186,7 +186,7 @@ bool menuModelSetup(evt_t event)
     g_model.moduleData[INTERNAL_MODULE].ppm.pulsePol = XJT_EXTERNAL_ANTENNA;
   }
 
-  MENU(STR_MENUSETUP, LBM_MODEL_ICONS, menuTabModel, e_ModelSetup, ITEM_MODEL_SETUP_MAX,
+  MENU(STR_MENUSETUP, MODEL_ICONS, menuTabModel, e_ModelSetup, ITEM_MODEL_SETUP_MAX,
        { 0, 0, TIMERS_ROWS, 0, 1, 0, 0,
          LABEL(Throttle), 0, 0, 0,
          LABEL(PreflightCheck), 0, 0, SW_WARN_ITEMS(), POT_WARN_ITEMS(), NAVIGATION_LINE_BY_LINE|(NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS-1), 0,
@@ -203,14 +203,10 @@ bool menuModelSetup(evt_t event)
          IF_EXTERNAL_MODULE_XJT(FAILSAFE_ROWS(EXTERNAL_MODULE)),
          LABEL(Trainer), 0, TRAINER_CHANNELS_ROWS(), IF_TRAINER_ON(2) });
 
-#if (defined(DSM2) || defined(PXX))
   if (menuEvent) {
     moduleFlag[0] = 0;
-#if NUM_MODULES > 1
     moduleFlag[1] = 0;
-#endif
   }
-#endif
 
   int sub = menuVerticalPosition;
 
@@ -757,7 +753,7 @@ bool menuModelFailsafe(evt_t event)
     }
   }
 
-  SIMPLE_SUBMENU_WITH_OPTIONS("FAILSAFE", LBM_STATS_ANALOGS_ICON, NUM_CHANNELS(g_moduleIdx), OPTION_MENU_NO_SCROLLBAR);
+  SIMPLE_SUBMENU_WITH_OPTIONS("FAILSAFE", ICON_STATS_ANALOGS, NUM_CHANNELS(g_moduleIdx), OPTION_MENU_NO_SCROLLBAR);
   drawStringWithIndex(50, 3+FH, "Module", g_moduleIdx+1, MENU_TITLE_COLOR);
 
   #define COL_W   (LCD_W/2)
diff --git a/radio/src/gui/horus/menu_model_telemetry.cpp b/radio/src/gui/horus/menu_model_telemetry.cpp
index 6b4ddcec3..3f7cb3b08 100644
--- a/radio/src/gui/horus/menu_model_telemetry.cpp
+++ b/radio/src/gui/horus/menu_model_telemetry.cpp
@@ -127,7 +127,7 @@ bool menuModelSensor(evt_t event)
 {
   TelemetrySensor * sensor = &g_model.telemetrySensors[s_currIdx];
 
-  SUBMENU("SENSOR", LBM_TELEMETRY_ICON, SENSOR_FIELD_MAX, { 0, 0, sensor->type == TELEM_TYPE_CALCULATED ? (uint8_t)0 : (uint8_t)1, SENSOR_UNIT_ROWS, SENSOR_PREC_ROWS, SENSOR_PARAM1_ROWS, SENSOR_PARAM2_ROWS, SENSOR_PARAM3_ROWS, SENSOR_PARAM4_ROWS, 0, 0, 0, 0, 0 });
+  SUBMENU("SENSOR", ICON_MODEL_TELEMETRY, SENSOR_FIELD_MAX, { 0, 0, sensor->type == TELEM_TYPE_CALCULATED ? (uint8_t)0 : (uint8_t)1, SENSOR_UNIT_ROWS, SENSOR_PREC_ROWS, SENSOR_PARAM1_ROWS, SENSOR_PARAM2_ROWS, SENSOR_PARAM3_ROWS, SENSOR_PARAM4_ROWS, 0, 0, 0, 0, 0 });
   lcdDrawNumber(lcdNextPos, 3, s_currIdx+1, MENU_TITLE_COLOR|LEFT);
   putsTelemetryChannelValue(50, 3+FH, s_currIdx, getValue(MIXSRC_FIRST_TELEM+3*s_currIdx), MENU_TITLE_COLOR|LEFT);
 
@@ -407,7 +407,7 @@ bool menuModelTelemetry(evt_t event)
     }
   }
 
-  MENU(STR_MENUTELEMETRY, LBM_MODEL_ICONS, menuTabModel, e_Telemetry, ITEM_TELEMETRY_MAX, { TELEMETRY_TYPE_ROWS RSSI_ROWS SENSORS_ROWS VARIO_ROWS });
+  MENU(STR_MENUTELEMETRY, MODEL_ICONS, menuTabModel, e_Telemetry, ITEM_TELEMETRY_MAX, { TELEMETRY_TYPE_ROWS RSSI_ROWS SENSORS_ROWS VARIO_ROWS });
 
   for (int i=0; i<NUM_BODY_LINES; i++) {
     coord_t y = MENU_CONTENT_TOP + i*FH;
diff --git a/radio/src/gui/horus/menus.h b/radio/src/gui/horus/menus.h
index 92de43b30..cad46982d 100644
--- a/radio/src/gui/horus/menus.h
+++ b/radio/src/gui/horus/menus.h
@@ -60,11 +60,50 @@ extern evt_t menuEvent;
 void chainMenu(MenuHandlerFunc newMenu);
 /// goto given Menu, store current menu in menuStack
 void pushMenu(MenuHandlerFunc newMenu);
-/// return to last menu in menustack
+/// return to last menu in menuStack
 void popMenu();
 
+enum MenuIcons {
+  ICON_OPENTX,
+  ICON_RADIO,
+  ICON_RADIO_SETUP,
+  ICON_RADIO_SD_BROWSER,
+  ICON_RADIO_GLOBAL_FUNCTIONS,
+  ICON_RADIO_TRAINER,
+  ICON_RADIO_HARDWARE,
+  ICON_RADIO_CALIBRATION,
+  ICON_RADIO_VERSION,
+  ICON_MODEL,
+  ICON_MODEL_SETUP,
+  ICON_MODEL_HELI,
+  ICON_MODEL_FLIGHT_MODES,
+  ICON_MODEL_INPUTS,
+  ICON_MODEL_MIXER,
+  ICON_MODEL_OUTPUTS,
+  ICON_MODEL_CURVES,
+  ICON_MODEL_GVARS,
+  ICON_MODEL_LOGICAL_SWITCHES,
+  ICON_MODEL_SPECIAL_FUNCTIONS,
+  ICON_MODEL_LUA_SCRIPTS,
+  ICON_MODEL_TELEMETRY,
+  ICON_LIBRARY,
+  ICON_THEME,
+  ICON_THEME_SETUP,
+  ICON_THEME_VIEW1,
+  ICON_THEME_VIEW2,
+  ICON_THEME_VIEW3,
+  ICON_THEME_VIEW4,
+  ICON_THEME_VIEW5,
+  ICON_THEME_ADD_VIEW,
+  ICON_STATS,
+  ICON_STATS_THROTTLE_GRAPH,
+  ICON_STATS_TIMERS,
+  ICON_STATS_ANALOGS,
+  ICON_STATS_DEBUG,
+  MENUS_ICONS_COUNT
+};
+
 enum EnumTabModel {
-  // e_ModelSelect,
   e_ModelSetup,
   CASE_HELI(e_Heli)
   CASE_FLIGHT_MODES(e_FlightModesAll)
@@ -81,6 +120,44 @@ enum EnumTabModel {
   CASE_FRSKY(e_Telemetry)
 };
 
+const uint8_t RADIO_ICONS[] = {
+  ICON_RADIO,
+  ICON_RADIO_SETUP,
+  ICON_RADIO_SD_BROWSER,
+  ICON_RADIO_GLOBAL_FUNCTIONS,
+  ICON_RADIO_TRAINER,
+  ICON_RADIO_HARDWARE,
+  ICON_RADIO_VERSION
+};
+
+const uint8_t MODEL_ICONS[] = {
+  ICON_MODEL,
+  ICON_MODEL_SETUP,
+  CASE_HELI(ICON_MODEL_HELI)
+  CASE_FLIGHT_MODES(ICON_MODEL_FLIGHT_MODES)
+  ICON_MODEL_INPUTS,
+  ICON_MODEL_MIXER,
+  ICON_MODEL_OUTPUTS,
+  CASE_CURVES(ICON_MODEL_CURVES)
+  CASE_GVARS(ICON_MODEL_GVARS)
+  ICON_MODEL_LOGICAL_SWITCHES,
+  ICON_MODEL_SPECIAL_FUNCTIONS,
+#if defined(LUA_MODEL_SCRIPTS)
+  ICON_MODEL_LUA_SCRIPTS,
+#endif
+  ICON_MODEL_TELEMETRY
+};
+
+const uint8_t STATS_ICONS[] = {
+  ICON_STATS,
+  ICON_STATS_THROTTLE_GRAPH,
+  ICON_STATS_TIMERS,
+  ICON_STATS_ANALOGS,
+#if defined(DEBUG_TRACE_BUFFER)
+  ICON_STATS_DEBUG
+#endif
+};
+
 bool menuModelSetup(evt_t event);
 bool menuModelHeli(evt_t event);
 bool menuModelFlightModesAll(evt_t event);
@@ -287,12 +364,12 @@ bool check_submenu_simple(check_event_t event, uint8_t maxrow);
   MENU_TAB(__VA_ARGS__); \
   if (event == EVT_ENTRY || event == EVT_ENTRY_UP) TRACE("Menu %s displayed ...", title); \
   if (!check(event, menu, tab, tabCount, mstate_tab, DIM(mstate_tab)-1, lines_count)) return false; \
-  drawMenuTemplate(title, icons);
+  drawMenuTemplate(title, 0, icons, OPTION_MENU_TITLE_BAR);
 
 #define CUSTOM_MENU_WITH_OPTIONS(title, icons, tab, tabCount, menu, lines_count) \
     if (event == EVT_ENTRY || event == EVT_ENTRY_UP) TRACE("Menu %s displayed ...", title); \
     if (!check(event, menu, tab, tabCount, mstate_tab, DIM(mstate_tab)-1, lines_count)) return false; \
-    drawMenuTemplate(title, icons);
+    drawMenuTemplate(title, 0, icons, OPTION_MENU_TITLE_BAR);
 
 #define MENU(title, icons, tab, menu, lines_count, ...) \
   MENU_WITH_OPTIONS(title, icons, tab, DIM(tab), menu, lines_count, __VA_ARGS__)
@@ -300,7 +377,7 @@ bool check_submenu_simple(check_event_t event, uint8_t maxrow);
 #define SIMPLE_MENU_WITH_OPTIONS(title, icons, tab, tabCount, menu, lines_count) \
   if (event == EVT_ENTRY || event == EVT_ENTRY_UP) TRACE("Menu %s displayed ...", title); \
   if (!check_simple(event, menu, tab, tabCount, lines_count)) return false; \
-  drawMenuTemplate(title, icons);
+  drawMenuTemplate(title, 0, icons, OPTION_MENU_TITLE_BAR);
 
 #define SIMPLE_MENU(title, icons, tab, menu, lines_count) \
   SIMPLE_MENU_WITH_OPTIONS(title, icons, tab, DIM(tab), menu, lines_count)
@@ -308,24 +385,24 @@ bool check_submenu_simple(check_event_t event, uint8_t maxrow);
 #define SUBMENU(title, icon, lines_count, ...) \
   MENU_TAB(__VA_ARGS__); \
   if (!check(event, 0, NULL, 0, mstate_tab, DIM(mstate_tab)-1, lines_count)) return false; \
-  drawScreenTemplate(title, icon);
+  drawMenuTemplate(title, icon);
 
 #define SUBMENU_WITH_OPTIONS(title, icon, lines_count, options, ...) \
   MENU_TAB(__VA_ARGS__); \
   if (!check(event, 0, NULL, 0, mstate_tab, DIM(mstate_tab)-1, lines_count)) return false; \
-  drawScreenTemplate(title, icon, options);
+  drawMenuTemplate(title, icon, NULL, options);
 
 #define CUSTOM_SUBMENU_WITH_OPTIONS(title, icon, lines_count, options) \
   if (!check(event, 0, NULL, 0, mstate_tab, DIM(mstate_tab)-1, lines_count)) return false; \
-  drawScreenTemplate(title, icon, options);
+  drawMenuTemplate(title, icon, NULL, options);
 
 #define SIMPLE_SUBMENU(title, icon, lines_count) \
   if (!check_submenu_simple(event, lines_count)) return false; \
-  drawScreenTemplate(title, icon)
+  drawMenuTemplate(title, icon, NULL)
 
 #define SIMPLE_SUBMENU_WITH_OPTIONS(title, icon, lines_count, options) \
   if (!check_submenu_simple(event, lines_count)) return false; \
-  drawScreenTemplate(title, icon, options)
+  drawMenuTemplate(title, icon, NULL, options)
 
 typedef int select_menu_value_t;
 
@@ -451,6 +528,8 @@ void pushModelNotes();
 typedef int (*FnFuncP) (int x);
 void drawFunction(FnFuncP fn, int x, int y, int width);
 
+void onSourceLongEnterPress(const char *result);
+
 uint8_t switchToMix(uint8_t source);
 
 #endif // _MENUS_H_
diff --git a/radio/src/gui/horus/navigation.cpp b/radio/src/gui/horus/navigation.cpp
index f4183b50c..34ba5ab2d 100644
--- a/radio/src/gui/horus/navigation.cpp
+++ b/radio/src/gui/horus/navigation.cpp
@@ -323,7 +323,8 @@ int checkIncDec(evt_t event, int val, int i_min, int i_max, unsigned int i_flags
 }
 
 #define CURSOR_NOT_ALLOWED_IN_ROW(row) ((int8_t)MAXCOL(row) < 0)
-#define MAXCOL_RAW(row)                ((row) >= 0 && horTab ? pgm_read_byte(horTab+min<int>(row, (int)horTabMax)) : (const uint8_t)0)
+#define HORTAB(row)                    (int8_t(row) > (int8_t)horTabMax ? horTab[horTabMax] : horTab[row])
+#define MAXCOL_RAW(row)                (horTab ? HORTAB(row) : (const uint8_t)0)
 #define MAXCOL(row)                    (MAXCOL_RAW(row) >= HIDDEN_ROW ? MAXCOL_RAW(row) : (const uint8_t)(MAXCOL_RAW(row) & (~NAVIGATION_LINE_BY_LINE)))
 #define COLATTR(row)                   (MAXCOL_RAW(row) == (uint8_t)-1 ? (const uint8_t)0 : (const uint8_t)(MAXCOL_RAW(row) & NAVIGATION_LINE_BY_LINE))
 #define INC(val, min, max)             if (val<max) {val++;} else if (max>min) {val=min;}
@@ -542,7 +543,7 @@ bool check(check_event_t event, uint8_t curr, const MenuHandlerFunc * menuTab, u
     if (horTab) {
       linesCount = 0;
       for (int i=0; i<rowcount; i++) {
-        if (i>horTabMax || horTab[i] != HIDDEN_ROW) {
+        if (HORTAB(i) != HIDDEN_ROW) {
           linesCount++;
         }
       }
@@ -553,7 +554,7 @@ bool check(check_event_t event, uint8_t curr, const MenuHandlerFunc * menuTab, u
       while (1) {
         int firstLine = 0;
         for (int numLines=0; firstLine<rowcount && numLines<menuVerticalOffset; firstLine++) {
-          if (firstLine>=horTabMax || horTab[firstLine] != HIDDEN_ROW) {
+          if (HORTAB(firstLine) != HIDDEN_ROW) {
             numLines++;
           }
         }
@@ -563,17 +564,17 @@ bool check(check_event_t event, uint8_t curr, const MenuHandlerFunc * menuTab, u
         else {
           int lastLine = firstLine;
           for (int numLines=0; lastLine<rowcount && numLines<linesDisplayed; lastLine++) {
-            if (lastLine >= horTabMax || horTab[lastLine] != HIDDEN_ROW) {
+            if (HORTAB(lastLine) != HIDDEN_ROW) {
               numLines++;
             }
           }
-          if (menuVerticalPosition >= lastLine || horTab[firstLine] == ORPHAN_ROW) {
+          if (menuVerticalPosition >= lastLine || HORTAB(firstLine) == ORPHAN_ROW) {
             menuVerticalOffset++;
           }
           else {
             linesCount = menuVerticalOffset + linesDisplayed;
             for (int i=lastLine; i<rowcount; i++) {
-              if (i > horTabMax || horTab[i] != HIDDEN_ROW) {
+              if (HORTAB(i) != HIDDEN_ROW) {
                 linesCount++;
               }
             }
diff --git a/radio/src/gui/horus/popups.cpp b/radio/src/gui/horus/popups.cpp
index 1c97a7dff..5d8a9ad0f 100644
--- a/radio/src/gui/horus/popups.cpp
+++ b/radio/src/gui/horus/popups.cpp
@@ -151,8 +151,8 @@ const char * displayPopupMenu(evt_t event)
 
   int y = (LCD_H - (display_count*(FH+1))) / 2;
 
-  lcdDrawSolidFilledRect(MENU_X, y, MENU_W, display_count * (FH+1), TEXT_BGCOLOR);
-  lcdDrawSolidRect(MENU_X, y, MENU_W, display_count * (FH+1) + 1, 1, ALARM_COLOR);
+  lcdDrawSolidFilledRect(MENU_X, y, MENU_W, display_count * (FH+1) + 1, TEXT_BGCOLOR);
+  lcdDrawSolidRect(MENU_X, y, MENU_W, display_count * (FH+1) + 2, 1, ALARM_COLOR);
 
   for (uint8_t i=0; i<display_count; i++) {
     if (i == s_menu_item) {
diff --git a/radio/src/gui/horus/screens_setup.cpp b/radio/src/gui/horus/screens_setup.cpp
index b60991ae1..4bfb2e00e 100644
--- a/radio/src/gui/horus/screens_setup.cpp
+++ b/radio/src/gui/horus/screens_setup.cpp
@@ -20,14 +20,15 @@
 
 #include "opentx.h"
 
-const uint8_t * LBM_SCREENS_SETUP_ICONS[] = {
-  LBM_MAINVIEWS_ICON,
-  LBM_MAINVIEWS_TOPBAR_ICON,
-  LBM_MAINVIEWS_ICONS[0],
-  LBM_MAINVIEWS_ICONS[1],
-  LBM_MAINVIEWS_ICONS[2],
-  LBM_MAINVIEWS_ICONS[3],
-  LBM_MAINVIEWS_ICONS[4]
+uint8_t THEME_ICONS[] = {
+  ICON_THEME,
+  ICON_THEME_SETUP,
+  ICON_THEME_VIEW1,
+  ICON_THEME_VIEW2,
+  ICON_THEME_VIEW3,
+  ICON_THEME_VIEW4,
+  ICON_THEME_VIEW5,
+  ICON_THEME_ADD_VIEW,
 };
 
 Layout * currentScreen;
@@ -178,7 +179,7 @@ bool menuSettings(const char * title, const T * object, uint32_t i_flags, evt_t
     mstate_tab[i] = getZoneOptionColumns(&options[i]);
   }
 
-  CUSTOM_SUBMENU_WITH_OPTIONS(title, LBM_MAINVIEWS_ICON, linesCount, OPTION_MENU_TITLE_BAR);
+  CUSTOM_SUBMENU_WITH_OPTIONS(title, ICON_THEME, linesCount, OPTION_MENU_TITLE_BAR);
 
   for (int i=0; i<NUM_BODY_LINES+1; i++) {
     coord_t y = MENU_CONTENT_TOP + i * FH;
@@ -423,7 +424,7 @@ bool menuScreensTheme(evt_t event)
     mstate_tab[2+i] = getZoneOptionColumns(&options[i]);
   }
   mstate_tab[2+optionsCount] = 0; // The button for the Topbar setup
-  CUSTOM_MENU_WITH_OPTIONS("User interface", LBM_SCREENS_SETUP_ICONS, menuTabScreensSetup, menuPageCount, 0, linesCount);
+  CUSTOM_MENU_WITH_OPTIONS("User interface", THEME_ICONS, menuTabScreensSetup, menuPageCount, 0, linesCount);
 
   for (int i=0; i<NUM_BODY_LINES; i++) {
     coord_t y = MENU_CONTENT_TOP + i * FH;
@@ -438,6 +439,7 @@ bool menuScreensTheme(evt_t event)
           new_theme->init();
           loadTheme(new_theme);
           strncpy(g_eeGeneral.themeName, new_theme->getName(), sizeof(g_eeGeneral.themeName));
+          killEvents(KEY_ENTER);
           storageDirty(EE_GENERAL);
         }
         break;
@@ -505,7 +507,7 @@ bool menuScreenSetup(int index, evt_t event)
   }
   mstate_tab[3+optionsCount] = 0; // The remove button
 
-  CUSTOM_MENU_WITH_OPTIONS(title, LBM_SCREENS_SETUP_ICONS, menuTabScreensSetup, menuPageCount, index+1, linesCount);
+  CUSTOM_MENU_WITH_OPTIONS(title, THEME_ICONS, menuTabScreensSetup, menuPageCount, index+1, linesCount);
 
   for (int i=0; i<NUM_BODY_LINES; i++) {
     coord_t y = MENU_CONTENT_TOP + i * FH;
@@ -589,10 +591,10 @@ int updateMainviewsMenu()
 {
   for (int index=1; index<MAX_CUSTOM_SCREENS; index++) {
     if (customScreens[index]) {
-      LBM_SCREENS_SETUP_ICONS[2+index] = LBM_MAINVIEWS_ICONS[index];
+      THEME_ICONS[2+index] = ICON_THEME_VIEW1+index;
     }
     else {
-      LBM_SCREENS_SETUP_ICONS[2+index] = LBM_MAINVIEWS_ADD_ICON;
+      THEME_ICONS[2+index] = ICON_THEME_ADD_VIEW;
       return 2+index;
     }
   }
@@ -613,6 +615,6 @@ bool menuScreenAdd(evt_t event)
     return false;
   }
 
-  SIMPLE_MENU_WITH_OPTIONS("Add main view", LBM_SCREENS_SETUP_ICONS, menuTabScreensSetup, menuPageCount, menuPageCount-1, 0);
+  SIMPLE_MENU_WITH_OPTIONS("Add main view", THEME_ICONS, menuTabScreensSetup, menuPageCount, menuPageCount-1, 0);
   return true;
 }
diff --git a/radio/src/gui/horus/theme.cpp b/radio/src/gui/horus/theme.cpp
index 79b36e597..4a4affed7 100644
--- a/radio/src/gui/horus/theme.cpp
+++ b/radio/src/gui/horus/theme.cpp
@@ -76,11 +76,6 @@ void Theme::drawBackground() const
   lcdDrawSolidFilledRect(0, 0, LCD_W, LCD_H, TEXT_BGCOLOR);
 }
 
-void Theme::drawAboutBackground() const
-{
-  drawBackground();
-}
-
 void Theme::drawMessageBox(const char * title, const char * text, const char * action, uint32_t type) const
 {
   //if (flags & MESSAGEBOX_TYPE_ALERT) {
diff --git a/radio/src/gui/horus/theme.h b/radio/src/gui/horus/theme.h
index 8359fcc9f..e5c93420e 100644
--- a/radio/src/gui/horus/theme.h
+++ b/radio/src/gui/horus/theme.h
@@ -69,9 +69,9 @@ class Theme
 
     virtual void drawBackground() const;
 
-    virtual void drawAboutBackground() const;
+    virtual void drawTopbarBackground(uint8_t icon) const = 0;
 
-    virtual void drawTopbarBackground(const uint8_t * icon) const = 0;
+    virtual void drawMenuIcon(uint8_t index, uint8_t position, bool selected) const { }
 
     virtual void drawMessageBox(const char * title, const char * text, const char * action, uint32_t flags) const;
 
diff --git a/radio/src/gui/horus/themes/darkblue.cpp b/radio/src/gui/horus/themes/darkblue.cpp
index c47ff7bb6..d73d4740f 100644
--- a/radio/src/gui/horus/themes/darkblue.cpp
+++ b/radio/src/gui/horus/themes/darkblue.cpp
@@ -28,7 +28,7 @@ class DarkblueTheme: public Theme
     {
     }
 
-    virtual void load() const
+    void loadColors() const
     {
       lcdColorTable[TEXT_COLOR_INDEX] = WHITE;
       lcdColorTable[TEXT_BGCOLOR_INDEX] = RGB(10, 78, 121);
@@ -51,27 +51,96 @@ class DarkblueTheme: public Theme
       lcdColorTable[TRIM_SHADOW_COLOR_INDEX] = RGB(100, 100, 100);
       lcdColorTable[MAINVIEW_PANES_COLOR_INDEX] = GREY;
       lcdColorTable[MAINVIEW_GRAPHICS_COLOR_INDEX] = WHITE;
-      lcdColorTable[HEADER_BGCOLOR_INDEX] = RGB(32, 34, 42);
+      lcdColorTable[HEADER_BGCOLOR_INDEX] = BLACK;
       lcdColorTable[HEADER_ICON_BGCOLOR_INDEX] = BLACK;
       lcdColorTable[HEADER_CURRENT_BGCOLOR_INDEX] = RGB(10, 78, 121);
       lcdColorTable[OVERLAY_COLOR_INDEX] = BLACK;
     }
 
-    void drawTopbarBackground(const uint8_t * icon) const
+    void loadMenuIcon(uint8_t index, const char * filename) const
+    {
+      BitmapBuffer * mask = BitmapBuffer::loadMask(getThemePath(filename));
+      if (mask) {
+        menuIconNormal[index] = new BitmapBuffer(BMP_RGB565, mask->getWidth(), mask->getHeight());
+        menuIconNormal[index]->clear(HEADER_BGCOLOR);
+        menuIconNormal[index]->drawMask(0, 0, mask, HEADER_CURRENT_BGCOLOR);
+        menuIconSelected[index] = new BitmapBuffer(BMP_RGB565, mask->getWidth(), mask->getHeight());
+        menuIconSelected[index]->clear(HEADER_BGCOLOR);
+        menuIconSelected[index]->drawMask(0, 0, mask, MENU_TITLE_COLOR);
+      }
+    }
+
+    void loadMenusIcons() const
+    {
+      loadMenuIcon(ICON_OPENTX, "mask_opentx.png");
+      loadMenuIcon(ICON_RADIO, "mask_menu_radio.png");
+      loadMenuIcon(ICON_RADIO_SETUP, "mask_radio_setup.png");
+      loadMenuIcon(ICON_RADIO_SD_BROWSER, "mask_radio_sd_browser.png");
+      loadMenuIcon(ICON_RADIO_GLOBAL_FUNCTIONS, "mask_radio_global_functions.png");
+      loadMenuIcon(ICON_RADIO_TRAINER, "mask_radio_trainer.png");
+      loadMenuIcon(ICON_RADIO_HARDWARE, "mask_radio_hardware.png");
+      loadMenuIcon(ICON_RADIO_VERSION, "mask_radio_version.png");
+      loadMenuIcon(ICON_MODEL, "mask_menu_model.png");
+      loadMenuIcon(ICON_MODEL_SETUP, "mask_model_setup.png");
+      loadMenuIcon(ICON_MODEL_HELI, "mask_model_heli.png");
+      loadMenuIcon(ICON_MODEL_FLIGHT_MODES, "mask_model_flight_modes.png");
+      loadMenuIcon(ICON_MODEL_INPUTS, "mask_model_inputs.png");
+      loadMenuIcon(ICON_MODEL_MIXER, "mask_model_mixer.png");
+      loadMenuIcon(ICON_MODEL_OUTPUTS, "mask_model_outputs.png");
+      loadMenuIcon(ICON_MODEL_CURVES, "mask_model_curves.png");
+      loadMenuIcon(ICON_MODEL_GVARS, "mask_model_gvars.png");
+      loadMenuIcon(ICON_MODEL_LOGICAL_SWITCHES, "mask_model_logical_switches.png");
+      loadMenuIcon(ICON_MODEL_SPECIAL_FUNCTIONS, "mask_model_special_functions.png");
+      loadMenuIcon(ICON_MODEL_LUA_SCRIPTS, "mask_model_lua_scripts.png");
+      loadMenuIcon(ICON_MODEL_TELEMETRY, "mask_model_telemetry.png");
+      loadMenuIcon(ICON_STATS, "mask_menu_stats.png");
+      loadMenuIcon(ICON_STATS_THROTTLE_GRAPH, "mask_stats_throttle_graph.png");
+      loadMenuIcon(ICON_STATS_TIMERS, "mask_stats_timers.png");
+      loadMenuIcon(ICON_STATS_ANALOGS, "mask_stats_analogs.png");
+      loadMenuIcon(ICON_STATS_DEBUG, "mask_stats_debug.png");
+      loadMenuIcon(ICON_THEME, "mask_menu_theme.png");
+      loadMenuIcon(ICON_THEME_SETUP, "mask_theme_setup.png");
+      loadMenuIcon(ICON_THEME_VIEW1, "mask_theme_view1.png");
+      loadMenuIcon(ICON_THEME_VIEW2, "mask_theme_view2.png");
+      loadMenuIcon(ICON_THEME_VIEW3, "mask_theme_view3.png");
+      loadMenuIcon(ICON_THEME_VIEW4, "mask_theme_view4.png");
+      loadMenuIcon(ICON_THEME_VIEW5, "mask_theme_view5.png");
+      loadMenuIcon(ICON_THEME_ADD_VIEW, "mask_theme_add_view.png");
+    }
+
+    virtual void load() const
+    {
+      loadColors();
+      loadMenusIcons();
+    }
+
+    void drawTopbarBackground(uint8_t icon) const
     {
       lcdDrawSolidFilledRect(0, 0, LCD_W, MENU_HEADER_HEIGHT, HEADER_BGCOLOR);
       lcdDrawSolidFilledRect(0, 0, 41, MENU_HEADER_HEIGHT, HEADER_ICON_BGCOLOR);
 
-      if (icon) {
-        lcdDrawBitmapPattern(5, 7, icon, MENU_TITLE_COLOR);
-      }
-      else {
+      if (icon == ICON_OPENTX) {
         static BitmapBuffer * thumb = BitmapBuffer::load(getFilePath("topmenu_opentx.bmp"));
         lcd->drawBitmap(5, 7, thumb);
       }
+      else {
+        lcd->drawBitmap(5, 7, menuIconSelected[icon]);
+      }
 
       drawTopbarDatetime();
     }
+
+    virtual void drawMenuIcon(uint8_t index, uint8_t position, bool selected) const
+    {
+      lcd->drawBitmap(50+position*MENU_ICONS_SPACING, 7, selected ? menuIconSelected[index] : menuIconNormal[index]);
+    }
+
+  protected:
+    static BitmapBuffer * menuIconNormal[MENUS_ICONS_COUNT];
+    static BitmapBuffer * menuIconSelected[MENUS_ICONS_COUNT];
 };
 
+BitmapBuffer * DarkblueTheme::menuIconNormal[MENUS_ICONS_COUNT] = { NULL };
+BitmapBuffer * DarkblueTheme::menuIconSelected[MENUS_ICONS_COUNT] = { NULL };
+
 const DarkblueTheme darkblueTheme;
diff --git a/radio/src/gui/horus/themes/default.cpp b/radio/src/gui/horus/themes/default.cpp
index ddba7a309..b97679d03 100644
--- a/radio/src/gui/horus/themes/default.cpp
+++ b/radio/src/gui/horus/themes/default.cpp
@@ -20,10 +20,6 @@
 
 #include "opentx.h"
 
-const uint8_t LBM_TOPMENU_MASK_OPENTX[] = {
-#include "mask_topmenu_opentx.lbm"
-};
-
 const ZoneOption OPTIONS_THEME_DEFAULT[] = {
   { "Background color", ZoneOption::Color, OPTION_DEFAULT_VALUE_UNSIGNED(WHITE) },
   { "Main color", ZoneOption::Color, OPTION_DEFAULT_VALUE_UNSIGNED(RED) },
@@ -68,12 +64,79 @@ class DefaultTheme: public Theme
       lcdColorTable[OVERLAY_COLOR_INDEX] = BLACK;
     }
 
+    void loadMenuIcon(uint8_t index, const char * filename) const
+    {
+      BitmapBuffer * mask = BitmapBuffer::loadMask(getThemePath(filename));
+      if (mask) {
+        menuIconNormal[index] = new BitmapBuffer(BMP_RGB565, mask->getWidth(), mask->getHeight());
+        menuIconNormal[index]->clear(HEADER_BGCOLOR);
+        menuIconNormal[index]->drawMask(0, 0, mask, MENU_TITLE_COLOR);
+        menuIconSelected[index] = new BitmapBuffer(BMP_RGB565, mask->getWidth(), mask->getHeight());
+        menuIconSelected[index]->clear(HEADER_CURRENT_BGCOLOR);
+        menuIconSelected[index]->drawMask(0, 0, mask, MENU_TITLE_COLOR);
+      }
+    }
+
+    void loadMenusIcons() const
+    {
+      loadMenuIcon(ICON_OPENTX, "mask_opentx.png");
+      loadMenuIcon(ICON_RADIO, "mask_menu_radio.png");
+      loadMenuIcon(ICON_RADIO_SETUP, "mask_radio_setup.png");
+      loadMenuIcon(ICON_RADIO_SD_BROWSER, "mask_radio_sd_browser.png");
+      loadMenuIcon(ICON_RADIO_GLOBAL_FUNCTIONS, "mask_radio_global_functions.png");
+      loadMenuIcon(ICON_RADIO_TRAINER, "mask_radio_trainer.png");
+      loadMenuIcon(ICON_RADIO_HARDWARE, "mask_radio_hardware.png");
+      loadMenuIcon(ICON_RADIO_VERSION, "mask_radio_version.png");
+      loadMenuIcon(ICON_MODEL, "mask_menu_model.png");
+      loadMenuIcon(ICON_MODEL_SETUP, "mask_model_setup.png");
+      loadMenuIcon(ICON_MODEL_HELI, "mask_model_heli.png");
+      loadMenuIcon(ICON_MODEL_FLIGHT_MODES, "mask_model_flight_modes.png");
+      loadMenuIcon(ICON_MODEL_INPUTS, "mask_model_inputs.png");
+      loadMenuIcon(ICON_MODEL_MIXER, "mask_model_mixer.png");
+      loadMenuIcon(ICON_MODEL_OUTPUTS, "mask_model_outputs.png");
+      loadMenuIcon(ICON_MODEL_CURVES, "mask_model_curves.png");
+      loadMenuIcon(ICON_MODEL_GVARS, "mask_model_gvars.png");
+      loadMenuIcon(ICON_MODEL_LOGICAL_SWITCHES, "mask_model_logical_switches.png");
+      loadMenuIcon(ICON_MODEL_SPECIAL_FUNCTIONS, "mask_model_special_functions.png");
+      loadMenuIcon(ICON_MODEL_LUA_SCRIPTS, "mask_model_lua_scripts.png");
+      loadMenuIcon(ICON_MODEL_TELEMETRY, "mask_model_telemetry.png");
+      loadMenuIcon(ICON_STATS, "mask_menu_stats.png");
+      loadMenuIcon(ICON_STATS_THROTTLE_GRAPH, "mask_stats_throttle_graph.png");
+      loadMenuIcon(ICON_STATS_TIMERS, "mask_stats_timers.png");
+      loadMenuIcon(ICON_STATS_ANALOGS, "mask_stats_analogs.png");
+      loadMenuIcon(ICON_STATS_DEBUG, "mask_stats_debug.png");
+      loadMenuIcon(ICON_THEME, "mask_menu_theme.png");
+      loadMenuIcon(ICON_THEME_SETUP, "mask_theme_setup.png");
+      loadMenuIcon(ICON_THEME_VIEW1, "mask_theme_view1.png");
+      loadMenuIcon(ICON_THEME_VIEW2, "mask_theme_view2.png");
+      loadMenuIcon(ICON_THEME_VIEW3, "mask_theme_view3.png");
+      loadMenuIcon(ICON_THEME_VIEW4, "mask_theme_view4.png");
+      loadMenuIcon(ICON_THEME_VIEW5, "mask_theme_view5.png");
+      loadMenuIcon(ICON_THEME_ADD_VIEW, "mask_theme_add_view.png");
+
+      BitmapBuffer * background = BitmapBuffer::loadMask(getThemePath("mask_currentmenu_bg.png"));
+      BitmapBuffer * shadow = BitmapBuffer::loadMask(getThemePath("mask_currentmenu_shadow.png"));
+      BitmapBuffer * dot = BitmapBuffer::loadMask(getThemePath("mask_currentmenu_dot.png"));
+
+      if (!currentMenuBackground) currentMenuBackground = new BitmapBuffer(BMP_RGB565, 36, 53);
+      currentMenuBackground->drawSolidFilledRect(0, 0, currentMenuBackground->getWidth(), MENU_HEADER_HEIGHT, HEADER_BGCOLOR);
+      currentMenuBackground->drawSolidFilledRect(0, MENU_HEADER_HEIGHT, currentMenuBackground->getWidth(), MENU_TITLE_TOP - MENU_HEADER_HEIGHT, TEXT_BGCOLOR);
+      currentMenuBackground->drawSolidFilledRect(0, MENU_TITLE_TOP, currentMenuBackground->getWidth(), currentMenuBackground->getHeight() - MENU_TITLE_TOP, TITLE_BGCOLOR);
+      currentMenuBackground->drawMask(0, 0, background, HEADER_CURRENT_BGCOLOR);
+      currentMenuBackground->drawMask(0, 0, shadow, TRIM_SHADOW_COLOR);
+      currentMenuBackground->drawMask(10, 39, dot, MENU_TITLE_COLOR);
+
+      delete background;
+      delete shadow;
+      delete dot;
+    }
+
     virtual void load() const
     {
       loadColors();
+      loadMenusIcons();
       Theme::load();
       if (!backgroundBitmap) backgroundBitmap = BitmapBuffer::load(getThemePath("mainbg.bmp"));
-      if (!aboutBackgroundBitmap) aboutBackgroundBitmap = BitmapBuffer::load(getThemePath("aboutbg.bmp"));
       update();
     }
 
@@ -103,33 +166,41 @@ class DefaultTheme: public Theme
       }
     }
 
-    virtual void drawAboutBackground() const
-    {
-      lcd->drawBitmap(0, 0, aboutBackgroundBitmap);
-    }
-
-    virtual void drawTopbarBackground(const uint8_t * icon) const
+    virtual void drawTopbarBackground(uint8_t icon) const
     {
       lcdDrawSolidFilledRect(0, 0, LCD_W, MENU_HEADER_HEIGHT, HEADER_BGCOLOR);
       lcdDrawBitmapPattern(0, 0, LBM_TOPMENU_POLYGON, TITLE_BGCOLOR);
 
-      if (icon) {
-        lcdDrawBitmapPattern(5, 7, icon, MENU_TITLE_COLOR);
-      }
-      else {
-        lcdDrawBitmapPattern(4, 10, LBM_TOPMENU_MASK_OPENTX, MENU_TITLE_COLOR);
-      }
+      if (icon == ICON_OPENTX)
+        lcd->drawBitmap(4, 10, menuIconSelected[ICON_OPENTX]);
+      else
+        lcd->drawBitmap(5, 7, menuIconSelected[icon]);
 
       drawTopbarDatetime();
     }
 
+    virtual void drawMenuIcon(uint8_t index, uint8_t position, bool selected) const
+    {
+      if (selected) {
+        lcd->drawBitmap(58+position*MENU_ICONS_SPACING-10, 0, currentMenuBackground);
+        lcd->drawBitmap(50+position*MENU_ICONS_SPACING, 7, menuIconSelected[index], MENU_TITLE_COLOR);
+      }
+      else {
+        lcd->drawBitmap(50+position*MENU_ICONS_SPACING, 7, menuIconNormal[index], MENU_TITLE_COLOR);
+      }
+    }
+
   protected:
     static const BitmapBuffer * backgroundBitmap;
-    static const BitmapBuffer * aboutBackgroundBitmap;
+    static BitmapBuffer * menuIconNormal[MENUS_ICONS_COUNT];
+    static BitmapBuffer * menuIconSelected[MENUS_ICONS_COUNT];
+    static BitmapBuffer * currentMenuBackground;
 };
 
 const BitmapBuffer * DefaultTheme::backgroundBitmap = NULL;
-const BitmapBuffer * DefaultTheme::aboutBackgroundBitmap = NULL;
+BitmapBuffer * DefaultTheme::menuIconNormal[MENUS_ICONS_COUNT] = { NULL };
+BitmapBuffer * DefaultTheme::menuIconSelected[MENUS_ICONS_COUNT] = { NULL };
+BitmapBuffer * DefaultTheme::currentMenuBackground = NULL;
 
 DefaultTheme defaultTheme;
 Theme * theme = &defaultTheme;
diff --git a/radio/src/gui/horus/topbar.cpp b/radio/src/gui/horus/topbar.cpp
index 3d9139817..0ca46730f 100644
--- a/radio/src/gui/horus/topbar.cpp
+++ b/radio/src/gui/horus/topbar.cpp
@@ -53,7 +53,7 @@ void drawTopbarDatetime()
 
 void drawTopBar()
 {
-  theme->drawTopbarBackground(NULL);
+  theme->drawTopbarBackground(0);
 
   // USB icon
   if (usbPlugged()) {
diff --git a/radio/src/gui/horus/view_about.cpp b/radio/src/gui/horus/view_about.cpp
index 620ae172f..66af00898 100644
--- a/radio/src/gui/horus/view_about.cpp
+++ b/radio/src/gui/horus/view_about.cpp
@@ -62,8 +62,8 @@ bool menuAboutView(evt_t event)
       break;
   }
 
-  theme->drawAboutBackground();
-  theme->drawTopbarBackground(NULL);
+  theme->drawBackground();
+  theme->drawTopbarBackground(0);
 
   uint8_t screenDuration = 150;
 
diff --git a/radio/src/gui/horus/view_statistics.cpp b/radio/src/gui/horus/view_statistics.cpp
index 73db48324..636fa3c8c 100644
--- a/radio/src/gui/horus/view_statistics.cpp
+++ b/radio/src/gui/horus/view_statistics.cpp
@@ -39,7 +39,7 @@ bool menuStatsGraph(evt_t event)
       break;
   }
   
-  MENU("Statistics", LBM_STATS_ICONS, menuTabStats, e_StatsGraph, 0, { 0 });
+  MENU("Statistics", STATS_ICONS, menuTabStats, e_StatsGraph, 0, { 0 });
 
   lcdDrawText(MENUS_MARGIN_LEFT, MENU_CONTENT_TOP, "Session");
   putsTimer(MENU_STATS_COLUMN1, MENU_CONTENT_TOP, sessionTimer, TIMEHOUR);
@@ -111,7 +111,7 @@ bool menuStatsDebug(evt_t event)
       break;
   }
 
-  MENU("Debug", LBM_STATS_ICONS, menuTabStats, e_StatsDebug, 0, { 0 });
+  MENU("Debug", STATS_ICONS, menuTabStats, e_StatsDebug, 0, { 0 });
 
   lcdDrawText(MENUS_MARGIN_LEFT, MENU_CONTENT_TOP, "Free Mem");
   lcdDrawNumber(MENU_STATS_COLUMN1, MENU_CONTENT_TOP, availableMemory(), LEFT, 0, NULL, "b");
@@ -142,7 +142,7 @@ bool menuStatsDebug(evt_t event)
 
 bool menuStatsAnalogs(evt_t event)
 {
-  MENU("Analogs", LBM_STATS_ICONS, menuTabStats, e_StatsAnalogs, 0, { 0 });
+  MENU("Analogs", STATS_ICONS, menuTabStats, e_StatsAnalogs, 0, { 0 });
 
   for (int i=0; i<NUM_STICKS+NUM_POTS; i++) {
     coord_t y = MENU_CONTENT_TOP + (i/2)*FH;
@@ -178,7 +178,7 @@ bool menuStatsTraces(evt_t event)
       break;
   }
 
-  SIMPLE_MENU("", LBM_STATS_ICONS, menuTabStats, e_StatsTraces, TRACE_BUFFER_LEN);
+  SIMPLE_MENU("", STATS_ICONS, menuTabStats, e_StatsTraces, TRACE_BUFFER_LEN);
 
   uint8_t k = 0;
   int8_t sub = menuVerticalPosition;
diff --git a/radio/src/gui/horus/view_text.cpp b/radio/src/gui/horus/view_text.cpp
index 35cc8c36c..679e19295 100644
--- a/radio/src/gui/horus/view_text.cpp
+++ b/radio/src/gui/horus/view_text.cpp
@@ -18,7 +18,7 @@
  * GNU General Public License for more details.
  */
 
-#include "../../opentx.h"
+#include "opentx.h"
 
 #define TEXT_FILE_MAXSIZE     2048
 
@@ -91,7 +91,7 @@ bool menuTextView(evt_t event)
 {
   static int lines_count;
 
-  drawScreenTemplate("TEXT VIEWER", NULL);
+  drawMenuTemplate("TEXT VIEWER", ICON_OPENTX);
 
   switch (event) {
     case EVT_ENTRY:
diff --git a/radio/src/gui/horus/widgets.cpp b/radio/src/gui/horus/widgets.cpp
index 255f2c183..e2559e680 100644
--- a/radio/src/gui/horus/widgets.cpp
+++ b/radio/src/gui/horus/widgets.cpp
@@ -129,11 +129,11 @@ void drawShadow(coord_t x, coord_t y, coord_t w, coord_t h)
 
 uint8_t linesDisplayed;
 
-void drawScreenTemplate(const char * title, const uint8_t * icon, uint32_t options)
+void drawMenuTemplate(const char * title, uint8_t icon, const uint8_t * icons, uint32_t options)
 {
   coord_t bodyTop, bodyBottom;
 
-  theme->drawTopbarBackground(icon);
+  theme->drawTopbarBackground(icons ? icons[0] : icon);
 
   // Menu title bar
   if (options & OPTION_MENU_TITLE_BAR) {
@@ -144,6 +144,14 @@ void drawScreenTemplate(const char * title, const uint8_t * icon, uint32_t optio
     if (title) {
       lcdDrawText(MENUS_MARGIN_LEFT, MENU_TITLE_TOP+2, title, MENU_TITLE_COLOR);
     }
+    if (icons) {
+      for (int i=0; i<menuPageCount; i++) {
+        if (menuPageIndex != i) {
+          theme->drawMenuIcon(icons[i+1], i, false);
+        }
+      }
+      theme->drawMenuIcon(icons[menuPageIndex+1], menuPageIndex, true);
+    }
   }
   else {
     linesDisplayed = NUM_BODY_LINES + 1;
@@ -171,19 +179,6 @@ void drawScreenTemplate(const char * title, const uint8_t * icon, uint32_t optio
   }
 }
 
-void drawMenuTemplate(const char * title, const uint8_t * const * icons, uint32_t options)
-{
-  drawScreenTemplate(title, icons[0], OPTION_MENU_TITLE_BAR);
-
-  lcdDrawBitmapPattern(58+menuPageIndex*MENU_ICONS_SPACING-10, 0, LBM_CURRENT_BG, HEADER_CURRENT_BGCOLOR);
-  lcdDrawBitmapPattern(58+menuPageIndex*MENU_ICONS_SPACING-10, 0, LBM_CURRENT_SHADOW, TRIM_SHADOW_COLOR);
-  lcdDrawBitmapPattern(58+menuPageIndex*MENU_ICONS_SPACING, MENU_TITLE_TOP-9, LBM_CURRENT_DOT, MENU_TITLE_COLOR);
-
-  for (int i=0; i<menuPageCount; i++) {
-    lcdDrawBitmapPattern(50+i*MENU_ICONS_SPACING, 7, icons[i+1], MENU_TITLE_COLOR);
-  }
-}
-
 select_menu_value_t selectMenuItem(coord_t x, coord_t y, const pm_char * values, select_menu_value_t value, select_menu_value_t min, select_menu_value_t max, LcdFlags attr, evt_t event)
 {
   if (attr) value = checkIncDec(event, value, min, max, (menuVerticalPositions[0] == 0) ? EE_MODEL : EE_GENERAL);
diff --git a/radio/src/gui/horus/widgets.h b/radio/src/gui/horus/widgets.h
index 92cb8b65f..1c49e533b 100644
--- a/radio/src/gui/horus/widgets.h
+++ b/radio/src/gui/horus/widgets.h
@@ -71,8 +71,7 @@ int16_t editGVarFieldValue(coord_t x, coord_t y, int16_t value, int16_t min, int
 #endif
 
 // Screen templates
-void drawScreenTemplate(const char * title, const uint8_t * icon, uint32_t options=0);
-void drawMenuTemplate(const char * title, const uint8_t * const * icons, uint32_t options=0);
+void drawMenuTemplate(const char * title, uint8_t icon, const uint8_t * icons=NULL, uint32_t options=0);
 void drawSplash();
 void drawSleepBitmap();
 void drawShutdownBitmap(uint32_t index);
diff --git a/radio/src/gui/horus/widgets/modelbmp.cpp b/radio/src/gui/horus/widgets/modelbmp.cpp
index e036bca54..ccff38c7f 100644
--- a/radio/src/gui/horus/widgets/modelbmp.cpp
+++ b/radio/src/gui/horus/widgets/modelbmp.cpp
@@ -35,20 +35,19 @@ class ModelBitmapWidget: public Widget
       delete buffer;
     }
 
-#define DRAW_SCALED_BITMAP_FIT_WIDTH   1
-#define DRAW_SCALED_BITMAP_FIT_HEIGHT  2
-
     void refreshBuffer()
     {
       delete buffer;
       buffer = new BitmapBuffer(BMP_RGB565, zone.w, zone.h);
+
       if (buffer) {
         buffer->drawBitmap(0, 0, lcd, zone.x, zone.y, zone.w, zone.h);
         GET_FILENAME(filename, BITMAPS_PATH, g_model.header.bitmap, BITMAPS_EXT);
         BitmapBuffer * bitmap = BitmapBuffer::load(filename);
         if (zone.h >= 96 && zone.w >= 120) {
           buffer->drawFilledRect(0, 0, zone.w, zone.h, SOLID, MAINVIEW_PANES_COLOR | OPACITY(5));
-          buffer->drawBitmapPattern(6, 4, LBM_MODEL_ICON, MAINVIEW_GRAPHICS_COLOR);
+          static BitmapBuffer * icon = BitmapBuffer::loadMask(getThemePath("mask_menu_model.png"));
+          buffer->drawMask(6, 4, icon, MAINVIEW_GRAPHICS_COLOR);
           buffer->drawSizedText(45, 10, g_model.header.name, LEN_MODEL_NAME, ZCHAR | SMLSIZE);
           buffer->drawSolidFilledRect(39, 27, zone.w - 48, 2, MAINVIEW_GRAPHICS_COLOR);
           if (bitmap) {
diff --git a/radio/src/lua/interface.cpp b/radio/src/lua/interface.cpp
index a75cc28b0..4ef3485a7 100644
--- a/radio/src/lua/interface.cpp
+++ b/radio/src/lua/interface.cpp
@@ -838,7 +838,7 @@ class LuaTheme: public Theme
       exec(drawBackgroundFunction);
     }
 
-    virtual void drawTopbarBackground(const uint8_t * icon) const
+    virtual void drawTopbarBackground(uint8_t icon) const
     {
       exec(drawTopbarBackgroundFunction);
     }
diff --git a/radio/src/main_arm.cpp b/radio/src/main_arm.cpp
index 6b5103aee..60faa5329 100644
--- a/radio/src/main_arm.cpp
+++ b/radio/src/main_arm.cpp
@@ -178,22 +178,27 @@ void guiMain(evt_t evt)
   }
 
   // run Lua scripts that don't use LCD (to use CPU time while LCD DMA is running)
+  DEBUG_TIMER_START(debugTimerLuaBg);
   luaTask(0, RUN_MIX_SCRIPT | RUN_FUNC_SCRIPT | RUN_TELEM_BG_SCRIPT, false);
-
+  DEBUG_TIMER_STOP(debugTimerLuaBg);
   // wait for LCD DMA to finish before continuing, because code from this point
   // is allowed to change the contents of LCD buffer
   //
   // WARNING: make sure no code above this line does any change to the LCD display buffer!
   //
+  DEBUG_TIMER_START(debugTimerLcdRefreshWait);
   lcdRefreshWait();
+  DEBUG_TIMER_STOP(debugTimerLcdRefreshWait);
 
   // draw LCD from menus or from Lua script
   // run Lua scripts that use LCD
 
+  DEBUG_TIMER_START(debugTimerLuaFg);
   refreshNeeded = luaTask(evt, RUN_STNDAL_SCRIPT, true);
   if (!refreshNeeded) {
     refreshNeeded = luaTask(evt, RUN_TELEM_FG_SCRIPT, true);
   }
+  DEBUG_TIMER_STOP(debugTimerLuaFg);
 
   t0 = get_tmr10ms() - t0;
   if (t0 > maxLuaDuration) {
@@ -204,6 +209,7 @@ void guiMain(evt_t evt)
 #endif
 
   if (!refreshNeeded) {
+    DEBUG_TIMER_START(debugTimerMenus);
     while (1) {
       // normal GUI from menus
       const char * warn = warningText;
@@ -241,11 +247,13 @@ void guiMain(evt_t evt)
           }
           popupDisplayed = false;
         }
+        DEBUG_TIMER_START(debugTimerMenuHandlers);
         refreshNeeded = menuHandlers[menuLevel](evt);
+        DEBUG_TIMER_STOP(debugTimerMenuHandlers);
       }
 
       if (menuEvent == EVT_ENTRY) {
-        menuVerticalPosition = -1;
+        menuVerticalPosition = 0;
         menuHorizontalPosition = 0;
         evt = menuEvent;
         menuEvent = 0;
@@ -260,10 +268,13 @@ void guiMain(evt_t evt)
         break;
       }
     }
+    DEBUG_TIMER_STOP(debugTimerMenus);
   }
 
   if (refreshNeeded) {
+    DEBUG_TIMER_START(debugTimerLcdRefresh);
     lcdRefresh();
+    DEBUG_TIMER_STOP(debugTimerLcdRefresh);
   }
 }
 #elif defined(GUI)
@@ -384,6 +395,7 @@ void guiMain(evt_t evt)
 
 void perMain()
 {
+  DEBUG_TIMER_START(debugTimerPerMain1);
 #if defined(PCBSKY9X) && !defined(REVA)
   calcConsumption();
 #endif
@@ -394,6 +406,7 @@ void perMain()
   handleUsbConnection();
   checkTrainerSettings();
   periodicTick();
+  DEBUG_TIMER_STOP(debugTimerPerMain1);
 
   evt_t evt = getEvent(false);
   if (evt && (g_eeGeneral.backlightMode & e_backlight_mode_keys)) backlightOn(); // on keypress turn the light on
@@ -423,7 +436,9 @@ void perMain()
 #endif
 
 #if defined(GUI)
+  DEBUG_TIMER_START(debugTimerGuiMain);
   guiMain(evt);
+  DEBUG_TIMER_STOP(debugTimerGuiMain);
 #endif
 
 #if defined(PCBTARANIS)
diff --git a/radio/src/myeeprom.h b/radio/src/myeeprom.h
index 21dbfee01..ec9890263 100644
--- a/radio/src/myeeprom.h
+++ b/radio/src/myeeprom.h
@@ -86,8 +86,8 @@
   #define IS_HAPTIC_FUNC(func)         (0)
 #endif
 
-#define HAS_ENABLE_PARAM(func)         ((func) < FUNC_FIRST_WITHOUT_ENABLE && !IS_ADJUST_GV_FUNC(func))
-#define HAS_REPEAT_PARAM(func)         (IS_PLAY_FUNC(func) || IS_HAPTIC_FUNC(func) || IS_ADJUST_GV_FUNC(func))
+#define HAS_ENABLE_PARAM(func)         ((func) < FUNC_FIRST_WITHOUT_ENABLE)
+#define HAS_REPEAT_PARAM(func)         (IS_PLAY_FUNC(func) || IS_HAPTIC_FUNC(func))
 
 #if defined(CPUARM)
 #define CFN_EMPTY(p)                   (!(p)->swtch)
diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp
index a04cc7ac5..aaafe8856 100644
--- a/radio/src/opentx.cpp
+++ b/radio/src/opentx.cpp
@@ -258,6 +258,7 @@ void generalDefault()
 #elif defined(PCBHORUS)
   g_eeGeneral.potsConfig = 0x05;    // S1 and S2 = pots with detent
   g_eeGeneral.slidersConfig = 0x03; // LS and RS = sliders with detent
+  g_eeGeneral.blOffBright = 20;
 #elif defined(PCBTARANIS)
   g_eeGeneral.potsConfig = 0x05;    // S1 and S2 = pots with detent
   g_eeGeneral.slidersConfig = 0x03; // LS and RS = sliders with detent
@@ -1588,6 +1589,7 @@ void getADC()
   }
 #endif
 
+  DEBUG_TIMER_START(debugTimerAdcRead);
   for (uint8_t i=0; i<4; i++) {
     adcRead();
     for (uint8_t x=0; x<NUMBER_ANALOG; x++) {
@@ -1600,6 +1602,7 @@ void getADC()
       temp[x] += val;
     }
   }
+  DEBUG_TIMER_STOP(debugTimerAdcRead);
 
   for (uint32_t x=0; x<NUMBER_ANALOG; x++) {
     uint16_t v = temp[x] >> (3 - ANALOG_SCALE);
@@ -1773,13 +1776,17 @@ void doMixerCalculations()
   // therefore forget the exact calculation and use only 1 instead; good compromise
   lastTMR = tmr10ms;
 
+  DEBUG_TIMER_START(debugTimerGetAdc);
   getADC();
+  DEBUG_TIMER_STOP(debugTimerGetAdc);
 
 #if defined(PCBTARANIS)
   processSbusInput();
 #endif
 
+  DEBUG_TIMER_START(debugTimerGetSwitches);
   getSwitchesPosition(!s_mixer_first_run_done);
+  DEBUG_TIMER_STOP(debugTimerGetSwitches);
 
 #if defined(PCBSKY9X) && !defined(REVA) && !defined(SIMU)
   Current_analogue = (Current_analogue*31 + s_anaFilt[8] ) >> 5 ;
@@ -1791,13 +1798,16 @@ void doMixerCalculations()
   adcPrepareBandgap();
 #endif
 
+  DEBUG_TIMER_START(debugTimerEvalMixes);
   evalMixes(tick10ms);
+  DEBUG_TIMER_STOP(debugTimerEvalMixes);
 
 #if !defined(CPUARM)
   // Bandgap has had plenty of time to settle...
   getADC_bandgap();
 #endif
 
+  DEBUG_TIMER_START(debugTimerMixes10ms);
   if (tick10ms) {
 
 #if !defined(CPUM64) && !defined(ACCURAT_THROTTLE_TIMER)
@@ -1942,6 +1952,7 @@ void doMixerCalculations()
     checkTrims();
 #endif
   }
+  DEBUG_TIMER_STOP(debugTimerMixes10ms);
 
   s_mixer_first_run_done = true;
 }
@@ -2609,6 +2620,7 @@ void opentxInit(OPENTX_INIT_ARGS)
 
 #if defined(COLORLCD)
   loadTheme();
+  loadFontCache();
 #endif
 
   if (g_eeGeneral.backlightMode != e_backlight_mode_off) backlightOn(); // on Tx start turn the light on
diff --git a/radio/src/opentx.h b/radio/src/opentx.h
index 3eac26a38..4c304180f 100644
--- a/radio/src/opentx.h
+++ b/radio/src/opentx.h
@@ -721,6 +721,7 @@ extern uint8_t flightModeTransitionLast;
 void evalFlightModeMixes(uint8_t mode, uint8_t tick10ms);
 void evalMixes(uint8_t tick10ms);
 void doMixerCalculations();
+void scheduleNextMixerCalculation(uint8_t module, uint16_t delay);
 
 #if defined(CPUARM)
   void checkTrims();
diff --git a/radio/src/pulses/crossfire.cpp b/radio/src/pulses/crossfire.cpp
index 3acce4a3c..a10763cf9 100644
--- a/radio/src/pulses/crossfire.cpp
+++ b/radio/src/pulses/crossfire.cpp
@@ -18,9 +18,8 @@
  * GNU General Public License for more details.
  */
 
-#include "../opentx.h"
+#include "opentx.h"
 
-#define CROSSFIRE_START_BYTE        0x0F
 #define CROSSFIRE_CH_CENTER         0x3E0
 #define CROSSFIRE_CH_BITS           11
 
@@ -28,7 +27,9 @@
 void createCrossfireFrame(uint8_t * frame, int16_t * pulses)
 {
   uint8_t * buf = frame;
-  *buf++ = CROSSFIRE_START_BYTE;
+  *buf++ = BROADCAST_ADDRESS;
+  *buf++ = 24; // 1(ID) + 22 + 1(CRC)
+  *buf++ = CHANNELS_ID;
 
   uint32_t bits = 0;
   uint8_t bitsavailable = 0;
@@ -41,6 +42,5 @@ void createCrossfireFrame(uint8_t * frame, int16_t * pulses)
       bitsavailable -= 8;
     }
   }
-  *buf++ = 0;
-  *buf++ = crc16(frame, 24);
+  *buf = crc8(&frame[2], 24);
 }
diff --git a/radio/src/pulses/pulses_arm.cpp b/radio/src/pulses/pulses_arm.cpp
index 0354e180d..7bfd01775 100644
--- a/radio/src/pulses/pulses_arm.cpp
+++ b/radio/src/pulses/pulses_arm.cpp
@@ -179,12 +179,14 @@ void setupPulses(unsigned int port)
   switch (required_protocol) {
     case PROTO_PXX:
       setupPulsesPXX(port);
+      scheduleNextMixerCalculation(port, 9);
       break;
 #if defined(DSM2)
     case PROTO_DSM2_LP45:
     case PROTO_DSM2_DSM2:
     case PROTO_DSM2_DSMX:
       setupPulsesDSM2(port);
+      scheduleNextMixerCalculation(port, 11);
       break;
 #endif
 #if defined(CROSSFIRE)
@@ -194,6 +196,7 @@ void setupPulses(unsigned int port)
         uint8_t * crossfire = modulePulsesData[port].crossfire.pulses;
         createCrossfireFrame(crossfire, &channelOutputs[g_model.moduleData[port].channelsStart]);
         sportSendBuffer(crossfire, CROSSFIRE_FRAME_LEN);
+        // TODO scheduleNextMixerCalculation()
       }
       break;
     }
@@ -205,6 +208,7 @@ void setupPulses(unsigned int port)
 #endif
     case PROTO_PPM:
       setupPulsesPPM(port);
+      scheduleNextMixerCalculation(port, (45+g_model.moduleData[port].ppm.frameLength)/2);
       break ;
     default:
       break;
diff --git a/radio/src/pulses/pulses_arm.h b/radio/src/pulses/pulses_arm.h
index eb4f35289..969816142 100644
--- a/radio/src/pulses/pulses_arm.h
+++ b/radio/src/pulses/pulses_arm.h
@@ -69,7 +69,7 @@ PACK(struct Dsm2PulsesData {
 #endif
 
 #define CROSSFIRE_BAUDRATE             400000
-#define CROSSFIRE_FRAME_LEN            25
+#define CROSSFIRE_FRAME_LEN            (3+22+1)
 #define CROSSFIRE_CHANNELS_COUNT       16
 PACK(struct CrossfirePulsesData {
   uint8_t pulses[CROSSFIRE_FRAME_LEN];
diff --git a/radio/src/targets/horus/adc_driver.cpp b/radio/src/targets/horus/adc_driver.cpp
index b8f0f9bcb..49c45d92b 100644
--- a/radio/src/targets/horus/adc_driver.cpp
+++ b/radio/src/targets/horus/adc_driver.cpp
@@ -178,6 +178,7 @@ void adcRead()
   ADC_CS_HIGH();
   delay_01us(1);
 
+  DEBUG_TIMER_START(debugTimerAdcLoop);
   for (uint32_t adcIndex=0; adcIndex<MOUSE1; adcIndex++) {
     // MUX is changed to the channel that was sent in the previous command
     // but the data is from the old MUX position
@@ -211,12 +212,15 @@ void adcRead()
     ADC_CS_HIGH();
     delay_01us(1);
   }
+  DEBUG_TIMER_STOP(debugTimerAdcLoop);
 
+  DEBUG_TIMER_START(debugTimerAdcWait);
   for (uint32_t i=0; i<20000; i++) {
     if (DMA2->LISR & DMA_LISR_TCIF1) {
       break;
     }
   }
+  DEBUG_TIMER_STOP(debugTimerAdcWait);
 
   // On chip ADC read should have finished
 }
diff --git a/radio/src/targets/horus/audio_driver.cpp b/radio/src/targets/horus/audio_driver.cpp
index a0cb14262..e157d79bf 100644
--- a/radio/src/targets/horus/audio_driver.cpp
+++ b/radio/src/targets/horus/audio_driver.cpp
@@ -396,15 +396,15 @@ void audioConsumeCurrentBuffer()
   }
 }
 
-bool audioPushBuffer(AudioBuffer * buffer)
+void audioPushBuffer(AudioBuffer * buffer)
 {
   if (!currentBuffer) {
+    buffer->state = AUDIO_BUFFER_PLAYING;
     audioSetCurrentBuffer(buffer);
     audioConsumeCurrentBuffer();
-    return true;
   }
   else {
-    return false;
+    buffer->state = AUDIO_BUFFER_FILLED;
   }
 }
 
diff --git a/radio/src/targets/horus/board_horus.cpp b/radio/src/targets/horus/board_horus.cpp
index 5cbaf2d12..c9ca34b9c 100644
--- a/radio/src/targets/horus/board_horus.cpp
+++ b/radio/src/targets/horus/board_horus.cpp
@@ -1,274 +1,274 @@
-/*
- * Copyright (C) OpenTX
- *
- * Based on code named
- *   th9x - http://code.google.com/p/th9x
- *   er9x - http://code.google.com/p/er9x
- *   gruvin9x - http://code.google.com/p/gruvin9x
- *
- * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#include "../../opentx.h"
-
-#if defined(__cplusplus) && !defined(SIMU)
-extern "C" {
-#endif
-#include "STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_OTG_Driver/inc/usb_dcd_int.h"
-#include "STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_OTG_Driver/inc/usb_bsp.h"
-#if defined(__cplusplus) && !defined(SIMU)
-}
-#endif
-
-void watchdogInit(unsigned int duration)
-{
-  IWDG->KR = 0x5555 ;      // Unlock registers
-  IWDG->PR = 3 ;           // Divide by 32 => 1kHz clock
-  IWDG->KR = 0x5555 ;      // Unlock registers
-  IWDG->RLR = duration ;       // 1.5 seconds nominal
-  IWDG->KR = 0xAAAA ;      // reload
-  IWDG->KR = 0xCCCC ;      // start
-}
-
-void getCPUUniqueID(char * s)
-{
-  uint32_t * cpu_uid = (uint32_t *)0x1FFF7A10;
-  char * tmp = strAppendUnsigned(s, cpu_uid[0], 8, 16);
-  *tmp = ' ';
-  tmp = strAppendUnsigned(tmp+1, cpu_uid[1], 8, 16);
-  *tmp = ' ';
-  strAppendUnsigned(tmp+1, cpu_uid[2], 8, 16);
-}
-
-// Start TIMER7 at 2000000Hz
-void init2MhzTimer()
-{
-  TIMER_2MHz_TIMER->PSC = (PERI1_FREQUENCY * TIMER_MULT_APB1) / 2000000 - 1 ;       // 0.5 uS, 2 MHz
-  TIMER_2MHz_TIMER->ARR = 65535;
-  TIMER_2MHz_TIMER->CR2 = 0;
-  TIMER_2MHz_TIMER->CR1 = TIM_CR1_CEN;
-}
-
-// Starts TIMER at 200Hz, 5mS period
-void init5msTimer()
-{
-  INTERRUPT_5MS_TIMER->ARR = 999 ;     // 1mS
-  INTERRUPT_5MS_TIMER->PSC = (PERI1_FREQUENCY * TIMER_MULT_APB1) / 1000000 - 1 ;  // 1uS from 30MHz
-  INTERRUPT_5MS_TIMER->CCER = 0 ;
-  INTERRUPT_5MS_TIMER->CCMR1 = 0 ;
-  INTERRUPT_5MS_TIMER->EGR = 0 ;
-  INTERRUPT_5MS_TIMER->CR1 = 5 ;
-  INTERRUPT_5MS_TIMER->DIER |= 1 ;
-  NVIC_EnableIRQ(TIM8_TRG_COM_TIM14_IRQn) ;
-  NVIC_SetPriority(TIM8_TRG_COM_TIM14_IRQn, 7);
-}
-
-void stop5msTimer( void )
-{
-  TIM14->CR1 = 0 ;        // stop timer
-  NVIC_DisableIRQ(TIM8_TRG_COM_TIM14_IRQn) ;
-  RCC->APB1ENR &= ~RCC_APB1ENR_TIM14EN ;          // Disable clock
-}
-
-// TODO use the same than board_sky9x.cpp
-void interrupt5ms()
-{
-  static uint32_t pre_scale ;       // Used to get 10 Hz counter
-
-  ++pre_scale;
-
-  if (pre_scale == 5 || pre_scale == 10) {
-
-#if defined(HAPTIC)
-    HAPTIC_HEARTBEAT();
-#endif
-
-  }
-
-  if ( pre_scale == 10 ) {
-    pre_scale = 0 ;
-    per10ms();
-  }
-
-  checkRotaryEncoder();
-}
-
-#if !defined(SIMU)
-extern "C" void TIM8_TRG_COM_TIM14_IRQHandler()
-{
-  TIM14->SR &= ~TIM_SR_UIF ;
-  interrupt5ms() ;
-}
-
-void boardInit()
-{
-  RCC_AHB1PeriphClockCmd(PWR_RCC_AHB1Periph | 
-                         LED_RCC_AHB1Periph | 
-                         LCD_RCC_AHB1Periph | 
-                         AUDIO_RCC_AHB1Periph | 
-                         KEYS_RCC_AHB1Periph_GPIO | 
-                         ADC_RCC_AHB1Periph | 
-                         SERIAL_RCC_AHB1Periph | 
-                         TELEMETRY_RCC_AHB1Periph | 
-                         AUDIO_RCC_AHB1Periph | 
-                         HAPTIC_RCC_AHB1Periph | 
-                         INTMODULE_RCC_AHB1Periph | 
-                         EXTMODULE_RCC_AHB1Periph, 
-                         ENABLE);
-  RCC_APB1PeriphClockCmd(INTERRUPT_5MS_APB1Periph | 
-                         TIMER_2MHz_APB1Periph | 
-                         AUDIO_RCC_APB1Periph | 
-                         SERIAL_RCC_APB1Periph | 
-                         TELEMETRY_RCC_APB1Periph |
-                         AUDIO_RCC_APB1Periph | 
-                         EXTMODULE_RCC_APB1Periph, 
-                         ENABLE);
-  RCC_APB2PeriphClockCmd(LCD_RCC_APB2Periph | 
-                         ADC_RCC_APB2Periph | 
-                         HAPTIC_RCC_APB2Periph | 
-                         INTMODULE_RCC_APB2Periph | 
-                         EXTMODULE_RCC_APB2Periph, ENABLE);
-
-  pwrInit();
-  delaysInit();
-
-  // FrSky removed the volume chip in latest board, that's why it doesn't answer!
-  // i2cInit();
-
-  serial2Init(0, 0); // default serial mode (None if DEBUG not defined)
-
-  __enable_irq();
-
-  TRACE("Horus started :)");
-
-  keysInit();
-  adcInit();
-  lcdInit();
-  audioInit();
-  init2MhzTimer();
-  init5msTimer();
-  usbInit();
-  hapticInit();
-
-  //  bt_open();
-
-#if defined(DEBUG)
-  DBGMCU_APB1PeriphConfig(DBGMCU_IWDG_STOP|DBGMCU_TIM1_STOP|DBGMCU_TIM2_STOP|DBGMCU_TIM3_STOP|DBGMCU_TIM4_STOP|DBGMCU_TIM5_STOP|DBGMCU_TIM6_STOP|DBGMCU_TIM7_STOP|DBGMCU_TIM8_STOP|DBGMCU_TIM9_STOP|DBGMCU_TIM10_STOP|DBGMCU_TIM11_STOP|DBGMCU_TIM12_STOP|DBGMCU_TIM13_STOP|DBGMCU_TIM14_STOP, ENABLE);
-#endif
-
-  ledBlue();
-}
-
-void boardOff()
-{
-  BACKLIGHT_OFF();
-
-  while (pwrPressed()) {
-    wdt_reset();
-  }
-
-  SysTick->CTRL = 0; // turn off systick
-  pwrOff();
-}
-
-#endif // #if !defined(SIMU)
-
-#if defined(USB_JOYSTICK) && !defined(SIMU)
-extern USB_OTG_CORE_HANDLE USB_OTG_dev;
-
-/*
-  Prepare and send new USB data packet
-
-  The format of HID_Buffer is defined by
-  USB endpoint description can be found in
-  file usb_hid_joystick.c, variable HID_JOYSTICK_ReportDesc
-*/
-void usbJoystickUpdate(void)
-{
-  static uint8_t HID_Buffer[HID_IN_PACKET];
-
-  //buttons
-  HID_Buffer[0] = 0; //buttons
-  for (int i = 0; i < 8; ++i) {
-    if ( channelOutputs[i+8] > 0 ) {
-      HID_Buffer[0] |= (1 << i);
-    }
-  }
-
-  //analog values
-  //uint8_t * p = HID_Buffer + 1;
-  for (int i = 0; i < 8; ++i) {
-    int16_t value = channelOutputs[i] / 8;
-    if ( value > 127 ) value = 127;
-    else if ( value < -127 ) value = -127;
-    HID_Buffer[i+1] = static_cast<int8_t>(value);
-  }
-
-  USBD_HID_SendReport (&USB_OTG_dev, HID_Buffer, HID_IN_PACKET );
-}
-
-#endif //#if defined(USB_JOYSTICK) && defined(PCBTARANIS) && !defined(SIMU)
-
-
-uint8_t currentTrainerMode = 0xff;
-
-void checkTrainerSettings()
-{
-  uint8_t requiredTrainerMode = g_model.trainerMode;
-  if (requiredTrainerMode != currentTrainerMode) {
-    switch (currentTrainerMode) {
-      case TRAINER_MODE_MASTER_TRAINER_JACK:
-        stop_trainer_capture();
-        break;
-      case TRAINER_MODE_SLAVE:
-        stop_trainer_ppm();
-        break;
-      case TRAINER_MODE_MASTER_CPPM_EXTERNAL_MODULE:
-        stop_cppm_on_heartbeat_capture() ;
-        break;
-      case TRAINER_MODE_MASTER_SBUS_EXTERNAL_MODULE:
-        stop_sbus_on_heartbeat_capture() ;
-        break;
-      case TRAINER_MODE_MASTER_BATTERY_COMPARTMENT:
-        serial2Stop();
-    }
-
-    currentTrainerMode = requiredTrainerMode;
-    switch (requiredTrainerMode) {
-      case TRAINER_MODE_SLAVE:
-        init_trainer_ppm();
-        break;
-      case TRAINER_MODE_MASTER_CPPM_EXTERNAL_MODULE:
-        init_cppm_on_heartbeat_capture() ;
-        break;
-      case TRAINER_MODE_MASTER_SBUS_EXTERNAL_MODULE:
-        init_sbus_on_heartbeat_capture() ;
-        break;
-      case TRAINER_MODE_MASTER_BATTERY_COMPARTMENT:
-        if (g_eeGeneral.serial2Mode == UART_MODE_SBUS_TRAINER) {
-          serial2SbusInit();
-          break;
-        }
-        // no break
-      default:
-        // master is default
-        init_trainer_capture();
-        break;
-    }
-  }
-}
-
-uint16_t getBatteryVoltage()
-{
-  int32_t instant_vbat = anaIn(TX_VOLTAGE);  // using filtered ADC value on purpose
-  return (uint16_t)((instant_vbat * (1000 + g_eeGeneral.txVoltageCalibration) ) / 1629);
-}
+/*
+ * Copyright (C) OpenTX
+ *
+ * Based on code named
+ *   th9x - http://code.google.com/p/th9x
+ *   er9x - http://code.google.com/p/er9x
+ *   gruvin9x - http://code.google.com/p/gruvin9x
+ *
+ * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include "../../opentx.h"
+
+#if defined(__cplusplus) && !defined(SIMU)
+extern "C" {
+#endif
+#include "STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_OTG_Driver/inc/usb_dcd_int.h"
+#include "STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_OTG_Driver/inc/usb_bsp.h"
+#if defined(__cplusplus) && !defined(SIMU)
+}
+#endif
+
+void watchdogInit(unsigned int duration)
+{
+  IWDG->KR = 0x5555 ;      // Unlock registers
+  IWDG->PR = 3 ;           // Divide by 32 => 1kHz clock
+  IWDG->KR = 0x5555 ;      // Unlock registers
+  IWDG->RLR = duration ;       // 1.5 seconds nominal
+  IWDG->KR = 0xAAAA ;      // reload
+  IWDG->KR = 0xCCCC ;      // start
+}
+
+void getCPUUniqueID(char * s)
+{
+  uint32_t * cpu_uid = (uint32_t *)0x1FFF7A10;
+  char * tmp = strAppendUnsigned(s, cpu_uid[0], 8, 16);
+  *tmp = ' ';
+  tmp = strAppendUnsigned(tmp+1, cpu_uid[1], 8, 16);
+  *tmp = ' ';
+  strAppendUnsigned(tmp+1, cpu_uid[2], 8, 16);
+}
+
+// Start TIMER7 at 2000000Hz
+void init2MhzTimer()
+{
+  TIMER_2MHz_TIMER->PSC = (PERI1_FREQUENCY * TIMER_MULT_APB1) / 2000000 - 1 ;       // 0.5 uS, 2 MHz
+  TIMER_2MHz_TIMER->ARR = 65535;
+  TIMER_2MHz_TIMER->CR2 = 0;
+  TIMER_2MHz_TIMER->CR1 = TIM_CR1_CEN;
+}
+
+// Starts TIMER at 1000Hz
+void init1msTimer()
+{
+  INTERRUPT_5MS_TIMER->ARR = 999 ;     // 1mS
+  INTERRUPT_5MS_TIMER->PSC = (PERI1_FREQUENCY * TIMER_MULT_APB1) / 1000000 - 1 ;  // 1uS from 30MHz
+  INTERRUPT_5MS_TIMER->CCER = 0 ;
+  INTERRUPT_5MS_TIMER->CCMR1 = 0 ;
+  INTERRUPT_5MS_TIMER->EGR = 0 ;
+  INTERRUPT_5MS_TIMER->CR1 = 5 ;
+  INTERRUPT_5MS_TIMER->DIER |= 1 ;
+  NVIC_EnableIRQ(TIM8_TRG_COM_TIM14_IRQn) ;
+  NVIC_SetPriority(TIM8_TRG_COM_TIM14_IRQn, 7);
+}
+
+// TODO use the same than board_sky9x.cpp
+void interrupt1ms()
+{
+  static uint32_t pre_scale ;       // Used to get 10 Hz counter
+
+  ++pre_scale;
+
+  if (pre_scale == 5 || pre_scale == 10) {
+
+#if defined(HAPTIC)
+    DEBUG_TIMER_START(debugTimerHaptic);
+    HAPTIC_HEARTBEAT();
+    DEBUG_TIMER_STOP(debugTimerHaptic);
+#endif
+
+  }
+
+  if ( pre_scale == 10 ) {
+    pre_scale = 0 ;
+    DEBUG_TIMER_START(debugTimerPer10ms);
+    per10ms();
+    DEBUG_TIMER_STOP(debugTimerPer10ms);
+  }
+
+  DEBUG_TIMER_START(debugTimerRotEnc);
+  checkRotaryEncoder();
+  DEBUG_TIMER_STOP(debugTimerRotEnc);
+}
+
+#if !defined(SIMU)
+extern "C" void TIM8_TRG_COM_TIM14_IRQHandler()
+{
+  TIM14->SR &= ~TIM_SR_UIF ;
+  interrupt1ms() ;
+  DEBUG_INTERRUPT(INT_1MS);
+}
+
+void boardInit()
+{
+  RCC_AHB1PeriphClockCmd(PWR_RCC_AHB1Periph | 
+                         LED_RCC_AHB1Periph | 
+                         LCD_RCC_AHB1Periph | 
+                         AUDIO_RCC_AHB1Periph | 
+                         KEYS_RCC_AHB1Periph_GPIO | 
+                         ADC_RCC_AHB1Periph | 
+                         SERIAL_RCC_AHB1Periph | 
+                         TELEMETRY_RCC_AHB1Periph | 
+                         AUDIO_RCC_AHB1Periph | 
+                         HAPTIC_RCC_AHB1Periph | 
+                         INTMODULE_RCC_AHB1Periph | 
+                         EXTMODULE_RCC_AHB1Periph, 
+                         ENABLE);
+  RCC_APB1PeriphClockCmd(INTERRUPT_5MS_APB1Periph | 
+                         TIMER_2MHz_APB1Periph | 
+                         AUDIO_RCC_APB1Periph | 
+                         SERIAL_RCC_APB1Periph | 
+                         TELEMETRY_RCC_APB1Periph |
+                         AUDIO_RCC_APB1Periph | 
+                         EXTMODULE_RCC_APB1Periph, 
+                         ENABLE);
+  RCC_APB2PeriphClockCmd(LCD_RCC_APB2Periph | 
+                         ADC_RCC_APB2Periph | 
+                         HAPTIC_RCC_APB2Periph | 
+                         INTMODULE_RCC_APB2Periph | 
+                         EXTMODULE_RCC_APB2Periph, ENABLE);
+
+  pwrInit();
+  delaysInit();
+
+  // FrSky removed the volume chip in latest board, that's why it doesn't answer!
+  // i2cInit();
+
+  serial2Init(0, 0); // default serial mode (None if DEBUG not defined)
+
+  __enable_irq();
+
+  TRACE("Horus started :)");
+
+  keysInit();
+  adcInit();
+  lcdInit();
+  audioInit();
+  init2MhzTimer();
+  init1msTimer();
+  usbInit();
+  hapticInit();
+
+  //  bt_open();
+
+#if defined(DEBUG)
+  DBGMCU_APB1PeriphConfig(DBGMCU_IWDG_STOP|DBGMCU_TIM1_STOP|DBGMCU_TIM2_STOP|DBGMCU_TIM3_STOP|DBGMCU_TIM4_STOP|DBGMCU_TIM5_STOP|DBGMCU_TIM6_STOP|DBGMCU_TIM7_STOP|DBGMCU_TIM8_STOP|DBGMCU_TIM9_STOP|DBGMCU_TIM10_STOP|DBGMCU_TIM11_STOP|DBGMCU_TIM12_STOP|DBGMCU_TIM13_STOP|DBGMCU_TIM14_STOP, ENABLE);
+#endif
+
+  ledBlue();
+}
+
+void boardOff()
+{
+  BACKLIGHT_OFF();
+
+  while (pwrPressed()) {
+    wdt_reset();
+  }
+
+  SysTick->CTRL = 0; // turn off systick
+  pwrOff();
+}
+
+#endif // #if !defined(SIMU)
+
+#if defined(USB_JOYSTICK) && !defined(SIMU)
+extern USB_OTG_CORE_HANDLE USB_OTG_dev;
+
+/*
+  Prepare and send new USB data packet
+
+  The format of HID_Buffer is defined by
+  USB endpoint description can be found in
+  file usb_hid_joystick.c, variable HID_JOYSTICK_ReportDesc
+*/
+void usbJoystickUpdate(void)
+{
+  static uint8_t HID_Buffer[HID_IN_PACKET];
+
+  //buttons
+  HID_Buffer[0] = 0; //buttons
+  for (int i = 0; i < 8; ++i) {
+    if ( channelOutputs[i+8] > 0 ) {
+      HID_Buffer[0] |= (1 << i);
+    }
+  }
+
+  //analog values
+  //uint8_t * p = HID_Buffer + 1;
+  for (int i = 0; i < 8; ++i) {
+    int16_t value = channelOutputs[i] / 8;
+    if ( value > 127 ) value = 127;
+    else if ( value < -127 ) value = -127;
+    HID_Buffer[i+1] = static_cast<int8_t>(value);
+  }
+
+  USBD_HID_SendReport (&USB_OTG_dev, HID_Buffer, HID_IN_PACKET );
+}
+
+#endif //#if defined(USB_JOYSTICK) && defined(PCBTARANIS) && !defined(SIMU)
+
+
+uint8_t currentTrainerMode = 0xff;
+
+void checkTrainerSettings()
+{
+  uint8_t requiredTrainerMode = g_model.trainerMode;
+  if (requiredTrainerMode != currentTrainerMode) {
+    switch (currentTrainerMode) {
+      case TRAINER_MODE_MASTER_TRAINER_JACK:
+        stop_trainer_capture();
+        break;
+      case TRAINER_MODE_SLAVE:
+        stop_trainer_ppm();
+        break;
+      case TRAINER_MODE_MASTER_CPPM_EXTERNAL_MODULE:
+        stop_cppm_on_heartbeat_capture() ;
+        break;
+      case TRAINER_MODE_MASTER_SBUS_EXTERNAL_MODULE:
+        stop_sbus_on_heartbeat_capture() ;
+        break;
+      case TRAINER_MODE_MASTER_BATTERY_COMPARTMENT:
+        serial2Stop();
+    }
+
+    currentTrainerMode = requiredTrainerMode;
+    switch (requiredTrainerMode) {
+      case TRAINER_MODE_SLAVE:
+        init_trainer_ppm();
+        break;
+      case TRAINER_MODE_MASTER_CPPM_EXTERNAL_MODULE:
+        init_cppm_on_heartbeat_capture() ;
+        break;
+      case TRAINER_MODE_MASTER_SBUS_EXTERNAL_MODULE:
+        init_sbus_on_heartbeat_capture() ;
+        break;
+      case TRAINER_MODE_MASTER_BATTERY_COMPARTMENT:
+        if (g_eeGeneral.serial2Mode == UART_MODE_SBUS_TRAINER) {
+          serial2SbusInit();
+          break;
+        }
+        // no break
+      default:
+        // master is default
+        init_trainer_capture();
+        break;
+    }
+  }
+}
+
+uint16_t getBatteryVoltage()
+{
+  int32_t instant_vbat = anaIn(TX_VOLTAGE);  // using filtered ADC value on purpose
+  return (uint16_t)((instant_vbat * (1000 + g_eeGeneral.txVoltageCalibration) ) / 1629);
+}
diff --git a/radio/src/targets/horus/board_horus.h b/radio/src/targets/horus/board_horus.h
index 949ae32cd..c17a59af1 100644
--- a/radio/src/targets/horus/board_horus.h
+++ b/radio/src/targets/horus/board_horus.h
@@ -272,11 +272,12 @@ void DMACopyAlphaBitmap(uint16_t * dest, uint16_t destw, uint16_t x, uint16_t y,
 void DMABitmapConvert(uint16_t * dest, const uint8_t * src, uint16_t w, uint16_t h, uint32_t format);
 void lcdStoreBackupBuffer(void);
 int lcdRestoreBackupBuffer(void);
+void LCD_ControlLight(uint16_t dutyCycle);
 
 // Backlight driver
-#define setBacklight(xx)
-#define backlightEnable()
-#define backlightDisable()
+#define setBacklight(xx)      LCD_ControlLight(xx)
+#define backlightEnable()     setBacklight(UNEXPECTED_SHUTDOWN() ? 100 : 100-g_eeGeneral.backlightBright)
+#define backlightDisable()    setBacklight(g_eeGeneral.blOffBright)
 #define isBacklightEnable()   true
 
 // USB driver
diff --git a/radio/src/targets/horus/delays.c b/radio/src/targets/horus/delays.c
index 3431f9d3e..cc74bc6cc 100644
--- a/radio/src/targets/horus/delays.c
+++ b/radio/src/targets/horus/delays.c
@@ -18,7 +18,7 @@
  * GNU General Public License for more details.
  */
 
-#include "../horus/board_horus.h"
+#include "board_horus.h"
 
 void delaysInit(void)
 {
diff --git a/radio/src/targets/horus/lcd_driver.cpp b/radio/src/targets/horus/lcd_driver.cpp
index e48882b21..c5aa48f42 100644
--- a/radio/src/targets/horus/lcd_driver.cpp
+++ b/radio/src/targets/horus/lcd_driver.cpp
@@ -320,32 +320,33 @@ void LCD_LayerInit()
 
 void LCD_ControlLight(uint16_t dutyCycle)
 {
+  static uint16_t existingDutyCycle;
+
+  if (dutyCycle == existingDutyCycle || dutyCycle < 5) {
+    return;
+  }
+  else {
+    existingDutyCycle = dutyCycle;
+  }
+
   TIM_TimeBaseInitTypeDef  TIM_TimeBaseStructure;
   TIM_OCInitTypeDef  TIM_OCInitStructure;
 
-  uint16_t freq = LCD_BKLIGHT_PWM_FREQ;
-
-  uint32_t temp = 0;
-  temp = 1000000 / freq - 1;
-
-  TIM_TimeBaseStructure.TIM_Prescaler = SystemCoreClock / 1000000 - 1 ;
+  TIM_TimeBaseStructure.TIM_Prescaler = SystemCoreClock / 10000 - 1 ;//1KhZ
   TIM_TimeBaseStructure.TIM_CounterMode = TIM_CounterMode_Up;
-  TIM_TimeBaseStructure.TIM_Period = temp;
+  TIM_TimeBaseStructure.TIM_Period = 100;
   TIM_TimeBaseStructure.TIM_ClockDivision = 0;
   TIM_TimeBaseStructure.TIM_RepetitionCounter = 0;
 
   TIM_TimeBaseInit(TIM8, &TIM_TimeBaseStructure);
 
-  unsigned long tempValue;
-  tempValue = (unsigned long)divRoundClosest((temp+1)*(100-dutyCycle), dutyCycle);
-
   TIM_Cmd(TIM8, DISABLE);
 
   /* Channel 1 Configuration in PWM mode */
   TIM_OCInitStructure.TIM_OCMode = TIM_OCMode_PWM1;
   TIM_OCInitStructure.TIM_OutputState = TIM_OutputState_Enable;
   TIM_OCInitStructure.TIM_OutputNState = TIM_OutputNState_Enable;
-  TIM_OCInitStructure.TIM_Pulse = (uint32_t)tempValue;
+  TIM_OCInitStructure.TIM_Pulse = (100-dutyCycle);
   TIM_OCInitStructure.TIM_OCPolarity = TIM_OCPolarity_High;
   TIM_OCInitStructure.TIM_OCNPolarity = TIM_OCNPolarity_High;
   TIM_OCInitStructure.TIM_OCIdleState = TIM_OCIdleState_Set;
diff --git a/radio/src/targets/horus/pulses_driver.cpp b/radio/src/targets/horus/pulses_driver.cpp
index 3db61e347..031d1cf1b 100644
--- a/radio/src/targets/horus/pulses_driver.cpp
+++ b/radio/src/targets/horus/pulses_driver.cpp
@@ -165,6 +165,7 @@ static void intmoduleNoneStop()
 #if !defined(SIMU)
 extern "C" void DMA2_Stream7_IRQHandler(void)
 {
+  DEBUG_INTERRUPT(INT_DMA2S7);
   if(DMA_GetITStatus(INTMODULE_DMA_STREAM, DMA_IT_TCIF7)) {
     // TODO we could send the 8 next channels here (when needed)
     DMA_ClearITPendingBit(INTMODULE_DMA_STREAM, DMA_IT_TCIF7);
@@ -173,6 +174,9 @@ extern "C" void DMA2_Stream7_IRQHandler(void)
 
 extern "C" void TIM1_CC_IRQHandler()
 {
+  DEBUG_INTERRUPT(INT_TIM1CC);
+  DEBUG_TIMER_SAMPLE(debugTimerIntPulses);
+  DEBUG_TIMER_START(debugTimerIntPulsesDuration);
   INTMODULE_TIMER->DIER &= ~TIM_DIER_CC2IE;       // stop this interrupt
   INTMODULE_TIMER->SR &= ~TIM_SR_CC2IF;           // clear flag
 
@@ -204,6 +208,7 @@ extern "C" void TIM1_CC_IRQHandler()
   }
 
   INTMODULE_TIMER->DIER |= TIM_DIER_CC2IE;
+  DEBUG_TIMER_STOP(debugTimerIntPulsesDuration);
 }
 #endif
 
@@ -551,6 +556,7 @@ static void extmodulePpmStop()
 
 extern "C" void TIM2_IRQHandler()
 {
+  DEBUG_INTERRUPT(INT_TIM2);
   //determine if its CC or UP interrupt
   uint16_t sr = EXTMODULE_TIMER->SR;
   uint16_t dier = EXTMODULE_TIMER->DIER;
diff --git a/radio/src/targets/horus/sdio_sd.c b/radio/src/targets/horus/sdio_sd.c
index ea3fbaedd..7b494848b 100644
--- a/radio/src/targets/horus/sdio_sd.c
+++ b/radio/src/targets/horus/sdio_sd.c
@@ -1,23 +1,23 @@
-/*
- * Copyright (C) OpenTX
- *
- * Based on code named
- *   th9x - http://code.google.com/p/th9x 
- *   er9x - http://code.google.com/p/er9x
- *   gruvin9x - http://code.google.com/p/gruvin9x
- *
- * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
+/*
+ * Copyright (C) OpenTX
+ *
+ * Based on code named
+ *   th9x - http://code.google.com/p/th9x 
+ *   er9x - http://code.google.com/p/er9x
+ *   gruvin9x - http://code.google.com/p/gruvin9x
+ *
+ * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
 /* Includes ------------------------------------------------------------------*/
 #include "../horus/sdio_sd.h"
 
@@ -2776,11 +2776,13 @@ OPTIMIZE("O0") uint8_t convert_from_bytes_to_power_of_two(uint16_t NumberOfBytes
 
 void SDIO_IRQHandler(void)
 {
+  DEBUG_INTERRUPT(INT_SDIO);
   SD_ProcessIRQ();
 }
 
 void SD_SDIO_DMA_IRQHANDLER(void)
 {
+  DEBUG_INTERRUPT(INT_SDIO_DMA);
   SD_ProcessDMAIRQ();
 }
 
diff --git a/radio/src/targets/horus/serial2_driver.cpp b/radio/src/targets/horus/serial2_driver.cpp
index d849d62c0..fae6e56e0 100644
--- a/radio/src/targets/horus/serial2_driver.cpp
+++ b/radio/src/targets/horus/serial2_driver.cpp
@@ -134,6 +134,7 @@ uint8_t serial2TracesEnabled()
 #if !defined(SIMU)
 extern "C" void SERIAL_USART_IRQHandler(void)
 {
+  DEBUG_INTERRUPT(INT_SER2);
   // Send
   if (USART_GetITStatus(SERIAL_USART, USART_IT_TXE) != RESET) {
     uint8_t txchar;
diff --git a/radio/src/targets/horus/telemetry_driver.cpp b/radio/src/targets/horus/telemetry_driver.cpp
index 20d33883c..2a749c519 100644
--- a/radio/src/targets/horus/telemetry_driver.cpp
+++ b/radio/src/targets/horus/telemetry_driver.cpp
@@ -136,6 +136,7 @@ void sportSendBuffer(uint8_t * buffer, uint32_t count)
 
 extern "C" void TELEMETRY_DMA_TX_IRQHandler(void)
 {
+  DEBUG_INTERRUPT(INT_TELEM_DMA);
   if (DMA_GetITStatus(TELEMETRY_DMA_Stream_TX, TELEMETRY_DMA_TX_FLAG_TC)) {
     DMA_ClearITPendingBit(TELEMETRY_DMA_Stream_TX, TELEMETRY_DMA_TX_FLAG_TC);
     telemetryPortSetDirectionInput();
diff --git a/radio/src/targets/horus/trainer_driver.cpp b/radio/src/targets/horus/trainer_driver.cpp
index f78c50d54..9c2225eab 100644
--- a/radio/src/targets/horus/trainer_driver.cpp
+++ b/radio/src/targets/horus/trainer_driver.cpp
@@ -103,6 +103,7 @@ void stop_trainer_capture()
 #if !defined(SIMU)
 extern "C" void TIM3_IRQHandler()
 {
+  DEBUG_INTERRUPT(INT_TIM3);
   uint16_t capture = 0;
   bool doCapture = false;
 
diff --git a/radio/src/targets/horus/usb_driver.c b/radio/src/targets/horus/usb_driver.c
index 92905ecf9..3232ae6bb 100644
--- a/radio/src/targets/horus/usb_driver.c
+++ b/radio/src/targets/horus/usb_driver.c
@@ -20,6 +20,7 @@
 
 #include "board_horus.h"
 #include "STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_OTG_Driver/inc/usb_dcd_int.h"
+#include "debug.h"
 
 int usbPlugged(void)
 {
@@ -46,6 +47,7 @@ USB_OTG_CORE_HANDLE USB_OTG_dev;
 
 void OTG_FS_IRQHandler(void)
 {
+  DEBUG_INTERRUPT(INT_OTG_FS);
   USBD_OTG_ISR_Handler(&USB_OTG_dev);
 }
 
diff --git a/radio/src/targets/simu/simpgmspace.cpp b/radio/src/targets/simu/simpgmspace.cpp
index a8fee3ef4..24e87966e 100644
--- a/radio/src/targets/simu/simpgmspace.cpp
+++ b/radio/src/targets/simu/simpgmspace.cpp
@@ -416,9 +416,9 @@ struct SimulatorAudio {
   pthread_t threadPid;
 } simuAudio;
 
-bool audioPushBuffer(AudioBuffer * buffer)
+void audioPushBuffer(AudioBuffer * buffer)
 {
-  return false;
+  buffer->state = AUDIO_BUFFER_FILLED;
 }
 #endif
 
@@ -533,6 +533,8 @@ void * audioThread(void *)
   }
   SDL_PauseAudio(0);
 
+  referenceSystemAudioFiles();
+
   while (simuAudio.threadRunning) {
     audioQueue.wakeup();
     sleep(1);
@@ -1335,6 +1337,10 @@ uint8_t i2cReadBQ24195(uint8_t) { return 0; }
 void i2cWriteBQ24195(uint8_t, uint8_t) { }
 #endif
 
+#if defined(PCBHORUS)
+void LCD_ControlLight(uint16_t dutyCycle) { }
+#endif
+
 void serialPrintf(const char * format, ...) { }
 void serialCrlf() { }
 void serialPutc(char c) { }
diff --git a/radio/src/targets/sky9x/audio_driver.cpp b/radio/src/targets/sky9x/audio_driver.cpp
index 19462ef7c..830227399 100644
--- a/radio/src/targets/sky9x/audio_driver.cpp
+++ b/radio/src/targets/sky9x/audio_driver.cpp
@@ -93,10 +93,10 @@ void dacInit()
   NVIC_EnableIRQ(DACC_IRQn) ;
 }
 
-bool audioPushBuffer(AudioBuffer *buffer)
+void audioPushBuffer(AudioBuffer *buffer)
 {
+  buffer->state = AUDIO_BUFFER_FILLED;
   dacStart();
-  return false;
 }
 
 extern "C" void DAC_IRQHandler()
diff --git a/radio/src/targets/taranis/audio_driver.cpp b/radio/src/targets/taranis/audio_driver.cpp
index 834450941..24762dd8b 100644
--- a/radio/src/targets/taranis/audio_driver.cpp
+++ b/radio/src/targets/taranis/audio_driver.cpp
@@ -71,10 +71,11 @@ void dacInit()
   NVIC_SetPriority(AUDIO_DMA_Stream_IRQn, 7);
 }
 
-bool audioPushBuffer(AudioBuffer * buffer)
+void audioPushBuffer(AudioBuffer * buffer)
 {
   if (dacIdle) {
     dacIdle = false;
+    buffer->state = AUDIO_BUFFER_PLAYING;
     AUDIO_DMA_Stream->CR &= ~DMA_SxCR_EN ;                              // Disable DMA channel
     AUDIO_DMA->HIFCR = DMA_HIFCR_CTCIF5 | DMA_HIFCR_CHTIF5 | DMA_HIFCR_CTEIF5 | DMA_HIFCR_CDMEIF5 | DMA_HIFCR_CFEIF5 ; // Write ones to clear bits
     AUDIO_DMA_Stream->M0AR = CONVERT_PTR_UINT(buffer->data);
@@ -82,10 +83,9 @@ bool audioPushBuffer(AudioBuffer * buffer)
     AUDIO_DMA_Stream->CR |= DMA_SxCR_EN | DMA_SxCR_TCIE ;               // Enable DMA channel and interrupt
     DAC->SR = DAC_SR_DMAUDR1 ;                      // Write 1 to clear flag
     DAC->CR |= DAC_CR_EN1 | DAC_CR_DMAEN1 ;                 // Enable DAC
-    return true;
   }
   else {
-    return false;
+    buffer->state = AUDIO_BUFFER_FILLED;
   }
 }
 
@@ -120,6 +120,7 @@ void audioEnd()
 
 extern "C" void AUDIO_TIM_IRQHandler()
 {
+  DEBUG_INTERRUPT(INT_AUDIO);
   DAC->CR &= ~DAC_CR_DMAEN1 ;     // Stop DMA requests
 #if !defined(REV9E)
   DAC->CR &= ~DAC_CR_DMAUDRIE1 ;  // Stop underrun interrupt
diff --git a/radio/src/targets/taranis/bluetooth_driver.cpp b/radio/src/targets/taranis/bluetooth_driver.cpp
index 573225e29..49f9a4993 100644
--- a/radio/src/targets/taranis/bluetooth_driver.cpp
+++ b/radio/src/targets/taranis/bluetooth_driver.cpp
@@ -104,6 +104,7 @@ void bluetoothDone()
 
 extern "C" void USART6_IRQHandler(void)
 {
+  DEBUG_INTERRUPT(INT_BLUETOOTH);
   if (USART_GetITStatus(BT_USART, USART_IT_RXNE) != RESET) {
     USART_ClearITPendingBit(BT_USART, USART_IT_RXNE);
     uint8_t byte = USART_ReceiveData(BT_USART);
diff --git a/radio/src/targets/taranis/board_taranis.cpp b/radio/src/targets/taranis/board_taranis.cpp
index 9894d1379..088e63eee 100644
--- a/radio/src/targets/taranis/board_taranis.cpp
+++ b/radio/src/targets/taranis/board_taranis.cpp
@@ -108,6 +108,7 @@ extern "C" void INTERRUPT_5MS_IRQHandler()
 {
   INTERRUPT_5MS_TIMER->SR &= ~TIM_SR_UIF ;
   interrupt5ms() ;
+  DEBUG_INTERRUPT(INT_5MS);
 }
 
 #if defined(REV9E)
diff --git a/radio/src/targets/taranis/lcd_driver.cpp b/radio/src/targets/taranis/lcd_driver.cpp
index 5c31a5178..8e3fdf4d3 100644
--- a/radio/src/targets/taranis/lcd_driver.cpp
+++ b/radio/src/targets/taranis/lcd_driver.cpp
@@ -1,23 +1,23 @@
-/*
- * Copyright (C) OpenTX
- *
- * Based on code named
- *   th9x - http://code.google.com/p/th9x 
- *   er9x - http://code.google.com/p/er9x
- *   gruvin9x - http://code.google.com/p/gruvin9x
- *
- * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
+/*
+ * Copyright (C) OpenTX
+ *
+ * Based on code named
+ *   th9x - http://code.google.com/p/th9x 
+ *   er9x - http://code.google.com/p/er9x
+ *   gruvin9x - http://code.google.com/p/gruvin9x
+ *
+ * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
 #include "../../opentx.h"
 
 #define	WriteData(x)	 AspiData(x)
@@ -199,6 +199,7 @@ void lcdRefresh(bool wait)
 
 extern "C" void DMA1_Stream7_IRQHandler()
 {
+  DEBUG_INTERRUPT(INT_LCD);
   //clear interrupt flag
   DMA1_Stream7->CR &= ~DMA_SxCR_TCIE ;  // Stop interrupt
   DMA1->HIFCR |= DMA_HIFCR_CTCIF7;      // Clear interrupt flag
diff --git a/radio/src/targets/taranis/pulses_driver.cpp b/radio/src/targets/taranis/pulses_driver.cpp
index c646a61d5..9aae3e98d 100644
--- a/radio/src/targets/taranis/pulses_driver.cpp
+++ b/radio/src/targets/taranis/pulses_driver.cpp
@@ -375,6 +375,7 @@ static void intmodulePpmStop()
 #if !defined(SIMU)
 extern "C" void TIM1_CC_IRQHandler()
 {
+  DEBUG_INTERRUPT(INT_TIM1CC);
   INTMODULE_TIMER->DIER &= ~TIM_DIER_CC2IE;       // stop this interrupt
   INTMODULE_TIMER->SR &= ~TIM_SR_CC2IF;           // clear flag
   DMA2_Stream6->CR &= ~DMA_SxCR_EN;    // disable DMA, it will have the whole of the execution time of setupPulses() to actually stop
@@ -402,6 +403,7 @@ extern "C" void TIM1_CC_IRQHandler()
 
 extern "C" void TIM1_UP_TIM10_IRQHandler()
 {
+  DEBUG_INTERRUPT(INT_TIM1);
   INTMODULE_TIMER->SR &= ~TIM_SR_UIF ;                               // Clear flag
 
   INTMODULE_TIMER->ARR = *modulePulsesData[INTERNAL_MODULE].ppm.ptr++ ;
@@ -612,6 +614,7 @@ extern "C" void TIM8_CC_IRQHandler()
 
 extern "C" void TIM8_UP_TIM13_IRQHandler()
 {
+  DEBUG_INTERRUPT(INT_TIM8);
   EXTMODULE_TIMER->SR &= ~TIM_SR_UIF ;                               // Clear flag
 
   EXTMODULE_TIMER->ARR = *modulePulsesData[EXTERNAL_MODULE].ppm.ptr++ ;
diff --git a/radio/src/targets/taranis/serial2_driver.cpp b/radio/src/targets/taranis/serial2_driver.cpp
index 83d4afafc..44514979a 100644
--- a/radio/src/targets/taranis/serial2_driver.cpp
+++ b/radio/src/targets/taranis/serial2_driver.cpp
@@ -138,6 +138,7 @@ uint8_t serial2TracesEnabled()
 #if !defined(SIMU)
 extern "C" void SERIAL_USART_IRQHandler(void)
 {
+  DEBUG_INTERRUPT(INT_SER2);
   // Send
   if (USART_GetITStatus(SERIAL_USART, USART_IT_TXE) != RESET) {
     uint8_t txchar;
diff --git a/radio/src/targets/taranis/telemetry_driver.cpp b/radio/src/targets/taranis/telemetry_driver.cpp
index d1a4dca3d..7ee4fb5bd 100644
--- a/radio/src/targets/taranis/telemetry_driver.cpp
+++ b/radio/src/targets/taranis/telemetry_driver.cpp
@@ -114,6 +114,7 @@ void sportSendBuffer(uint8_t * buffer, uint32_t count)
 
 extern "C" void TELEMETRY_DMA_TX_IRQHandler(void)
 {
+  DEBUG_INTERRUPT(INT_TELEM_DMA);
   if (DMA_GetITStatus(TELEMETRY_DMA_Stream_TX, TELEMETRY_DMA_TX_FLAG_TC)) {
     DMA_ClearITPendingBit(TELEMETRY_DMA_Stream_TX, TELEMETRY_DMA_TX_FLAG_TC);
     telemetryPortSetDirectionInput();
@@ -123,6 +124,7 @@ extern "C" void TELEMETRY_DMA_TX_IRQHandler(void)
 #define USART_FLAG_ERRORS (USART_FLAG_ORE | USART_FLAG_NE | USART_FLAG_FE | USART_FLAG_PE)
 extern "C" void TELEMETRY_USART_IRQHandler(void)
 {
+  DEBUG_INTERRUPT(INT_TELEM_USART);
   uint32_t status = TELEMETRY_USART->SR;
   while (status & (USART_FLAG_RXNE | USART_FLAG_ERRORS)) {
     uint8_t data = TELEMETRY_USART->DR;
diff --git a/radio/src/targets/taranis/trainer_driver.cpp b/radio/src/targets/taranis/trainer_driver.cpp
index 8fe4d7e8b..125c7156d 100644
--- a/radio/src/targets/taranis/trainer_driver.cpp
+++ b/radio/src/targets/taranis/trainer_driver.cpp
@@ -103,6 +103,7 @@ void stop_trainer_capture()
 #if !defined(SIMU)
 extern "C" void TIM3_IRQHandler()
 {
+  DEBUG_INTERRUPT(INT_TRAINER);
   uint16_t capture = 0;
   bool doCapture = false;
 
diff --git a/radio/src/targets/taranis/usb_driver.c b/radio/src/targets/taranis/usb_driver.c
index be936686a..e6dcc4ad2 100644
--- a/radio/src/targets/taranis/usb_driver.c
+++ b/radio/src/targets/taranis/usb_driver.c
@@ -20,6 +20,7 @@
 
 #include "board_taranis.h"
 #include "STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_OTG_Driver/inc/usb_dcd_int.h"
+#include "debug.h"
 
 int usbPlugged(void)
 {
@@ -46,6 +47,7 @@ USB_OTG_CORE_HANDLE USB_OTG_dev;
 
 void OTG_FS_IRQHandler(void)
 {
+  DEBUG_INTERRUPT(INT_OTG_FS);
   USBD_OTG_ISR_Handler(&USB_OTG_dev);
 }
 
diff --git a/radio/src/tasks_arm.cpp b/radio/src/tasks_arm.cpp
index b1a32584a..88f6e9324 100644
--- a/radio/src/tasks_arm.cpp
+++ b/radio/src/tasks_arm.cpp
@@ -91,8 +91,11 @@ uint16_t stackAvailable()
 }
 #endif
 
+uint32_t nextMixerTime[NUM_MODULES];
+
 void mixerTask(void * pdata)
 {
+  static uint32_t lastRunTime;
   s_pulses_paused = true;
 
   while(1) {
@@ -102,15 +105,42 @@ void mixerTask(void * pdata)
       return;
 #endif
 
+    CoTickDelay(1);
+
+    uint32_t now = CoGetOSTime();
+    bool run = false;
+    if ((now - lastRunTime) > 10) {     // run at least every 20ms
+      run = true;
+    }
+    else if (now == nextMixerTime[0]) {
+      run = true;
+    }
+#if NUM_MODULES >= 2
+    else if (now == nextMixerTime[1]) {
+      run = true;
+    }
+#endif
+    if (!run) {
+      continue;  // go back to sleep
+    }
+
+    lastRunTime = now;
+
     if (!s_pulses_paused) {
       uint16_t t0 = getTmr2MHz();
 
+      DEBUG_TIMER_START(debugTimerMixer);
       CoEnterMutexSection(mixerMutex);
       doMixerCalculations();
+      DEBUG_TIMER_START(debugTimerMixerCalcToUsage);
+      DEBUG_TIMER_SAMPLE(debugTimerMixerIterval);
       CoLeaveMutexSection(mixerMutex);
+      DEBUG_TIMER_STOP(debugTimerMixer);
 
 #if defined(FRSKY) || defined(MAVLINK)
+      DEBUG_TIMER_START(debugTimerTelemetryWakeup);
       telemetryWakeup();
+      DEBUG_TIMER_STOP(debugTimerTelemetryWakeup);
 #endif
 
       if (heartbeat == HEART_WDT_CHECK) {
@@ -121,12 +151,18 @@ void mixerTask(void * pdata)
       t0 = getTmr2MHz() - t0;
       if (t0 > maxMixerDuration) maxMixerDuration = t0 ;
     }
-
-    CoTickDelay(1);  // 2ms for now
   }
 }
 
-#define MENU_TASK_PERIOD_TICKS      10    // 20ms
+void scheduleNextMixerCalculation(uint8_t module, uint16_t delay)
+{
+  // Schedule next mixer calculation time, 
+  // for now assume mixer calculation takes 2 ms.
+  nextMixerTime[module] = (uint32_t)CoGetOSTime() + (delay)/2 - 1/*2ms*/;
+  DEBUG_TIMER_STOP(debugTimerMixerCalcToUsage);
+}
+
+#define MENU_TASK_PERIOD_TICKS      25    // 50ms
 
 void menusTask(void * pdata)
 {
@@ -145,10 +181,12 @@ void menusTask(void * pdata)
 #else
   while (pwrCheck() != e_power_off) {
 #endif
-    U64 start = CoGetOSTime();
+    uint32_t start = (uint32_t)CoGetOSTime();
+    DEBUG_TIMER_START(debugTimerPerMain);
     perMain();
+    DEBUG_TIMER_STOP(debugTimerPerMain);
     // TODO remove completely massstorage from sky9x firmware
-    U32 runtime = (U32)(CoGetOSTime() - start);
+    uint32_t runtime = ((uint32_t)CoGetOSTime() - start);
     // deduct the thread run-time from the wait, if run-time was more than
     // desired period, then skip the wait all together
     if (runtime < MENU_TASK_PERIOD_TICKS) {
diff --git a/radio/src/tasks_arm.h b/radio/src/tasks_arm.h
index d01a516b7..b26bd1795 100644
--- a/radio/src/tasks_arm.h
+++ b/radio/src/tasks_arm.h
@@ -71,6 +71,11 @@ extern TaskStack<MIXER_STACK_SIZE> mixerStack;
 extern OS_TID audioTaskId;
 extern TaskStack<AUDIO_STACK_SIZE> audioStack;
 
+#if defined(BLUETOOTH)
+extern OS_TID btTaskId;
+extern TaskStack<BLUETOOTH_STACK_SIZE> bluetoothStack;
+#endif
+
 void tasksStart();
 
 #endif // _TASKS_ARM_H_
diff --git a/radio/src/telemetry/crossfire.h b/radio/src/telemetry/crossfire.h
index 5fa88a513..37afb7e0b 100644
--- a/radio/src/telemetry/crossfire.h
+++ b/radio/src/telemetry/crossfire.h
@@ -21,7 +21,10 @@
 #ifndef _CROSSFIRE_H_
 #define _CROSSFIRE_H_
 
-#define LINK_STATS_ID  0x14
+#define BROADCAST_ADDRESS              0x00
+
+#define LINK_STATS_ID                  0x14
+#define CHANNELS_ID                    0x16
 
 void processCrossfireTelemetryData(uint8_t data);
 void crossfireSetDefault(int index, uint8_t id, uint8_t subId);
diff --git a/radio/src/thirdparty/CoOS/kernel/task.c b/radio/src/thirdparty/CoOS/kernel/task.c
index a1b36555d..91eab5eaa 100644
--- a/radio/src/thirdparty/CoOS/kernel/task.c
+++ b/radio/src/thirdparty/CoOS/kernel/task.c
@@ -39,6 +39,7 @@
 
 /*---------------------------- Include ---------------------------------------*/
 #include <coocox.h>
+#include "debug.h"
 
 /*---------------------------- Variable Define -------------------------------*/
 
@@ -790,7 +791,12 @@ void Schedule(void)
         CoStkOverflowHook(pCurTcb->taskID);       /* Yes,call handler         */		
     }   
 #endif
- 	
+
+
+#if defined(DEBUG_TASKS)
+    CoTaskSwitchHook(pRdyTcb->taskID);
+#endif
+
     SwitchContext();                              /* Call task context switch */
 }
 
diff --git a/radio/src/thirdparty/CoOS/portable/arch.c b/radio/src/thirdparty/CoOS/portable/arch.c
index 9ea864356..30a970230 100644
--- a/radio/src/thirdparty/CoOS/portable/arch.c
+++ b/radio/src/thirdparty/CoOS/portable/arch.c
@@ -37,6 +37,8 @@
 
 /*---------------------------- Include ---------------------------------------*/
 #include <coocox.h>
+#include "debug.h"
+
 U64     OSTickCnt = 0;                  /*!< Current system tick counter      */ 																			 
 
 /**
@@ -90,6 +92,7 @@ OS_STK *InitTaskContext(FUNCPtr task,void *param,OS_STK *pstk)
  */ 
 void SysTick_Handler(void)
 {
+    DEBUG_INTERRUPT(INT_TICK);
     OSSchedLock++;                  /* Lock scheduler.                        */
     OSTickCnt++;                    /* Increment systerm time.                */
 #if CFG_TASK_WAITTING_EN >0    
diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp
index fd545efd6..f1d29b048 100644
--- a/radio/src/translations.cpp
+++ b/radio/src/translations.cpp
@@ -248,7 +248,7 @@ const pm_char STR_PERSISTENT[] PROGMEM = TR_PERSISTENT;
 const pm_char STR_BACKLIGHT_LABEL[] PROGMEM = TR_BACKLIGHT_LABEL;
 const pm_char STR_BLDELAY[] PROGMEM = TR_BLDELAY;
 
-#if defined(PWM_BACKLIGHT)
+#if defined(PWM_BACKLIGHT) || defined(PCBHORUS)
 const pm_char STR_BLONBRIGHTNESS[] PROGMEM = TR_BLONBRIGHTNESS;
 const pm_char STR_BLOFFBRIGHTNESS[] PROGMEM = TR_BLOFFBRIGHTNESS;
 #endif
@@ -616,9 +616,9 @@ const pm_char STR_REMOVE_SCREEN[] PROGMEM = TR_REMOVE_SCREEN;
   const pm_char STR_MODULE[] PROGMEM = TR_MODULE;
   const pm_char STR_ENABLE_POPUP[] PROGMEM = TR_ENABLE_POPUP;
   const pm_char STR_DISABLE_POPUP[] PROGMEM = TR_DISABLE_POPUP;
-const pm_char STR_POPUP[] PROGMEM = TR_POPUP;
-const pm_char STR_MIN[] PROGMEM = TR_MIN;
-const pm_char STR_MAX[] PROGMEM = TR_MAX;
+  const pm_char STR_POPUP[] PROGMEM = TR_POPUP;
+  const pm_char STR_MIN[] PROGMEM = TR_MIN;
+  const pm_char STR_MAX[] PROGMEM = TR_MAX;
   const pm_char STR_CURVE_PRESET[] PROGMEM = TR_CURVE_PRESET;
   const pm_char STR_PRESET[] PROGMEM = TR_PRESET;
   const pm_char STR_MIRROR[] PROGMEM = TR_MIRROR;
@@ -652,13 +652,13 @@ const pm_char STR_MAX[] PROGMEM = TR_MAX;
   const pm_char STR_MENU_HELI[] PROGMEM = TR_MENU_HELI;
   const pm_char STR_MENU_TRIMS[] PROGMEM = TR_MENU_TRIMS;
   const pm_char STR_MENU_SWITCHES[] PROGMEM = TR_MENU_SWITCHES;
-const pm_char STR_MENU_LOGICAL_SWITCHES[] PROGMEM = TR_MENU_LOGICAL_SWITCHES;
+  const pm_char STR_MENU_LOGICAL_SWITCHES[] PROGMEM = TR_MENU_LOGICAL_SWITCHES;
   const pm_char STR_MENU_TRAINER[] PROGMEM = TR_MENU_TRAINER;
   const pm_char STR_MENU_CHANNELS[] PROGMEM = TR_MENU_CHANNELS;
   const pm_char STR_MENU_GVARS[] PROGMEM = TR_MENU_GVARS;
   const pm_char STR_MENU_TELEMETRY[] PROGMEM = TR_MENU_TELEMETRY;
-const pm_char STR_MENU_OTHER[] PROGMEM = TR_MENU_OTHER;
-const pm_char STR_MENU_INVERT[] PROGMEM = TR_MENU_INVERT;
+  const pm_char STR_MENU_OTHER[] PROGMEM = TR_MENU_OTHER;
+  const pm_char STR_MENU_INVERT[] PROGMEM = TR_MENU_INVERT;
 #endif
 
 #if MENUS_LOCK == 1
diff --git a/radio/src/translations.h b/radio/src/translations.h
index dde661065..4e39a64e4 100644
--- a/radio/src/translations.h
+++ b/radio/src/translations.h
@@ -465,7 +465,7 @@ extern const pm_char STR_BEEPCOUNTDOWN[];
 extern const pm_char STR_PERSISTENT[];
 extern const pm_char STR_BACKLIGHT_LABEL[];
 extern const pm_char STR_BLDELAY[];
-#if defined(PWM_BACKLIGHT)
+#if defined(PWM_BACKLIGHT) || defined(PCBHORUS)
 extern const pm_char STR_BLONBRIGHTNESS[];
 extern const pm_char STR_BLOFFBRIGHTNESS[];
 #endif
diff --git a/radio/util/font2png.py b/radio/util/font2png.py
index da05af48d..62ea0b275 100755
--- a/radio/util/font2png.py
+++ b/radio/util/font2png.py
@@ -10,36 +10,15 @@ app = Qt.QApplication(sys.argv)
 for f in glob.glob("fonts/*.ttf"):
     QtGui.QFontDatabase.addApplicationFont(f)
 
-chars = u""" !"#$%&'()*+,-./0123456789:;<=>?°ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz~ ≥→←↑↓↗↘↙↖△"""
+chars_en = u""" !"#$%&'()*+,-./0123456789:;<=>?°ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz~ ≥→←↑↓↗↘↙↖△"""
+chars_fr = u"""éèàîç"""
 
+COUNT_EXTRA_CHARS = 12
 
-def getCharWidth(fontsize, metrics, index):
-    if index == 0:
-        return 4
-    elif index == 14 and fontsize <= 8:
-        return 1
-    else:
-        rect = metrics.boundingRect(chars[index])
-        if fontsize >= 24:
-            return rect.width() + 3
-        else:
-            return rect.width() + 1
+chars_extra = u"".join([chr(1+i) for i in range(COUNT_EXTRA_CHARS)])
+chars = chars_en + chars_extra + chars_fr
 
-
-def getFontTopBottom(fontsize, metrics):
-    top, bottom = 0, 0
-    for i, c in enumerate(chars):
-        rect = metrics.boundingRect(chars[i])
-        top = min(top, rect.top())
-        bottom = max(bottom, rect.bottom())
-    return top, bottom
-
-
-def getFontWidth(fontsize, metrics):
-    width = 0
-    for i, c in enumerate(chars):
-        width += getCharWidth(fontsize, metrics, i)
-    return width
+print len(chars_en + chars_extra)
 
 
 def createFontBitmap(filename, fontname, fontsize, fontbold, foreground, background, coordsfile=True):
@@ -51,16 +30,46 @@ def createFontBitmap(filename, fontname, fontsize, fontbold, foreground, backgro
     font.setStyleStrategy(QtGui.QFont.PreferAntialias)
     metrics = QtGui.QFontMetrics(font)
 
-    width = getFontWidth(fontsize, metrics)
-    top, bottom = getFontTopBottom(fontsize, metrics)
     extraFilename = "fonts/extra_%dpx.png" % fontsize
     extraImage = QtGui.QImage(extraFilename)
     if extraImage.isNull():
         print("No extra font file", extraFilename)
+        extraImage = None
         extraWidth = 0
     else:
-        extraWidth = extraImage.size().width()
-    image = QtGui.QImage(width + extraWidth, fontsize + 2, QtGui.QImage.Format_RGB32)
+        extraWidth = extraImage.size().width() / COUNT_EXTRA_CHARS
+
+    def getCharWidth(c):
+        if c in chars_extra:
+            return extraWidth
+        elif c == " ":
+            return 4
+        elif c == "." and fontsize <= 8:
+            return 1
+        else:
+            r = metrics.boundingRect(c)
+            if fontsize >= 24:
+                return r.width() + 3
+            else:
+                return r.width() + 1
+
+    def getFontWidth():
+        width = 0
+        for c in chars:
+            width += getCharWidth(c)
+        return width
+
+    def getFontTopBottom():
+        top, bottom = 0, 0
+        for i, c in enumerate(chars):
+            r = metrics.boundingRect(chars[i])
+            top = min(top, r.top())
+            bottom = max(bottom, r.bottom())
+        return top, bottom
+
+    width = getFontWidth()
+    top, bottom = getFontTopBottom()
+    image = QtGui.QImage(width, fontsize + 2, QtGui.QImage.Format_RGB32)
     image.fill(background)
     painter = QtGui.QPainter()
     painter.begin(image)
@@ -68,11 +77,14 @@ def createFontBitmap(filename, fontname, fontsize, fontbold, foreground, backgro
     pen = QtGui.QPen(foreground)
     painter.setPen(pen)
     width = 0
-    for i, c in enumerate(chars):
+    for c in chars:
         coords.append(width)
-        if i == 0:
+        if c in chars_extra:
+            if extraImage and c == chars_extra[0]:
+                painter.drawImage(QtCore.QPoint(width, 0), extraImage)
+        elif c == " ":
             pass
-        elif i == 14 and fontsize <= 8:
+        elif c == "." and fontsize <= 8:
             painter.drawPoint(width, fontsize)
         else:
             rect = metrics.boundingRect(c)
@@ -80,9 +92,7 @@ def createFontBitmap(filename, fontname, fontsize, fontbold, foreground, backgro
                 painter.drawText(width - rect.left() + 1, fontsize - 2, c)  # fontsize-bottom+1 -17 / 7
             else:
                 painter.drawText(width - rect.left(), fontsize - 1, c)  # fontsize-bottom+1 -17 / 7
-        width += getCharWidth(fontsize, metrics, i)
-    if extraWidth:
-        painter.drawImage(QtCore.QPoint(width, 0), extraImage)
+        width += getCharWidth(c)
 
     coords.append(width)
     painter.end()
@@ -90,8 +100,7 @@ def createFontBitmap(filename, fontname, fontsize, fontbold, foreground, backgro
     if coordsfile:
         with open(filename + ".specs", "w") as f:
             f.write(",".join(str(tmp) for tmp in coords))
-            for i in range(1, 14):
-                f.write(", %d" % (int(coords[-1]) + i * (extraWidth / 12)))
+
     return coords
 
 if __name__ == "__main__":