From 751be2200706ecc46be1c28a251a9291dccb657c Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphael.coeffic@frafos.com>
Date: Sat, 15 May 2021 01:13:11 +0200
Subject: [PATCH] Moved default theme masks into firmware

---
 radio/src/bitmaps/480x272/CMakeLists.txt      |   5 +-
 .../480x272/default_theme/mask_back.png       | Bin 0 -> 1056 bytes
 .../default_theme}/mask_currentmenu_bg.png    | Bin
 .../default_theme}/mask_currentmenu_dot.png   | Bin
 .../mask_currentmenu_shadow.png               | Bin
 .../default_theme}/mask_menu_model.png        | Bin
 .../default_theme}/mask_menu_radio.png        | Bin
 .../default_theme}/mask_menu_stats.png        | Bin
 .../default_theme}/mask_menu_theme.png        | Bin
 .../default_theme}/mask_model_curves.png      | Bin
 .../mask_model_flight_modes.png               | Bin
 .../default_theme}/mask_model_gvars.png       | Bin
 .../default_theme}/mask_model_heli.png        | Bin
 .../default_theme}/mask_model_inputs.png      | Bin
 .../mask_model_logical_switches.png           | Bin
 .../default_theme}/mask_model_lua_scripts.png | Bin
 .../default_theme}/mask_model_mixer.png       | Bin
 .../default_theme}/mask_model_outputs.png     | Bin
 .../default_theme}/mask_model_setup.png       | Bin
 .../mask_model_special_functions.png          | Bin
 .../default_theme}/mask_model_telemetry.png   | Bin
 .../480x272/default_theme}/mask_monitor.png   | Bin
 .../default_theme}/mask_monitor_channels1.png | Bin
 .../default_theme}/mask_monitor_channels2.png | Bin
 .../default_theme}/mask_monitor_channels3.png | Bin
 .../default_theme}/mask_monitor_channels4.png | Bin
 .../default_theme}/mask_monitor_gvars.png     | Bin
 .../default_theme}/mask_monitor_inver.png     | Bin
 .../default_theme}/mask_monitor_lockch.png    | Bin
 .../default_theme}/mask_monitor_logsw.png     | Bin
 .../default_theme}/mask_monitor_mixes1.png    | Bin
 .../default_theme}/mask_monitor_mixes2.png    | Bin
 .../480x272/default_theme}/mask_mplex_add.png | Bin
 .../default_theme}/mask_mplex_multi.png       | Bin
 .../default_theme}/mask_mplex_replace.png     | Bin
 .../480x272/default_theme/mask_next.png       | Bin 0 -> 1053 bytes
 .../480x272/default_theme}/mask_opentx.png    | Bin
 .../default_theme}/mask_opentx_testmode.png   | Bin
 .../default_theme}/mask_radio_calibration.png | Bin
 .../mask_radio_global_functions.png           | Bin
 .../default_theme}/mask_radio_hardware.png    | Bin
 .../default_theme}/mask_radio_sd_browser.png  | Bin
 .../default_theme}/mask_radio_setup.png       | Bin
 .../default_theme}/mask_radio_tools.png       | Bin
 .../default_theme}/mask_radio_trainer.png     | Bin
 .../default_theme}/mask_radio_version.png     | Bin
 .../default_theme}/mask_sbar_mixer.png        | Bin
 .../default_theme}/mask_sbar_output.png       | Bin
 .../480x272/default_theme}/mask_sbar_to.png   | Bin
 .../default_theme}/mask_stats_analogs.png     | Bin
 .../default_theme}/mask_stats_debug.png       | Bin
 .../480x272/default_theme}/mask_stats_lua.png | Bin
 .../mask_stats_throttle_graph.png             | Bin
 .../default_theme}/mask_stats_timers.png      | Bin
 .../default_theme}/mask_stats_value.png       | Bin
 .../480x272/default_theme}/mask_switches.png  | Bin
 .../default_theme}/mask_textline_curve.png    | Bin
 .../default_theme}/mask_textline_delay.png    | Bin
 .../mask_textline_delayslow.png               | Bin
 .../default_theme}/mask_textline_fm.png       | Bin
 .../default_theme}/mask_textline_label.png    | Bin
 .../default_theme}/mask_textline_slow.png     | Bin
 .../default_theme}/mask_textline_switch.png   | Bin
 .../default_theme}/mask_theme_add_view.png    | Bin
 .../default_theme}/mask_theme_setup.png       | Bin
 .../default_theme}/mask_theme_view1.png       | Bin
 .../default_theme}/mask_theme_view2.png       | Bin
 .../default_theme}/mask_theme_view3.png       | Bin
 .../default_theme}/mask_theme_view4.png       | Bin
 .../default_theme}/mask_theme_view5.png       | Bin
 .../default_theme}/mask_theme_view6.png       | Bin
 .../default_theme}/mask_theme_view7.png       | Bin
 .../default_theme}/mask_theme_view8.png       | Bin
 .../480x272/default_theme/mask_topleft.png    | Bin 0 -> 526 bytes
 radio/src/gui/colorlcd/themes/480_bitmaps.h   | 219 ++++++++++++++++++
 radio/src/gui/colorlcd/themes/480_default.cpp | 130 ++++++-----
 76 files changed, 295 insertions(+), 59 deletions(-)
 create mode 100755 radio/src/bitmaps/480x272/default_theme/mask_back.png
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_currentmenu_bg.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_currentmenu_dot.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_currentmenu_shadow.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_menu_model.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_menu_radio.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_menu_stats.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_menu_theme.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_model_curves.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_model_flight_modes.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_model_gvars.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_model_heli.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_model_inputs.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_model_logical_switches.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_model_lua_scripts.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_model_mixer.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_model_outputs.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_model_setup.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_model_special_functions.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_model_telemetry.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_monitor.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_monitor_channels1.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_monitor_channels2.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_monitor_channels3.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_monitor_channels4.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_monitor_gvars.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_monitor_inver.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_monitor_lockch.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_monitor_logsw.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_monitor_mixes1.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_monitor_mixes2.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_mplex_add.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_mplex_multi.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_mplex_replace.png (100%)
 create mode 100644 radio/src/bitmaps/480x272/default_theme/mask_next.png
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_opentx.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_opentx_testmode.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_radio_calibration.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_radio_global_functions.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_radio_hardware.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_radio_sd_browser.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_radio_setup.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_radio_tools.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_radio_trainer.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_radio_version.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_sbar_mixer.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_sbar_output.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_sbar_to.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_stats_analogs.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_stats_debug.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_stats_lua.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_stats_throttle_graph.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_stats_timers.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_stats_value.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_switches.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_textline_curve.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_textline_delay.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_textline_delayslow.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_textline_fm.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_textline_label.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_textline_slow.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_textline_switch.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_theme_add_view.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_theme_setup.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_theme_view1.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_theme_view2.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_theme_view3.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_theme_view4.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_theme_view5.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_theme_view6.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_theme_view7.png (100%)
 rename radio/{sdcard/horus/THEMES/EdgeTX => src/bitmaps/480x272/default_theme}/mask_theme_view8.png (100%)
 create mode 100644 radio/src/bitmaps/480x272/default_theme/mask_topleft.png
 create mode 100644 radio/src/gui/colorlcd/themes/480_bitmaps.h

diff --git a/radio/src/bitmaps/480x272/CMakeLists.txt b/radio/src/bitmaps/480x272/CMakeLists.txt
index 2233da191..7231592d4 100644
--- a/radio/src/bitmaps/480x272/CMakeLists.txt
+++ b/radio/src/bitmaps/480x272/CMakeLists.txt
@@ -27,9 +27,12 @@ add_bitmaps_target(${BITMAP_TARGET_PREFIX}_alpha_calibration_bitmaps "${RADIO_SR
 add_bitmaps_target(${BITMAP_TARGET_PREFIX}_masks ${RADIO_SRC_DIR}/bitmaps/480x272/mask_*.png 8bits "${MASK_ARGS}")
 add_bitmaps_target(${BITMAP_TARGET_PREFIX}_slider_masks "${RADIO_SRC_DIR}/bitmaps/480x272/slider/*.png" 8bits "${MASK_ARGS}")
 add_bitmaps_target(${BITMAP_TARGET_PREFIX}_layouts_masks "${RADIO_SRC_DIR}/gui/colorlcd/layouts/*.png" 8bits "${MASK_ARGS}")
-add_bitmaps_target(${BITMAP_TARGET_PREFIX}_themes_bitmaps "${RADIO_SRC_DIR}/gui/colorlcd/themes/*.png" "5/6/5" "${BITMAPS_ARGS}")
 add_bitmaps_target(${BITMAP_TARGET_PREFIX}_fonts ${RADIO_SRC_DIR}/fonts/truetype/*.png 8bits "${MASK_RLE_ARGS}")
 add_bitmaps_target(${BITMAP_TARGET_PREFIX}_volume_masks ${RADIO_SRC_DIR}/bitmaps/480x272/volume/*.png 8bits "${MASK_ARGS}")
+
+add_bitmaps_target(${BITMAP_TARGET_PREFIX}_themes_masks "${RADIO_SRC_DIR}/bitmaps/480x272/default_theme/mask_*.png" 8bits "${BITMAPS_ARGS}")
+add_bitmaps_target(${BITMAP_TARGET_PREFIX}_themes_alpha "${RADIO_SRC_DIR}/bitmaps/480x272/default_theme/alpha_*.png" "4/4/4/4" "${BITMAPS_ARGS}")
+
 add_bitmaps_target(${BITMAP_TARGET_PREFIX}_bootloader_bitmaps ${RADIO_SRC_DIR}/bitmaps/480x272/bootloader/bmp_*.png "4/4/4/4" "${BITMAP_RLE_ARGS}")
 add_bitmaps_target(${BITMAP_TARGET_PREFIX}_bootloader_icons ${RADIO_SRC_DIR}/bitmaps/480x272/bootloader/icon_*.png 8bits "${MASK_ARGS}")
 
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_back.png b/radio/src/bitmaps/480x272/default_theme/mask_back.png
new file mode 100755
index 0000000000000000000000000000000000000000..ffd31b820f51305f67edb8a59176ecb9e080d523
GIT binary patch
literal 1056
zcmV+*1mF9KP)<h;3K|Lk000e1NJLTq001Na001Ni0ssI2ZekD500009a7bBm000XU
z000XU0RWnu7ytkO2XskIMF-*r2@Vk&!8KiD0000TX;fHrLvL+uWo~o;00000Lvm$d
zbY)~9cWHEJAV*0}P-HG;2LJ#AmPtfGR7l6Im%mTyY!t_RN-3=khzyj3nADa;qfvt~
z5fc)YPOc&@#OR<KF0N|$FK{w3)`7vr4L6km6OD_JYKV;v#!!O+!jG2zc!%Efl6$$(
z_T`LEa{A#p&-a|~0ce^wVk<;Z<az$->8V<+hC-p~>1n^;4*=+wquB~smhbQHH#ava
ziV6mU48xqCpNpc{Kg$kGQ525jwzs!E9uEKj0N{4JcXxNczrXt@!d9!Nsw&U(nM~&L
z^0Hp9>#rb5QngwYMX`S_WQn9{TBTB9SvH%^{`~ytBmltJ*x1a>jMwWOoNqqb?KaD@
zG)+U$uU`oO@Or(;Wb)zRK~a>Uy;-NzxxT($US5V_*dUFMkMHd4a2zMg^1v^Qn3vz(
z-QDWys>|gvs)C|uJRavbZs46Pz;yX-Y;52-ZjfLYURhbm=ksRnWEQ3<N~u&zrBYt6
z*XUV?!!bKMo6Tn1?Y8-c7ywgMRS<-9IvofE3=#xEBuO40A6F_BRaJ)uYqeTuXJ-^e
zb;~ah2pk<9mCI$5Ph|=wNm4GC3x~rFhof8QsZ^>|Dp@7<gUPa7C=_C`7=j>%C@>6L
zUtc#bKT|M8QJ$Zl*Vfj$h3<4ZW3gDFP%tk)Q?R$Ux2>(M(b3Uvp@+laTrMX`l4du0
z!!9l^NRsR}CxReOPEJ~_mi9lQ_aOfK{4^%I9teW?{eELm*^AyVnx+YY=)PIGTs}QL
z<#}FJRogH}I-UOe6h%>0RXL7pG#dK-6h-;^`a%$7VPOHoumSdO$zoJht<`FoOok*$
zqn#lLq9}@GSxY0zRG;aC>hSQ;=kpo&fMGZiiQL}a+Ef2X{}KH1@{&j-P!#R1u<gDc
z8E9kqd_EG1bnDRe#Of`O-(rOzf*^1le|&tbR;#*LL{WTye@75xZf?$!SO&m!>k0;g
zold7%EH)Yq{jk|=etdjPOiWBoO<8C@lTQ7&f7%d>*&RgR4C3+lA7V))60fhX!`wmo
zh{fmg9UL48f?&q7E$@wg7`LTPw+8!Hr$?jFLZL9QnAX;B0D#ZuOD2;H!x+9Q%W|<;
zyt%oNBx#ttzFs$)ruX*t!r`#f>C_K9osJ*~^?H5CFun7ZmX`MS_ZJrz-EKFAVUv@S
zp-{-}cK1)TX@&@bFbsp^_|?@_tyY_#pN~eP-K$aWSFrszS8u*ntJQ2aJsywC<uWAt
aulNsuhMm;I!Zld{0000<MNUMnLSTZ?EbIjU

literal 0
HcmV?d00001

diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_currentmenu_bg.png b/radio/src/bitmaps/480x272/default_theme/mask_currentmenu_bg.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_currentmenu_bg.png
rename to radio/src/bitmaps/480x272/default_theme/mask_currentmenu_bg.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_currentmenu_dot.png b/radio/src/bitmaps/480x272/default_theme/mask_currentmenu_dot.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_currentmenu_dot.png
rename to radio/src/bitmaps/480x272/default_theme/mask_currentmenu_dot.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_currentmenu_shadow.png b/radio/src/bitmaps/480x272/default_theme/mask_currentmenu_shadow.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_currentmenu_shadow.png
rename to radio/src/bitmaps/480x272/default_theme/mask_currentmenu_shadow.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_menu_model.png b/radio/src/bitmaps/480x272/default_theme/mask_menu_model.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_menu_model.png
rename to radio/src/bitmaps/480x272/default_theme/mask_menu_model.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_menu_radio.png b/radio/src/bitmaps/480x272/default_theme/mask_menu_radio.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_menu_radio.png
rename to radio/src/bitmaps/480x272/default_theme/mask_menu_radio.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_menu_stats.png b/radio/src/bitmaps/480x272/default_theme/mask_menu_stats.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_menu_stats.png
rename to radio/src/bitmaps/480x272/default_theme/mask_menu_stats.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_menu_theme.png b/radio/src/bitmaps/480x272/default_theme/mask_menu_theme.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_menu_theme.png
rename to radio/src/bitmaps/480x272/default_theme/mask_menu_theme.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_model_curves.png b/radio/src/bitmaps/480x272/default_theme/mask_model_curves.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_model_curves.png
rename to radio/src/bitmaps/480x272/default_theme/mask_model_curves.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_model_flight_modes.png b/radio/src/bitmaps/480x272/default_theme/mask_model_flight_modes.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_model_flight_modes.png
rename to radio/src/bitmaps/480x272/default_theme/mask_model_flight_modes.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_model_gvars.png b/radio/src/bitmaps/480x272/default_theme/mask_model_gvars.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_model_gvars.png
rename to radio/src/bitmaps/480x272/default_theme/mask_model_gvars.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_model_heli.png b/radio/src/bitmaps/480x272/default_theme/mask_model_heli.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_model_heli.png
rename to radio/src/bitmaps/480x272/default_theme/mask_model_heli.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_model_inputs.png b/radio/src/bitmaps/480x272/default_theme/mask_model_inputs.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_model_inputs.png
rename to radio/src/bitmaps/480x272/default_theme/mask_model_inputs.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_model_logical_switches.png b/radio/src/bitmaps/480x272/default_theme/mask_model_logical_switches.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_model_logical_switches.png
rename to radio/src/bitmaps/480x272/default_theme/mask_model_logical_switches.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_model_lua_scripts.png b/radio/src/bitmaps/480x272/default_theme/mask_model_lua_scripts.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_model_lua_scripts.png
rename to radio/src/bitmaps/480x272/default_theme/mask_model_lua_scripts.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_model_mixer.png b/radio/src/bitmaps/480x272/default_theme/mask_model_mixer.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_model_mixer.png
rename to radio/src/bitmaps/480x272/default_theme/mask_model_mixer.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_model_outputs.png b/radio/src/bitmaps/480x272/default_theme/mask_model_outputs.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_model_outputs.png
rename to radio/src/bitmaps/480x272/default_theme/mask_model_outputs.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_model_setup.png b/radio/src/bitmaps/480x272/default_theme/mask_model_setup.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_model_setup.png
rename to radio/src/bitmaps/480x272/default_theme/mask_model_setup.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_model_special_functions.png b/radio/src/bitmaps/480x272/default_theme/mask_model_special_functions.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_model_special_functions.png
rename to radio/src/bitmaps/480x272/default_theme/mask_model_special_functions.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_model_telemetry.png b/radio/src/bitmaps/480x272/default_theme/mask_model_telemetry.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_model_telemetry.png
rename to radio/src/bitmaps/480x272/default_theme/mask_model_telemetry.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_monitor.png b/radio/src/bitmaps/480x272/default_theme/mask_monitor.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_monitor.png
rename to radio/src/bitmaps/480x272/default_theme/mask_monitor.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_monitor_channels1.png b/radio/src/bitmaps/480x272/default_theme/mask_monitor_channels1.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_monitor_channels1.png
rename to radio/src/bitmaps/480x272/default_theme/mask_monitor_channels1.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_monitor_channels2.png b/radio/src/bitmaps/480x272/default_theme/mask_monitor_channels2.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_monitor_channels2.png
rename to radio/src/bitmaps/480x272/default_theme/mask_monitor_channels2.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_monitor_channels3.png b/radio/src/bitmaps/480x272/default_theme/mask_monitor_channels3.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_monitor_channels3.png
rename to radio/src/bitmaps/480x272/default_theme/mask_monitor_channels3.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_monitor_channels4.png b/radio/src/bitmaps/480x272/default_theme/mask_monitor_channels4.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_monitor_channels4.png
rename to radio/src/bitmaps/480x272/default_theme/mask_monitor_channels4.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_monitor_gvars.png b/radio/src/bitmaps/480x272/default_theme/mask_monitor_gvars.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_monitor_gvars.png
rename to radio/src/bitmaps/480x272/default_theme/mask_monitor_gvars.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_monitor_inver.png b/radio/src/bitmaps/480x272/default_theme/mask_monitor_inver.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_monitor_inver.png
rename to radio/src/bitmaps/480x272/default_theme/mask_monitor_inver.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_monitor_lockch.png b/radio/src/bitmaps/480x272/default_theme/mask_monitor_lockch.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_monitor_lockch.png
rename to radio/src/bitmaps/480x272/default_theme/mask_monitor_lockch.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_monitor_logsw.png b/radio/src/bitmaps/480x272/default_theme/mask_monitor_logsw.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_monitor_logsw.png
rename to radio/src/bitmaps/480x272/default_theme/mask_monitor_logsw.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_monitor_mixes1.png b/radio/src/bitmaps/480x272/default_theme/mask_monitor_mixes1.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_monitor_mixes1.png
rename to radio/src/bitmaps/480x272/default_theme/mask_monitor_mixes1.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_monitor_mixes2.png b/radio/src/bitmaps/480x272/default_theme/mask_monitor_mixes2.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_monitor_mixes2.png
rename to radio/src/bitmaps/480x272/default_theme/mask_monitor_mixes2.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_mplex_add.png b/radio/src/bitmaps/480x272/default_theme/mask_mplex_add.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_mplex_add.png
rename to radio/src/bitmaps/480x272/default_theme/mask_mplex_add.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_mplex_multi.png b/radio/src/bitmaps/480x272/default_theme/mask_mplex_multi.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_mplex_multi.png
rename to radio/src/bitmaps/480x272/default_theme/mask_mplex_multi.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_mplex_replace.png b/radio/src/bitmaps/480x272/default_theme/mask_mplex_replace.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_mplex_replace.png
rename to radio/src/bitmaps/480x272/default_theme/mask_mplex_replace.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_next.png b/radio/src/bitmaps/480x272/default_theme/mask_next.png
new file mode 100644
index 0000000000000000000000000000000000000000..848019e8e1d5c512e6ffcde992ea5a6f86e053bd
GIT binary patch
literal 1053
zcmV+&1mgRNP)<h;3K|Lk000e1NJLTq001Na001Ni0ssI2ZekD500009a7bBm000XU
z000XU0RWnu7ytkO2XskIMF-*s5fKa|K#!hT0000TX;fHrLvL+uWo~o;00000Lvm$d
zbY)~9cWHEJAV*0}P-HG;2LJ#AlSxEDR7l6Im%UHwZWPD+w7^5rwm>2h5)+CJzK|Fu
zXkzT<;NT)J3yCfc#xT06!GFO;on<j`HX&g#GT@*jnm{#$gwc`^CE=yem*2omZ*%Vz
z+Wt6O8^ZTFJ)iSE=K-p!B4a~Q6j2o0?Y7J1!f_nKFaQ8zDQpv!IF2h63a_uPBuQ><
zZ7~c(lB7jFb!_x{z3c1i_4Rce#|eUnMx%Fkcl~}}wG<P?1VK1HJ|;<WbTYf$&M-`|
zSd=8mf*3kJZ-OA^=H~2n`{;2v9G1)Fi;Ig|t)?i7*{?W3%;9isZf>rutk`V7sw;|O
zp-{->a;;WtB3$NbrmAYc-_PZ8p->1#f1M0P(NHLKb8}<1c$38xMQJvhCnqOfulF~^
zHd`zfGg~~w$d6=M{`mMvCX-I5Q`2)go$+{_<2YHCrzxhYsw7E|kB_lfOe-D$!0mQt
zG8vxd4eDXpY}OD+C^|nsKRY{HE|<T*zei|@qS$COAcWy?7{~F6oo-YNK@beX0)c=i
ziq&eh)9H*}cDvn1qp`5Cu)MsiC2gI?KZ?imd?u4|yWJLGLCm^<EXy3nB@&50U`ZyE
z@9*#9i-%ZnoqxjO^?FZFPn*rAqA1f8`>E4|!QkcPWxL(}NzVizf5X!4cHiFKdcEGL
z_U(52<>f_D6q=?fiu%8R{N3q^L;^yn{Tl#ab#?Xr{@#k~kMBI1ruX*td_JH4=%1gT
zwOY-J>yHmfk_15*3<mnl2!aR%0#oQSeGCSJd_EtEMD)Gva=G^R_v`igG-;G1sZ=Vl
zEUV2`1VJE#ySuxUO68|+L#&}O>T4Xw^<$Q0*;1)A#z(9;h~`+D^I{kliA3`G{9rJc
znuEx)EC|Bc*_q$(*Oauu-Rt$H=8cM?v|6pJtE*rzs2K+U!0-2Gv)S=RWm>G?@890u
zuC1+M7-nsLnwZqZVv%7OJ?JwtGpSU{_-23@$1fg_>&FU&aC>|E>FLS%&Vv}qiQ~9~
zg9DGpqd{S_*`m?t!^6XHIGoycCCl>j^K&|#)`O0s=;GpHE|;6~-q`7M&d<+%KA&F6
zIDY0_|Lg0kQmJU`6ac{E@uX6zbUN+zdd*&(CWt`@DT;D98~}ikqwnnO93CFhG_AGT
z)GmVrL9i@auh*;9Dui%jW8>)PXlZH5f)autVEj#FbVcJhj^}xbqQc=YP1E|(Y%2Z(
XqZ5q}{x}}+00000NkvXXu0mjfq#OU5

literal 0
HcmV?d00001

diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_opentx.png b/radio/src/bitmaps/480x272/default_theme/mask_opentx.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_opentx.png
rename to radio/src/bitmaps/480x272/default_theme/mask_opentx.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_opentx_testmode.png b/radio/src/bitmaps/480x272/default_theme/mask_opentx_testmode.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_opentx_testmode.png
rename to radio/src/bitmaps/480x272/default_theme/mask_opentx_testmode.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_radio_calibration.png b/radio/src/bitmaps/480x272/default_theme/mask_radio_calibration.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_radio_calibration.png
rename to radio/src/bitmaps/480x272/default_theme/mask_radio_calibration.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_radio_global_functions.png b/radio/src/bitmaps/480x272/default_theme/mask_radio_global_functions.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_radio_global_functions.png
rename to radio/src/bitmaps/480x272/default_theme/mask_radio_global_functions.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_radio_hardware.png b/radio/src/bitmaps/480x272/default_theme/mask_radio_hardware.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_radio_hardware.png
rename to radio/src/bitmaps/480x272/default_theme/mask_radio_hardware.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_radio_sd_browser.png b/radio/src/bitmaps/480x272/default_theme/mask_radio_sd_browser.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_radio_sd_browser.png
rename to radio/src/bitmaps/480x272/default_theme/mask_radio_sd_browser.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_radio_setup.png b/radio/src/bitmaps/480x272/default_theme/mask_radio_setup.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_radio_setup.png
rename to radio/src/bitmaps/480x272/default_theme/mask_radio_setup.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_radio_tools.png b/radio/src/bitmaps/480x272/default_theme/mask_radio_tools.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_radio_tools.png
rename to radio/src/bitmaps/480x272/default_theme/mask_radio_tools.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_radio_trainer.png b/radio/src/bitmaps/480x272/default_theme/mask_radio_trainer.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_radio_trainer.png
rename to radio/src/bitmaps/480x272/default_theme/mask_radio_trainer.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_radio_version.png b/radio/src/bitmaps/480x272/default_theme/mask_radio_version.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_radio_version.png
rename to radio/src/bitmaps/480x272/default_theme/mask_radio_version.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_sbar_mixer.png b/radio/src/bitmaps/480x272/default_theme/mask_sbar_mixer.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_sbar_mixer.png
rename to radio/src/bitmaps/480x272/default_theme/mask_sbar_mixer.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_sbar_output.png b/radio/src/bitmaps/480x272/default_theme/mask_sbar_output.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_sbar_output.png
rename to radio/src/bitmaps/480x272/default_theme/mask_sbar_output.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_sbar_to.png b/radio/src/bitmaps/480x272/default_theme/mask_sbar_to.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_sbar_to.png
rename to radio/src/bitmaps/480x272/default_theme/mask_sbar_to.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_stats_analogs.png b/radio/src/bitmaps/480x272/default_theme/mask_stats_analogs.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_stats_analogs.png
rename to radio/src/bitmaps/480x272/default_theme/mask_stats_analogs.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_stats_debug.png b/radio/src/bitmaps/480x272/default_theme/mask_stats_debug.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_stats_debug.png
rename to radio/src/bitmaps/480x272/default_theme/mask_stats_debug.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_stats_lua.png b/radio/src/bitmaps/480x272/default_theme/mask_stats_lua.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_stats_lua.png
rename to radio/src/bitmaps/480x272/default_theme/mask_stats_lua.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_stats_throttle_graph.png b/radio/src/bitmaps/480x272/default_theme/mask_stats_throttle_graph.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_stats_throttle_graph.png
rename to radio/src/bitmaps/480x272/default_theme/mask_stats_throttle_graph.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_stats_timers.png b/radio/src/bitmaps/480x272/default_theme/mask_stats_timers.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_stats_timers.png
rename to radio/src/bitmaps/480x272/default_theme/mask_stats_timers.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_stats_value.png b/radio/src/bitmaps/480x272/default_theme/mask_stats_value.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_stats_value.png
rename to radio/src/bitmaps/480x272/default_theme/mask_stats_value.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_switches.png b/radio/src/bitmaps/480x272/default_theme/mask_switches.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_switches.png
rename to radio/src/bitmaps/480x272/default_theme/mask_switches.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_textline_curve.png b/radio/src/bitmaps/480x272/default_theme/mask_textline_curve.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_textline_curve.png
rename to radio/src/bitmaps/480x272/default_theme/mask_textline_curve.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_textline_delay.png b/radio/src/bitmaps/480x272/default_theme/mask_textline_delay.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_textline_delay.png
rename to radio/src/bitmaps/480x272/default_theme/mask_textline_delay.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_textline_delayslow.png b/radio/src/bitmaps/480x272/default_theme/mask_textline_delayslow.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_textline_delayslow.png
rename to radio/src/bitmaps/480x272/default_theme/mask_textline_delayslow.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_textline_fm.png b/radio/src/bitmaps/480x272/default_theme/mask_textline_fm.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_textline_fm.png
rename to radio/src/bitmaps/480x272/default_theme/mask_textline_fm.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_textline_label.png b/radio/src/bitmaps/480x272/default_theme/mask_textline_label.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_textline_label.png
rename to radio/src/bitmaps/480x272/default_theme/mask_textline_label.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_textline_slow.png b/radio/src/bitmaps/480x272/default_theme/mask_textline_slow.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_textline_slow.png
rename to radio/src/bitmaps/480x272/default_theme/mask_textline_slow.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_textline_switch.png b/radio/src/bitmaps/480x272/default_theme/mask_textline_switch.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_textline_switch.png
rename to radio/src/bitmaps/480x272/default_theme/mask_textline_switch.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_theme_add_view.png b/radio/src/bitmaps/480x272/default_theme/mask_theme_add_view.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_theme_add_view.png
rename to radio/src/bitmaps/480x272/default_theme/mask_theme_add_view.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_theme_setup.png b/radio/src/bitmaps/480x272/default_theme/mask_theme_setup.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_theme_setup.png
rename to radio/src/bitmaps/480x272/default_theme/mask_theme_setup.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_theme_view1.png b/radio/src/bitmaps/480x272/default_theme/mask_theme_view1.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_theme_view1.png
rename to radio/src/bitmaps/480x272/default_theme/mask_theme_view1.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_theme_view2.png b/radio/src/bitmaps/480x272/default_theme/mask_theme_view2.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_theme_view2.png
rename to radio/src/bitmaps/480x272/default_theme/mask_theme_view2.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_theme_view3.png b/radio/src/bitmaps/480x272/default_theme/mask_theme_view3.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_theme_view3.png
rename to radio/src/bitmaps/480x272/default_theme/mask_theme_view3.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_theme_view4.png b/radio/src/bitmaps/480x272/default_theme/mask_theme_view4.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_theme_view4.png
rename to radio/src/bitmaps/480x272/default_theme/mask_theme_view4.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_theme_view5.png b/radio/src/bitmaps/480x272/default_theme/mask_theme_view5.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_theme_view5.png
rename to radio/src/bitmaps/480x272/default_theme/mask_theme_view5.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_theme_view6.png b/radio/src/bitmaps/480x272/default_theme/mask_theme_view6.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_theme_view6.png
rename to radio/src/bitmaps/480x272/default_theme/mask_theme_view6.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_theme_view7.png b/radio/src/bitmaps/480x272/default_theme/mask_theme_view7.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_theme_view7.png
rename to radio/src/bitmaps/480x272/default_theme/mask_theme_view7.png
diff --git a/radio/sdcard/horus/THEMES/EdgeTX/mask_theme_view8.png b/radio/src/bitmaps/480x272/default_theme/mask_theme_view8.png
similarity index 100%
rename from radio/sdcard/horus/THEMES/EdgeTX/mask_theme_view8.png
rename to radio/src/bitmaps/480x272/default_theme/mask_theme_view8.png
diff --git a/radio/src/bitmaps/480x272/default_theme/mask_topleft.png b/radio/src/bitmaps/480x272/default_theme/mask_topleft.png
new file mode 100644
index 0000000000000000000000000000000000000000..603bfe1cfc8988218a602a6277b323dca5656c56
GIT binary patch
literal 526
zcmV+p0`dKcP)<h;3K|Lk000e1NJLTq001oj001or1^@s6IvV1d00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10gFjQK~z|U)tNDlf<P38e^^ayt-!|4(nC-hVuJ@TA$pI!2gbw%
zPC#Kx%NgvfsHjPZzHN4l3pmVHZ{AD3gc+vz^XH#om;nH?i7d-#tiUa@OArL|L_3Z{
zx7$rC+J$9BL^z#J<Kt|@_kC*HR*usEP*oN3JlBq4cXo))W+P`JDqPp4`~5B_9suxs
zK5;&uKfY&o^%KkGk{*wToOmd%*Q-3yQ54A&J)KUeswx>1QB~WvxLhv1es(v<SglsF
z;-M&tLQXtXB}ww9&F-QJv)PR5x|Zd1(=<ra^wnl}(UkRiO+-Y_Z-<yF%MxDzzPW|`
zx5PQUSS%oBBB~0*P@dCeSpu+NRWL=Z9-`uLJRV=q><*eB@{73J?J%FuUu||5O?cns
zi4fi0Pm74h;c)2nu{)_l<UiteyM^a@y?%B#b%;Cn_;kW#bv)uYhU*SXWOsB3-KnXy
zqIKuf*2d#~b2L=!u67Z5=d$1LF_}!XW7wU2$K)Q-I?*OKw${aCXmix9A8Q^x3&5Y7
Q#sB~S07*qoM6N<$g6+)dE&u=k

literal 0
HcmV?d00001

diff --git a/radio/src/gui/colorlcd/themes/480_bitmaps.h b/radio/src/gui/colorlcd/themes/480_bitmaps.h
new file mode 100644
index 000000000..06cd21f5f
--- /dev/null
+++ b/radio/src/gui/colorlcd/themes/480_bitmaps.h
@@ -0,0 +1,219 @@
+const uint8_t mask_next[] = {
+#include "mask_next.lbm"
+};
+const uint8_t mask_back[] = {
+#include "mask_back.lbm"
+};
+const uint8_t mask_currentmenu_bg[] = {
+#include "mask_currentmenu_bg.lbm"
+};
+const uint8_t mask_currentmenu_dot[] = {
+#include "mask_currentmenu_dot.lbm"
+};
+const uint8_t mask_currentmenu_shadow[] = {
+#include "mask_currentmenu_shadow.lbm"
+};
+const uint8_t mask_menu_model[] = {
+#include "mask_menu_model.lbm"
+};
+const uint8_t mask_menu_radio[] = {
+#include "mask_menu_radio.lbm"
+};
+const uint8_t mask_menu_stats[] = {
+#include "mask_menu_stats.lbm"
+};
+const uint8_t mask_menu_theme[] = {
+#include "mask_menu_theme.lbm"
+};
+const uint8_t mask_model_curves[] = {
+#include "mask_model_curves.lbm"
+};
+const uint8_t mask_model_flight_modes[] = {
+#include "mask_model_flight_modes.lbm"
+};
+const uint8_t mask_model_gvars[] = {
+#include "mask_model_gvars.lbm"
+};
+const uint8_t mask_model_heli[] = {
+#include "mask_model_heli.lbm"
+};
+const uint8_t mask_model_inputs[] = {
+#include "mask_model_inputs.lbm"
+};
+const uint8_t mask_model_logical_switches[] = {
+#include "mask_model_logical_switches.lbm"
+};
+const uint8_t mask_model_lua_scripts[] = {
+#include "mask_model_lua_scripts.lbm"
+};
+const uint8_t mask_model_mixer[] = {
+#include "mask_model_mixer.lbm"
+};
+const uint8_t mask_model_outputs[] = {
+#include "mask_model_outputs.lbm"
+};
+const uint8_t mask_model_setup[] = {
+#include "mask_model_setup.lbm"
+};
+const uint8_t mask_model_special_functions[] = {
+#include "mask_model_special_functions.lbm"
+};
+const uint8_t mask_model_telemetry[] = {
+#include "mask_model_telemetry.lbm"
+};
+const uint8_t mask_monitor[] = {
+#include "mask_monitor.lbm"
+};
+const uint8_t mask_monitor_channels1[] = {
+#include "mask_monitor_channels1.lbm"
+};
+const uint8_t mask_monitor_channels2[] = {
+#include "mask_monitor_channels2.lbm"
+};
+const uint8_t mask_monitor_channels3[] = {
+#include "mask_monitor_channels3.lbm"
+};
+const uint8_t mask_monitor_channels4[] = {
+#include "mask_monitor_channels4.lbm"
+};
+const uint8_t mask_monitor_gvars[] = {
+#include "mask_monitor_gvars.lbm"
+};
+const uint8_t mask_monitor_inver[] = {
+#include "mask_monitor_inver.lbm"
+};
+const uint8_t mask_monitor_lockch[] = {
+#include "mask_monitor_lockch.lbm"
+};
+const uint8_t mask_monitor_logsw[] = {
+#include "mask_monitor_logsw.lbm"
+};
+const uint8_t mask_monitor_mixes1[] = {
+#include "mask_monitor_mixes1.lbm"
+};
+const uint8_t mask_monitor_mixes2[] = {
+#include "mask_monitor_mixes2.lbm"
+};
+const uint8_t mask_mplex_add[] = {
+#include "mask_mplex_add.lbm"
+};
+const uint8_t mask_mplex_multi[] = {
+#include "mask_mplex_multi.lbm"
+};
+const uint8_t mask_mplex_replace[] = {
+#include "mask_mplex_replace.lbm"
+};
+const uint8_t mask_topleft[] = {
+#include "mask_topleft.lbm"
+};
+const uint8_t mask_edgetx[] = {
+#include "mask_edgetx.lbm"
+};
+const uint8_t mask_opentx_testmode[] = {
+#include "mask_opentx_testmode.lbm"
+};
+const uint8_t mask_radio_calibration[] = {
+#include "mask_radio_calibration.lbm"
+};
+const uint8_t mask_radio_global_functions[] = {
+#include "mask_radio_global_functions.lbm"
+};
+const uint8_t mask_radio_hardware[] = {
+#include "mask_radio_hardware.lbm"
+};
+const uint8_t mask_radio_sd_browser[] = {
+#include "mask_radio_sd_browser.lbm"
+};
+const uint8_t mask_radio_setup[] = {
+#include "mask_radio_setup.lbm"
+};
+const uint8_t mask_radio_tools[] = {
+#include "mask_radio_tools.lbm"
+};
+const uint8_t mask_radio_trainer[] = {
+#include "mask_radio_trainer.lbm"
+};
+const uint8_t mask_radio_version[] = {
+#include "mask_radio_version.lbm"
+};
+const uint8_t mask_sbar_mixer[] = {
+#include "mask_sbar_mixer.lbm"
+};
+const uint8_t mask_sbar_output[] = {
+#include "mask_sbar_output.lbm"
+};
+const uint8_t mask_sbar_to[] = {
+#include "mask_sbar_to.lbm"
+};
+const uint8_t mask_stats_analogs[] = {
+#include "mask_stats_analogs.lbm"
+};
+const uint8_t mask_stats_debug[] = {
+#include "mask_stats_debug.lbm"
+};
+const uint8_t mask_stats_lua[] = {
+#include "mask_stats_lua.lbm"
+};
+const uint8_t mask_stats_throttle_graph[] = {
+#include "mask_stats_throttle_graph.lbm"
+};
+const uint8_t mask_stats_timers[] = {
+#include "mask_stats_timers.lbm"
+};
+const uint8_t mask_stats_value[] = {
+#include "mask_stats_value.lbm"
+};
+const uint8_t mask_switches[] = {
+#include "mask_switches.lbm"
+};
+const uint8_t mask_textline_curve[] = {
+#include "mask_textline_curve.lbm"
+};
+const uint8_t mask_textline_delay[] = {
+#include "mask_textline_delay.lbm"
+};
+const uint8_t mask_textline_delayslow[] = {
+#include "mask_textline_delayslow.lbm"
+};
+const uint8_t mask_textline_fm[] = {
+#include "mask_textline_fm.lbm"
+};
+const uint8_t mask_textline_label[] = {
+#include "mask_textline_label.lbm"
+};
+const uint8_t mask_textline_slow[] = {
+#include "mask_textline_slow.lbm"
+};
+const uint8_t mask_textline_switch[] = {
+#include "mask_textline_switch.lbm"
+};
+const uint8_t mask_theme_add_view[] = {
+#include "mask_theme_add_view.lbm"
+};
+const uint8_t mask_theme_setup[] = {
+#include "mask_theme_setup.lbm"
+};
+const uint8_t mask_theme_view1[] = {
+#include "mask_theme_view1.lbm"
+};
+const uint8_t mask_theme_view2[] = {
+#include "mask_theme_view2.lbm"
+};
+const uint8_t mask_theme_view3[] = {
+#include "mask_theme_view3.lbm"
+};
+const uint8_t mask_theme_view4[] = {
+#include "mask_theme_view4.lbm"
+};
+const uint8_t mask_theme_view5[] = {
+#include "mask_theme_view5.lbm"
+};
+const uint8_t mask_theme_view6[] = {
+#include "mask_theme_view6.lbm"
+};
+const uint8_t mask_theme_view7[] = {
+#include "mask_theme_view7.lbm"
+};
+const uint8_t mask_theme_view8[] = {
+#include "mask_theme_view8.lbm"
+};
diff --git a/radio/src/gui/colorlcd/themes/480_default.cpp b/radio/src/gui/colorlcd/themes/480_default.cpp
index 15bf75507..2f7866cf3 100644
--- a/radio/src/gui/colorlcd/themes/480_default.cpp
+++ b/radio/src/gui/colorlcd/themes/480_default.cpp
@@ -20,6 +20,7 @@
 
 #include "opentx.h"
 #include "tabsgroup.h"
+#include "480_bitmaps.h"
 
 const ZoneOption OPTIONS_THEME_DEFAULT[] = {
   { STR_BACKGROUND_COLOR, ZoneOption::Color, OPTION_VALUE_UNSIGNED(WHITE) },
@@ -80,10 +81,9 @@ class Theme480: public OpenTxTheme
       lcdColorTable[TRIM_SHADOW_COLOR_INDEX] = BLACK;
     }
 
-    void loadMenuIcon(uint8_t index, const char * filename, uint32_t color=MENU_COLOR) const
+    void loadMenuIcon(uint8_t index, const uint8_t * lbm, uint32_t color=MENU_COLOR) const
     {
-      TRACE("loadMenuIcon %s", getFilePath(filename));
-      BitmapBuffer * mask = BitmapBuffer::loadMask(getFilePath(filename));
+      BitmapBuffer * mask = BitmapBuffer::load8bitMask(lbm);
       if (mask) {
         delete iconMask[index];
         iconMask[index] = mask;
@@ -107,76 +107,90 @@ class Theme480: public OpenTxTheme
     void loadIcons() const
     {
 #if defined(LOG_TELEMETRY) || !defined(WATCHDOG)
-      loadMenuIcon(ICON_OPENTX, "mask_opentx_testmode.png", DEFAULT_COLOR);
+      loadMenuIcon(ICON_OPENTX, mask_opentx_testmode, DEFAULT_COLOR);
 #else
-      loadMenuIcon(ICON_OPENTX, "mask_edgetx.png");
+      loadMenuIcon(ICON_OPENTX, mask_edgetx);
 #endif
-#if defined(HARDWARE_TOUCH)
-      loadMenuIcon(ICON_NEXT, "mask_next.png");
-      loadMenuIcon(ICON_BACK, "mask_back.png");
+#if defined(HARDWARE_TOUCH) //TODO: get rid of, and use a real hitbox instead...
+      loadMenuIcon(ICON_NEXT, mask_next);
+      loadMenuIcon(ICON_BACK, mask_back);
 #endif
-      loadMenuIcon(ICON_RADIO, "mask_menu_radio.png");
-      loadMenuIcon(ICON_RADIO_SETUP, "mask_radio_setup.png");
-      loadMenuIcon(ICON_RADIO_SD_MANAGER, "mask_radio_sd_browser.png");
-      loadMenuIcon(ICON_RADIO_TOOLS, "mask_radio_tools.png");
-      loadMenuIcon(ICON_RADIO_SPECTRUM_ANALYSER, "/mask_radio_spectrum_analyser.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_CALIBRATION, "mask_radio_calibration.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");
-      loadMenuIcon(ICON_MONITOR, "mask_monitor.png");
-      loadMenuIcon(ICON_MONITOR_CHANNELS1, "mask_monitor_channels1.png");
-      loadMenuIcon(ICON_MONITOR_CHANNELS2, "mask_monitor_channels2.png");
-      loadMenuIcon(ICON_MONITOR_CHANNELS3, "mask_monitor_channels3.png");
-      loadMenuIcon(ICON_MONITOR_CHANNELS4, "mask_monitor_channels4.png");
-      loadMenuIcon(ICON_MONITOR_LOGICAL_SWITCHES, "mask_monitor_logsw.png");
+      loadMenuIcon(ICON_RADIO, mask_menu_radio);
+      loadMenuIcon(ICON_RADIO_SETUP, mask_radio_setup);
+      loadMenuIcon(ICON_RADIO_SD_MANAGER, mask_radio_sd_browser);
+      loadMenuIcon(ICON_RADIO_TOOLS, mask_radio_tools);
+      //loadMenuIcon(ICON_RADIO_SPECTRUM_ANALYSER, mask_radio_spectrum_analyser);
+      loadMenuIcon(ICON_RADIO_GLOBAL_FUNCTIONS, mask_radio_global_functions);
+      loadMenuIcon(ICON_RADIO_TRAINER, mask_radio_trainer);
+      loadMenuIcon(ICON_RADIO_HARDWARE, mask_radio_hardware);
+      loadMenuIcon(ICON_RADIO_CALIBRATION, mask_radio_calibration);
+      loadMenuIcon(ICON_RADIO_VERSION, mask_radio_version);
+      loadMenuIcon(ICON_MODEL, mask_menu_model);
+      loadMenuIcon(ICON_MODEL_SETUP, mask_model_setup);
+      loadMenuIcon(ICON_MODEL_HELI, mask_model_heli);
+      loadMenuIcon(ICON_MODEL_FLIGHT_MODES, mask_model_flight_modes);
+      loadMenuIcon(ICON_MODEL_INPUTS, mask_model_inputs);
+      loadMenuIcon(ICON_MODEL_MIXER, mask_model_mixer);
+      loadMenuIcon(ICON_MODEL_OUTPUTS, mask_model_outputs);
+      loadMenuIcon(ICON_MODEL_CURVES, mask_model_curves);
+      loadMenuIcon(ICON_MODEL_GVARS, mask_model_gvars);
+      loadMenuIcon(ICON_MODEL_LOGICAL_SWITCHES, mask_model_logical_switches);
+      loadMenuIcon(ICON_MODEL_SPECIAL_FUNCTIONS, mask_model_special_functions);
+      loadMenuIcon(ICON_MODEL_LUA_SCRIPTS, mask_model_lua_scripts);
+      loadMenuIcon(ICON_MODEL_TELEMETRY, mask_model_telemetry);
+      loadMenuIcon(ICON_STATS, mask_menu_stats);
+      loadMenuIcon(ICON_STATS_THROTTLE_GRAPH, mask_stats_throttle_graph);
+      loadMenuIcon(ICON_STATS_TIMERS, mask_stats_timers);
+      loadMenuIcon(ICON_STATS_ANALOGS, mask_stats_analogs);
+      loadMenuIcon(ICON_STATS_DEBUG, mask_stats_debug);
+      loadMenuIcon(ICON_THEME, mask_menu_theme);
+      loadMenuIcon(ICON_THEME_SETUP, mask_theme_setup);
+      loadMenuIcon(ICON_THEME_VIEW1, mask_theme_view1);
+      loadMenuIcon(ICON_THEME_VIEW2, mask_theme_view2);
+      loadMenuIcon(ICON_THEME_VIEW3, mask_theme_view3);
+      loadMenuIcon(ICON_THEME_VIEW4, mask_theme_view4);
+      loadMenuIcon(ICON_THEME_VIEW5, mask_theme_view5);
+      loadMenuIcon(ICON_THEME_ADD_VIEW, mask_theme_add_view);
+      loadMenuIcon(ICON_MONITOR, mask_monitor);
+      loadMenuIcon(ICON_MONITOR_CHANNELS1, mask_monitor_channels1);
+      loadMenuIcon(ICON_MONITOR_CHANNELS2, mask_monitor_channels2);
+      loadMenuIcon(ICON_MONITOR_CHANNELS3, mask_monitor_channels3);
+      loadMenuIcon(ICON_MONITOR_CHANNELS4, mask_monitor_channels4);
+      loadMenuIcon(ICON_MONITOR_LOGICAL_SWITCHES, mask_monitor_logsw);
 
-      BitmapBuffer * background = BitmapBuffer::loadMask(getFilePath("mask_currentmenu_bg.png"));
-      BitmapBuffer * shadow = BitmapBuffer::loadMask(getFilePath("mask_currentmenu_shadow.png"));
-      BitmapBuffer * dot = BitmapBuffer::loadMask(getFilePath("mask_currentmenu_dot.png"));
+      BitmapBuffer * background = BitmapBuffer::load8bitMask(mask_currentmenu_bg);
+      BitmapBuffer * shadow = BitmapBuffer::load8bitMask(mask_currentmenu_shadow);
+      BitmapBuffer * dot = BitmapBuffer::load8bitMask(mask_currentmenu_dot);
 
       if (!currentMenuBackground) {
         currentMenuBackground = new BitmapBuffer(BMP_RGB565, 36, 53);
       }
 
       if (currentMenuBackground) {
-        currentMenuBackground->drawSolidFilledRect(0, 0, currentMenuBackground->width(), MENU_HEADER_HEIGHT, MENU_BGCOLOR);
-        currentMenuBackground->drawSolidFilledRect(0, MENU_HEADER_HEIGHT, currentMenuBackground->width(), MENU_TITLE_TOP - MENU_HEADER_HEIGHT, DEFAULT_BGCOLOR);
-        currentMenuBackground->drawSolidFilledRect(0, MENU_TITLE_TOP, currentMenuBackground->width(), currentMenuBackground->height() - MENU_TITLE_TOP, TITLE_BGCOLOR);
-        currentMenuBackground->drawMask(0, 0, background, HEADER_CURRENT_BGCOLOR);
+
+        currentMenuBackground->drawSolidFilledRect(
+            0, 0, currentMenuBackground->width(), MENU_HEADER_HEIGHT,
+            MENU_BGCOLOR);
+
+        currentMenuBackground->drawSolidFilledRect(
+            0, MENU_HEADER_HEIGHT, currentMenuBackground->width(),
+            MENU_TITLE_TOP - MENU_HEADER_HEIGHT, DEFAULT_BGCOLOR);
+
+        currentMenuBackground->drawSolidFilledRect(
+            0, MENU_TITLE_TOP, currentMenuBackground->width(),
+            currentMenuBackground->height() - 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_COLOR);
       }
 
       delete topleftBitmap;
-      topleftBitmap = BitmapBuffer::loadMaskOnBackground(getFilePath("topleft.png"), TITLE_BGCOLOR, HEADER_COLOR);
+      topleftBitmap = BitmapBuffer::load8bitMaskOnBackground(
+          mask_topleft, TITLE_BGCOLOR, HEADER_COLOR);
 
       delete background;
       delete shadow;