diff --git a/data/ResourceUtil.cpp b/data/ResourceUtil.cpp
index c54676a99..025f219a5 100644
--- a/data/ResourceUtil.cpp
+++ b/data/ResourceUtil.cpp
@@ -1,104 +1,104 @@
-//this file was auto-generated by res2h
+// this file was auto-generated by res2h
 
 #include "Resources.h"
 
-const size_t res2hNrOfFiles = 46;
+const uint32_t res2hNrOfFiles = 46;
 const Res2hEntry res2hFiles[res2hNrOfFiles] = {
-    {":/busy_2.svg", busy_2_svg_size, busy_2_svg_data},
-    {":/frame.png", frame_png_size, frame_png_data},
-    {":/scroll_gradient.png", scroll_gradient_png_size, scroll_gradient_png_data},
-    {":/busy_0.svg", busy_0_svg_size, busy_0_svg_data},
-    {":/star_filled.svg", star_filled_svg_size, star_filled_svg_data},
-    {":/button.png", button_png_size, button_png_data},
-    {":/option_arrow.svg", option_arrow_svg_size, option_arrow_svg_data},
-    {":/on.svg", on_svg_size, on_svg_data},
-    {":/busy_1.svg", busy_1_svg_size, busy_1_svg_data},
-    {":/arrow.svg", arrow_svg_size, arrow_svg_data},
-    {":/textinput_ninepatch.png", textinput_ninepatch_png_size, textinput_ninepatch_png_data},
     {":/splash.svg", splash_svg_size, splash_svg_data},
-    {":/window_icon_256.png", window_icon_256_png_size, window_icon_256_png_data},
-    {":/fav_remove.svg", fav_remove_svg_size, fav_remove_svg_data},
-    {":/slider_knob.svg", slider_knob_svg_size, slider_knob_svg_data},
-    {":/fav_add.svg", fav_add_svg_size, fav_add_svg_data},
-    {":/opensans_hebrew_condensed_regular.ttf", opensans_hebrew_condensed_regular_ttf_size, opensans_hebrew_condensed_regular_ttf_data},
-    {":/off.svg", off_svg_size, off_svg_data},
-    {":/textinput_ninepatch_active.png", textinput_ninepatch_active_png_size, textinput_ninepatch_active_png_data},
-    {":/busy_3.svg", busy_3_svg_size, busy_3_svg_data},
-    {":/star_unfilled.svg", star_unfilled_svg_size, star_unfilled_svg_data},
-    {":/checkbox_checked.svg", checkbox_checked_svg_size, checkbox_checked_svg_data},
-    {":/button_filled.png", button_filled_png_size, button_filled_png_data},
-    {":/checkbox_unchecked.svg", checkbox_unchecked_svg_size, checkbox_unchecked_svg_data},
     {":/opensans_hebrew_condensed_light.ttf", opensans_hebrew_condensed_light_ttf_size, opensans_hebrew_condensed_light_ttf_data},
-    {":/help/dpad_right.svg", help_dpad_right_svg_size, help_dpad_right_svg_data},
-    {":/help/dpad_all.svg", help_dpad_all_svg_size, help_dpad_all_svg_data},
-    {":/help/button_x.svg", help_button_x_svg_size, help_button_x_svg_data},
-    {":/help/dpad_up.svg", help_dpad_up_svg_size, help_dpad_up_svg_data},
-    {":/help/dpad_updown.svg", help_dpad_updown_svg_size, help_dpad_updown_svg_data},
-    {":/help/analog_down.svg", help_analog_down_svg_size, help_analog_down_svg_data},
-    {":/help/button_r.svg", help_button_r_svg_size, help_button_r_svg_data},
-    {":/help/analog_up.svg", help_analog_up_svg_size, help_analog_up_svg_data},
-    {":/help/button_start.svg", help_button_start_svg_size, help_button_start_svg_data},
-    {":/help/button_a.svg", help_button_a_svg_size, help_button_a_svg_data},
-    {":/help/analog_right.svg", help_analog_right_svg_size, help_analog_right_svg_data},
-    {":/help/button_hotkey.svg", help_button_hotkey_svg_size, help_button_hotkey_svg_data},
-    {":/help/dpad_left.svg", help_dpad_left_svg_size, help_dpad_left_svg_data},
-    {":/help/button_select.svg", help_button_select_svg_size, help_button_select_svg_data},
-    {":/help/button_l.svg", help_button_l_svg_size, help_button_l_svg_data},
-    {":/help/analog_left.svg", help_analog_left_svg_size, help_analog_left_svg_data},
-    {":/help/button_b.svg", help_button_b_svg_size, help_button_b_svg_data},
-    {":/help/analog_thumb.svg", help_analog_thumb_svg_size, help_analog_thumb_svg_data},
-    {":/help/dpad_down.svg", help_dpad_down_svg_size, help_dpad_down_svg_data},
-    {":/help/dpad_leftright.svg", help_dpad_leftright_svg_size, help_dpad_leftright_svg_data},
-    {":/help/button_y.svg", help_button_y_svg_size, help_button_y_svg_data}
+    {":/frame.png", frame_png_size, frame_png_data},
+    {":/textinput_ninepatch_active.png", textinput_ninepatch_active_png_size, textinput_ninepatch_active_png_data},
+    {":/window_icon_256.png", window_icon_256_png_size, window_icon_256_png_data},
+    {":/slider_knob.svg", slider_knob_svg_size, slider_knob_svg_data},
+    {":/fav_remove.svg", fav_remove_svg_size, fav_remove_svg_data},
+    {":/off.svg", off_svg_size, off_svg_data},
+    {":/fav_add.svg", fav_add_svg_size, fav_add_svg_data},
+    {":/star_filled.svg", star_filled_svg_size, star_filled_svg_data},
+    {":/busy_0.svg", busy_0_svg_size, busy_0_svg_data},
+    {":/checkbox_unchecked.svg", checkbox_unchecked_svg_size, checkbox_unchecked_svg_data},
+    {":/busy_3.svg", busy_3_svg_size, busy_3_svg_data},
+    {":/textinput_ninepatch.png", textinput_ninepatch_png_size, textinput_ninepatch_png_data},
+    {":/button_filled.png", button_filled_png_size, button_filled_png_data},
+    {":/option_arrow.svg", option_arrow_svg_size, option_arrow_svg_data},
+    {":/busy_1.svg", busy_1_svg_size, busy_1_svg_data},
+    {":/checkbox_checked.svg", checkbox_checked_svg_size, checkbox_checked_svg_data},
+    {":/opensans_hebrew_condensed_regular.ttf", opensans_hebrew_condensed_regular_ttf_size, opensans_hebrew_condensed_regular_ttf_data},
+    {":/star_unfilled.svg", star_unfilled_svg_size, star_unfilled_svg_data},
+    {":/busy_2.svg", busy_2_svg_size, busy_2_svg_data},
+    {":/on.svg", on_svg_size, on_svg_data},
+    {":/button.png", button_png_size, button_png_data},
+    {":/arrow.svg", arrow_svg_size, arrow_svg_data},
+    {":/scroll_gradient.png", scroll_gradient_png_size, scroll_gradient_png_data},
+    {":/help/analog_thumb.svg", help__analog_thumb_svg_size, help__analog_thumb_svg_data},
+    {":/help/button_x.svg", help__button_x_svg_size, help__button_x_svg_data},
+    {":/help/dpad_leftright.svg", help__dpad_leftright_svg_size, help__dpad_leftright_svg_data},
+    {":/help/dpad_right.svg", help__dpad_right_svg_size, help__dpad_right_svg_data},
+    {":/help/dpad_down.svg", help__dpad_down_svg_size, help__dpad_down_svg_data},
+    {":/help/button_y.svg", help__button_y_svg_size, help__button_y_svg_data},
+    {":/help/analog_up.svg", help__analog_up_svg_size, help__analog_up_svg_data},
+    {":/help/button_r.svg", help__button_r_svg_size, help__button_r_svg_data},
+    {":/help/button_b.svg", help__button_b_svg_size, help__button_b_svg_data},
+    {":/help/button_l.svg", help__button_l_svg_size, help__button_l_svg_data},
+    {":/help/button_hotkey.svg", help__button_hotkey_svg_size, help__button_hotkey_svg_data},
+    {":/help/button_start.svg", help__button_start_svg_size, help__button_start_svg_data},
+    {":/help/dpad_all.svg", help__dpad_all_svg_size, help__dpad_all_svg_data},
+    {":/help/button_select.svg", help__button_select_svg_size, help__button_select_svg_data},
+    {":/help/dpad_up.svg", help__dpad_up_svg_size, help__dpad_up_svg_data},
+    {":/help/button_a.svg", help__button_a_svg_size, help__button_a_svg_data},
+    {":/help/dpad_left.svg", help__dpad_left_svg_size, help__dpad_left_svg_data},
+    {":/help/analog_left.svg", help__analog_left_svg_size, help__analog_left_svg_data},
+    {":/help/analog_right.svg", help__analog_right_svg_size, help__analog_right_svg_data},
+    {":/help/analog_down.svg", help__analog_down_svg_size, help__analog_down_svg_data},
+    {":/help/dpad_updown.svg", help__dpad_updown_svg_size, help__dpad_updown_svg_data}
 };
 
 res2hMapType::value_type mapTemp[] = {
-    std::make_pair(":/busy_2.svg", res2hFiles[0]),
-    std::make_pair(":/frame.png", res2hFiles[1]),
-    std::make_pair(":/scroll_gradient.png", res2hFiles[2]),
-    std::make_pair(":/busy_0.svg", res2hFiles[3]),
-    std::make_pair(":/star_filled.svg", res2hFiles[4]),
-    std::make_pair(":/button.png", res2hFiles[5]),
-    std::make_pair(":/option_arrow.svg", res2hFiles[6]),
-    std::make_pair(":/on.svg", res2hFiles[7]),
-    std::make_pair(":/busy_1.svg", res2hFiles[8]),
-    std::make_pair(":/arrow.svg", res2hFiles[9]),
-    std::make_pair(":/textinput_ninepatch.png", res2hFiles[10]),
-    std::make_pair(":/splash.svg", res2hFiles[11]),
-    std::make_pair(":/window_icon_256.png", res2hFiles[12]),
-    std::make_pair(":/fav_remove.svg", res2hFiles[13]),
-    std::make_pair(":/slider_knob.svg", res2hFiles[14]),
-    std::make_pair(":/fav_add.svg", res2hFiles[15]),
-    std::make_pair(":/opensans_hebrew_condensed_regular.ttf", res2hFiles[16]),
-    std::make_pair(":/off.svg", res2hFiles[17]),
-    std::make_pair(":/textinput_ninepatch_active.png", res2hFiles[18]),
-    std::make_pair(":/busy_3.svg", res2hFiles[19]),
-    std::make_pair(":/star_unfilled.svg", res2hFiles[20]),
-    std::make_pair(":/checkbox_checked.svg", res2hFiles[21]),
-    std::make_pair(":/button_filled.png", res2hFiles[22]),
-    std::make_pair(":/checkbox_unchecked.svg", res2hFiles[23]),
-    std::make_pair(":/opensans_hebrew_condensed_light.ttf", res2hFiles[24]),
-    std::make_pair(":/help/dpad_right.svg", res2hFiles[25]),
-    std::make_pair(":/help/dpad_all.svg", res2hFiles[26]),
-    std::make_pair(":/help/button_x.svg", res2hFiles[27]),
-    std::make_pair(":/help/dpad_up.svg", res2hFiles[28]),
-    std::make_pair(":/help/dpad_updown.svg", res2hFiles[29]),
-    std::make_pair(":/help/analog_down.svg", res2hFiles[30]),
-    std::make_pair(":/help/button_r.svg", res2hFiles[31]),
-    std::make_pair(":/help/analog_up.svg", res2hFiles[32]),
-    std::make_pair(":/help/button_start.svg", res2hFiles[33]),
-    std::make_pair(":/help/button_a.svg", res2hFiles[34]),
-    std::make_pair(":/help/analog_right.svg", res2hFiles[35]),
-    std::make_pair(":/help/button_hotkey.svg", res2hFiles[36]),
-    std::make_pair(":/help/dpad_left.svg", res2hFiles[37]),
+    std::make_pair(":/splash.svg", res2hFiles[0]),
+    std::make_pair(":/opensans_hebrew_condensed_light.ttf", res2hFiles[1]),
+    std::make_pair(":/frame.png", res2hFiles[2]),
+    std::make_pair(":/textinput_ninepatch_active.png", res2hFiles[3]),
+    std::make_pair(":/window_icon_256.png", res2hFiles[4]),
+    std::make_pair(":/slider_knob.svg", res2hFiles[5]),
+    std::make_pair(":/fav_remove.svg", res2hFiles[6]),
+    std::make_pair(":/off.svg", res2hFiles[7]),
+    std::make_pair(":/fav_add.svg", res2hFiles[8]),
+    std::make_pair(":/star_filled.svg", res2hFiles[9]),
+    std::make_pair(":/busy_0.svg", res2hFiles[10]),
+    std::make_pair(":/checkbox_unchecked.svg", res2hFiles[11]),
+    std::make_pair(":/busy_3.svg", res2hFiles[12]),
+    std::make_pair(":/textinput_ninepatch.png", res2hFiles[13]),
+    std::make_pair(":/button_filled.png", res2hFiles[14]),
+    std::make_pair(":/option_arrow.svg", res2hFiles[15]),
+    std::make_pair(":/busy_1.svg", res2hFiles[16]),
+    std::make_pair(":/checkbox_checked.svg", res2hFiles[17]),
+    std::make_pair(":/opensans_hebrew_condensed_regular.ttf", res2hFiles[18]),
+    std::make_pair(":/star_unfilled.svg", res2hFiles[19]),
+    std::make_pair(":/busy_2.svg", res2hFiles[20]),
+    std::make_pair(":/on.svg", res2hFiles[21]),
+    std::make_pair(":/button.png", res2hFiles[22]),
+    std::make_pair(":/arrow.svg", res2hFiles[23]),
+    std::make_pair(":/scroll_gradient.png", res2hFiles[24]),
+    std::make_pair(":/help/analog_thumb.svg", res2hFiles[25]),
+    std::make_pair(":/help/button_x.svg", res2hFiles[26]),
+    std::make_pair(":/help/dpad_leftright.svg", res2hFiles[27]),
+    std::make_pair(":/help/dpad_right.svg", res2hFiles[28]),
+    std::make_pair(":/help/dpad_down.svg", res2hFiles[29]),
+    std::make_pair(":/help/button_y.svg", res2hFiles[30]),
+    std::make_pair(":/help/analog_up.svg", res2hFiles[31]),
+    std::make_pair(":/help/button_r.svg", res2hFiles[32]),
+    std::make_pair(":/help/button_b.svg", res2hFiles[33]),
+    std::make_pair(":/help/button_l.svg", res2hFiles[34]),
+    std::make_pair(":/help/button_hotkey.svg", res2hFiles[35]),
+    std::make_pair(":/help/button_start.svg", res2hFiles[36]),
+    std::make_pair(":/help/dpad_all.svg", res2hFiles[37]),
     std::make_pair(":/help/button_select.svg", res2hFiles[38]),
-    std::make_pair(":/help/button_l.svg", res2hFiles[39]),
-    std::make_pair(":/help/analog_left.svg", res2hFiles[40]),
-    std::make_pair(":/help/button_b.svg", res2hFiles[41]),
-    std::make_pair(":/help/analog_thumb.svg", res2hFiles[42]),
-    std::make_pair(":/help/dpad_down.svg", res2hFiles[43]),
-    std::make_pair(":/help/dpad_leftright.svg", res2hFiles[44]),
-    std::make_pair(":/help/button_y.svg", res2hFiles[45])
+    std::make_pair(":/help/dpad_up.svg", res2hFiles[39]),
+    std::make_pair(":/help/button_a.svg", res2hFiles[40]),
+    std::make_pair(":/help/dpad_left.svg", res2hFiles[41]),
+    std::make_pair(":/help/analog_left.svg", res2hFiles[42]),
+    std::make_pair(":/help/analog_right.svg", res2hFiles[43]),
+    std::make_pair(":/help/analog_down.svg", res2hFiles[44]),
+    std::make_pair(":/help/dpad_updown.svg", res2hFiles[45])
 };
 
 res2hMapType res2hMap(mapTemp, mapTemp + sizeof mapTemp / sizeof mapTemp[0]);
diff --git a/data/Resources.h b/data/Resources.h
index 578d07e24..2b286238a 100644
--- a/data/Resources.h
+++ b/data/Resources.h
@@ -1,155 +1,155 @@
-//this file was auto-generated by res2h
+// this file was auto-generated by res2h
 
 #pragma once
 
 #include <string>
 #include <map>
 
-extern const size_t busy_2_svg_size;
-extern const unsigned char busy_2_svg_data[];
+extern const uint16_t splash_svg_size;
+extern const uint8_t splash_svg_data[];
 
-extern const size_t frame_png_size;
-extern const unsigned char frame_png_data[];
+extern const uint16_t opensans_hebrew_condensed_light_ttf_size;
+extern const uint8_t opensans_hebrew_condensed_light_ttf_data[];
 
-extern const size_t scroll_gradient_png_size;
-extern const unsigned char scroll_gradient_png_data[];
+extern const uint16_t frame_png_size;
+extern const uint8_t frame_png_data[];
 
-extern const size_t busy_0_svg_size;
-extern const unsigned char busy_0_svg_data[];
+extern const uint16_t textinput_ninepatch_active_png_size;
+extern const uint8_t textinput_ninepatch_active_png_data[];
 
-extern const size_t star_filled_svg_size;
-extern const unsigned char star_filled_svg_data[];
+extern const uint16_t window_icon_256_png_size;
+extern const uint8_t window_icon_256_png_data[];
 
-extern const size_t button_png_size;
-extern const unsigned char button_png_data[];
+extern const uint16_t slider_knob_svg_size;
+extern const uint8_t slider_knob_svg_data[];
 
-extern const size_t option_arrow_svg_size;
-extern const unsigned char option_arrow_svg_data[];
+extern const uint16_t fav_remove_svg_size;
+extern const uint8_t fav_remove_svg_data[];
 
-extern const size_t on_svg_size;
-extern const unsigned char on_svg_data[];
+extern const uint16_t off_svg_size;
+extern const uint8_t off_svg_data[];
 
-extern const size_t busy_1_svg_size;
-extern const unsigned char busy_1_svg_data[];
+extern const uint16_t fav_add_svg_size;
+extern const uint8_t fav_add_svg_data[];
 
-extern const size_t arrow_svg_size;
-extern const unsigned char arrow_svg_data[];
+extern const uint16_t star_filled_svg_size;
+extern const uint8_t star_filled_svg_data[];
 
-extern const size_t textinput_ninepatch_png_size;
-extern const unsigned char textinput_ninepatch_png_data[];
+extern const uint16_t busy_0_svg_size;
+extern const uint8_t busy_0_svg_data[];
 
-extern const size_t splash_svg_size;
-extern const unsigned char splash_svg_data[];
+extern const uint16_t checkbox_unchecked_svg_size;
+extern const uint8_t checkbox_unchecked_svg_data[];
 
-extern const size_t window_icon_256_png_size;
-extern const unsigned char window_icon_256_png_data[];
+extern const uint16_t busy_3_svg_size;
+extern const uint8_t busy_3_svg_data[];
 
-extern const size_t fav_remove_svg_size;
-extern const unsigned char fav_remove_svg_data[];
+extern const uint16_t textinput_ninepatch_png_size;
+extern const uint8_t textinput_ninepatch_png_data[];
 
-extern const size_t slider_knob_svg_size;
-extern const unsigned char slider_knob_svg_data[];
+extern const uint16_t button_filled_png_size;
+extern const uint8_t button_filled_png_data[];
 
-extern const size_t fav_add_svg_size;
-extern const unsigned char fav_add_svg_data[];
+extern const uint16_t option_arrow_svg_size;
+extern const uint8_t option_arrow_svg_data[];
 
-extern const size_t opensans_hebrew_condensed_regular_ttf_size;
-extern const unsigned char opensans_hebrew_condensed_regular_ttf_data[];
+extern const uint16_t busy_1_svg_size;
+extern const uint8_t busy_1_svg_data[];
 
-extern const size_t off_svg_size;
-extern const unsigned char off_svg_data[];
+extern const uint16_t checkbox_checked_svg_size;
+extern const uint8_t checkbox_checked_svg_data[];
 
-extern const size_t textinput_ninepatch_active_png_size;
-extern const unsigned char textinput_ninepatch_active_png_data[];
+extern const uint16_t opensans_hebrew_condensed_regular_ttf_size;
+extern const uint8_t opensans_hebrew_condensed_regular_ttf_data[];
 
-extern const size_t busy_3_svg_size;
-extern const unsigned char busy_3_svg_data[];
+extern const uint16_t star_unfilled_svg_size;
+extern const uint8_t star_unfilled_svg_data[];
 
-extern const size_t star_unfilled_svg_size;
-extern const unsigned char star_unfilled_svg_data[];
+extern const uint16_t busy_2_svg_size;
+extern const uint8_t busy_2_svg_data[];
 
-extern const size_t checkbox_checked_svg_size;
-extern const unsigned char checkbox_checked_svg_data[];
+extern const uint16_t on_svg_size;
+extern const uint8_t on_svg_data[];
 
-extern const size_t button_filled_png_size;
-extern const unsigned char button_filled_png_data[];
+extern const uint16_t button_png_size;
+extern const uint8_t button_png_data[];
 
-extern const size_t checkbox_unchecked_svg_size;
-extern const unsigned char checkbox_unchecked_svg_data[];
+extern const uint16_t arrow_svg_size;
+extern const uint8_t arrow_svg_data[];
 
-extern const size_t opensans_hebrew_condensed_light_ttf_size;
-extern const unsigned char opensans_hebrew_condensed_light_ttf_data[];
+extern const uint32_t scroll_gradient_png_size;
+extern const uint8_t scroll_gradient_png_data[];
 
-extern const size_t help_dpad_right_svg_size;
-extern const unsigned char help_dpad_right_svg_data[];
+extern const uint16_t help__analog_thumb_svg_size;
+extern const uint8_t help__analog_thumb_svg_data[];
 
-extern const size_t help_dpad_all_svg_size;
-extern const unsigned char help_dpad_all_svg_data[];
+extern const uint16_t help__button_x_svg_size;
+extern const uint8_t help__button_x_svg_data[];
 
-extern const size_t help_button_x_svg_size;
-extern const unsigned char help_button_x_svg_data[];
+extern const uint16_t help__dpad_leftright_svg_size;
+extern const uint8_t help__dpad_leftright_svg_data[];
 
-extern const size_t help_dpad_up_svg_size;
-extern const unsigned char help_dpad_up_svg_data[];
+extern const uint16_t help__dpad_right_svg_size;
+extern const uint8_t help__dpad_right_svg_data[];
 
-extern const size_t help_dpad_updown_svg_size;
-extern const unsigned char help_dpad_updown_svg_data[];
+extern const uint16_t help__dpad_down_svg_size;
+extern const uint8_t help__dpad_down_svg_data[];
 
-extern const size_t help_analog_down_svg_size;
-extern const unsigned char help_analog_down_svg_data[];
+extern const uint16_t help__button_y_svg_size;
+extern const uint8_t help__button_y_svg_data[];
 
-extern const size_t help_button_r_svg_size;
-extern const unsigned char help_button_r_svg_data[];
+extern const uint16_t help__analog_up_svg_size;
+extern const uint8_t help__analog_up_svg_data[];
 
-extern const size_t help_analog_up_svg_size;
-extern const unsigned char help_analog_up_svg_data[];
+extern const uint16_t help__button_r_svg_size;
+extern const uint8_t help__button_r_svg_data[];
 
-extern const size_t help_button_start_svg_size;
-extern const unsigned char help_button_start_svg_data[];
+extern const uint16_t help__button_b_svg_size;
+extern const uint8_t help__button_b_svg_data[];
 
-extern const size_t help_button_a_svg_size;
-extern const unsigned char help_button_a_svg_data[];
+extern const uint16_t help__button_l_svg_size;
+extern const uint8_t help__button_l_svg_data[];
 
-extern const size_t help_analog_right_svg_size;
-extern const unsigned char help_analog_right_svg_data[];
+extern const uint16_t help__button_hotkey_svg_size;
+extern const uint8_t help__button_hotkey_svg_data[];
 
-extern const size_t help_button_hotkey_svg_size;
-extern const unsigned char help_button_hotkey_svg_data[];
+extern const uint16_t help__button_start_svg_size;
+extern const uint8_t help__button_start_svg_data[];
 
-extern const size_t help_dpad_left_svg_size;
-extern const unsigned char help_dpad_left_svg_data[];
+extern const uint16_t help__dpad_all_svg_size;
+extern const uint8_t help__dpad_all_svg_data[];
 
-extern const size_t help_button_select_svg_size;
-extern const unsigned char help_button_select_svg_data[];
+extern const uint16_t help__button_select_svg_size;
+extern const uint8_t help__button_select_svg_data[];
 
-extern const size_t help_button_l_svg_size;
-extern const unsigned char help_button_l_svg_data[];
+extern const uint16_t help__dpad_up_svg_size;
+extern const uint8_t help__dpad_up_svg_data[];
 
-extern const size_t help_analog_left_svg_size;
-extern const unsigned char help_analog_left_svg_data[];
+extern const uint16_t help__button_a_svg_size;
+extern const uint8_t help__button_a_svg_data[];
 
-extern const size_t help_button_b_svg_size;
-extern const unsigned char help_button_b_svg_data[];
+extern const uint16_t help__dpad_left_svg_size;
+extern const uint8_t help__dpad_left_svg_data[];
 
-extern const size_t help_analog_thumb_svg_size;
-extern const unsigned char help_analog_thumb_svg_data[];
+extern const uint16_t help__analog_left_svg_size;
+extern const uint8_t help__analog_left_svg_data[];
 
-extern const size_t help_dpad_down_svg_size;
-extern const unsigned char help_dpad_down_svg_data[];
+extern const uint16_t help__analog_right_svg_size;
+extern const uint8_t help__analog_right_svg_data[];
 
-extern const size_t help_dpad_leftright_svg_size;
-extern const unsigned char help_dpad_leftright_svg_data[];
+extern const uint16_t help__analog_down_svg_size;
+extern const uint8_t help__analog_down_svg_data[];
 
-extern const size_t help_button_y_svg_size;
-extern const unsigned char help_button_y_svg_data[];
+extern const uint16_t help__dpad_updown_svg_size;
+extern const uint8_t help__dpad_updown_svg_data[];
 
 struct Res2hEntry {
     const std::string relativeFileName;
-    const size_t size;
-    const unsigned char * data;
+    const uint32_t size;
+    const uint8_t * data;
 };
 
-extern const size_t res2hNrOfFiles;
+extern const uint32_t res2hNrOfFiles;
 extern const Res2hEntry res2hFiles[];
 
 typedef const std::map<const std::string, const Res2hEntry> res2hMapType;
diff --git a/data/converted/arrow_svg.cpp b/data/converted/arrow_svg.cpp
index 8b9af722e..4e57f4ae1 100644
--- a/data/converted/arrow_svg.cpp
+++ b/data/converted/arrow_svg.cpp
@@ -1,9 +1,9 @@
-//this file was auto-generated from "arrow.svg" by res2h
+// this file was auto-generated from "arrow.svg" by res2h
 
 #include "../Resources.h"
 
-const size_t arrow_svg_size = 838;
-const unsigned char arrow_svg_data[838] = {
+const uint16_t arrow_svg_size = 838;
+const uint8_t arrow_svg_data[838] = {
     0x3c,0x3f,0x78,0x6d,0x6c,0x20,0x76,0x65,0x72,0x73,
     0x69,0x6f,0x6e,0x3d,0x22,0x31,0x2e,0x30,0x22,0x20,
     0x65,0x6e,0x63,0x6f,0x64,0x69,0x6e,0x67,0x3d,0x22,
diff --git a/data/converted/busy_0_svg.cpp b/data/converted/busy_0_svg.cpp
index d7146d82a..f52ef911d 100644
--- a/data/converted/busy_0_svg.cpp
+++ b/data/converted/busy_0_svg.cpp
@@ -1,9 +1,9 @@
-//this file was auto-generated from "busy_0.svg" by res2h
+// this file was auto-generated from "busy_0.svg" by res2h
 
 #include "../Resources.h"
 
-const size_t busy_0_svg_size = 1347;
-const unsigned char busy_0_svg_data[1347] = {
+const uint16_t busy_0_svg_size = 1347;
+const uint8_t busy_0_svg_data[1347] = {
     0x3c,0x3f,0x78,0x6d,0x6c,0x20,0x76,0x65,0x72,0x73,
     0x69,0x6f,0x6e,0x3d,0x22,0x31,0x2e,0x30,0x22,0x20,
     0x65,0x6e,0x63,0x6f,0x64,0x69,0x6e,0x67,0x3d,0x22,
diff --git a/data/converted/busy_1_svg.cpp b/data/converted/busy_1_svg.cpp
index d7f7f6832..3653b6f09 100644
--- a/data/converted/busy_1_svg.cpp
+++ b/data/converted/busy_1_svg.cpp
@@ -1,9 +1,9 @@
-//this file was auto-generated from "busy_1.svg" by res2h
+// this file was auto-generated from "busy_1.svg" by res2h
 
 #include "../Resources.h"
 
-const size_t busy_1_svg_size = 1347;
-const unsigned char busy_1_svg_data[1347] = {
+const uint16_t busy_1_svg_size = 1347;
+const uint8_t busy_1_svg_data[1347] = {
     0x3c,0x3f,0x78,0x6d,0x6c,0x20,0x76,0x65,0x72,0x73,
     0x69,0x6f,0x6e,0x3d,0x22,0x31,0x2e,0x30,0x22,0x20,
     0x65,0x6e,0x63,0x6f,0x64,0x69,0x6e,0x67,0x3d,0x22,
diff --git a/data/converted/busy_2_svg.cpp b/data/converted/busy_2_svg.cpp
index 543b728a9..b803569f8 100644
--- a/data/converted/busy_2_svg.cpp
+++ b/data/converted/busy_2_svg.cpp
@@ -1,9 +1,9 @@
-//this file was auto-generated from "busy_2.svg" by res2h
+// this file was auto-generated from "busy_2.svg" by res2h
 
 #include "../Resources.h"
 
-const size_t busy_2_svg_size = 1347;
-const unsigned char busy_2_svg_data[1347] = {
+const uint16_t busy_2_svg_size = 1347;
+const uint8_t busy_2_svg_data[1347] = {
     0x3c,0x3f,0x78,0x6d,0x6c,0x20,0x76,0x65,0x72,0x73,
     0x69,0x6f,0x6e,0x3d,0x22,0x31,0x2e,0x30,0x22,0x20,
     0x65,0x6e,0x63,0x6f,0x64,0x69,0x6e,0x67,0x3d,0x22,
diff --git a/data/converted/busy_3_svg.cpp b/data/converted/busy_3_svg.cpp
index 49a16d268..4c6a2dc87 100644
--- a/data/converted/busy_3_svg.cpp
+++ b/data/converted/busy_3_svg.cpp
@@ -1,9 +1,9 @@
-//this file was auto-generated from "busy_3.svg" by res2h
+// this file was auto-generated from "busy_3.svg" by res2h
 
 #include "../Resources.h"
 
-const size_t busy_3_svg_size = 1347;
-const unsigned char busy_3_svg_data[1347] = {
+const uint16_t busy_3_svg_size = 1347;
+const uint8_t busy_3_svg_data[1347] = {
     0x3c,0x3f,0x78,0x6d,0x6c,0x20,0x76,0x65,0x72,0x73,
     0x69,0x6f,0x6e,0x3d,0x22,0x31,0x2e,0x30,0x22,0x20,
     0x65,0x6e,0x63,0x6f,0x64,0x69,0x6e,0x67,0x3d,0x22,
diff --git a/data/converted/button_filled_png.cpp b/data/converted/button_filled_png.cpp
index e85f96e5c..2e876b41b 100644
--- a/data/converted/button_filled_png.cpp
+++ b/data/converted/button_filled_png.cpp
@@ -1,9 +1,9 @@
-//this file was auto-generated from "button_filled.png" by res2h
+// this file was auto-generated from "button_filled.png" by res2h
 
 #include "../Resources.h"
 
-const size_t button_filled_png_size = 1168;
-const unsigned char button_filled_png_data[1168] = {
+const uint16_t button_filled_png_size = 1168;
+const uint8_t button_filled_png_data[1168] = {
     0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,
     0x00,0x0d,0x49,0x48,0x44,0x52,0x00,0x00,0x00,0x30,
     0x00,0x00,0x00,0x30,0x08,0x06,0x00,0x00,0x00,0x57,
diff --git a/data/converted/button_png.cpp b/data/converted/button_png.cpp
index 72603af20..9466771fc 100644
--- a/data/converted/button_png.cpp
+++ b/data/converted/button_png.cpp
@@ -1,9 +1,9 @@
-//this file was auto-generated from "button.png" by res2h
+// this file was auto-generated from "button.png" by res2h
 
 #include "../Resources.h"
 
-const size_t button_png_size = 1231;
-const unsigned char button_png_data[1231] = {
+const uint16_t button_png_size = 1231;
+const uint8_t button_png_data[1231] = {
     0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,
     0x00,0x0d,0x49,0x48,0x44,0x52,0x00,0x00,0x00,0x30,
     0x00,0x00,0x00,0x30,0x08,0x06,0x00,0x00,0x00,0x57,
diff --git a/data/converted/checkbox_checked_svg.cpp b/data/converted/checkbox_checked_svg.cpp
index 5a3acb2fb..79726fbbd 100644
--- a/data/converted/checkbox_checked_svg.cpp
+++ b/data/converted/checkbox_checked_svg.cpp
@@ -1,9 +1,9 @@
-//this file was auto-generated from "checkbox_checked.svg" by res2h
+// this file was auto-generated from "checkbox_checked.svg" by res2h
 
 #include "../Resources.h"
 
-const size_t checkbox_checked_svg_size = 1314;
-const unsigned char checkbox_checked_svg_data[1314] = {
+const uint16_t checkbox_checked_svg_size = 1314;
+const uint8_t checkbox_checked_svg_data[1314] = {
     0x3c,0x3f,0x78,0x6d,0x6c,0x20,0x76,0x65,0x72,0x73,
     0x69,0x6f,0x6e,0x3d,0x22,0x31,0x2e,0x30,0x22,0x20,
     0x65,0x6e,0x63,0x6f,0x64,0x69,0x6e,0x67,0x3d,0x22,
diff --git a/data/converted/checkbox_unchecked_svg.cpp b/data/converted/checkbox_unchecked_svg.cpp
index bc31f0374..42e6cadef 100644
--- a/data/converted/checkbox_unchecked_svg.cpp
+++ b/data/converted/checkbox_unchecked_svg.cpp
@@ -1,9 +1,9 @@
-//this file was auto-generated from "checkbox_unchecked.svg" by res2h
+// this file was auto-generated from "checkbox_unchecked.svg" by res2h
 
 #include "../Resources.h"
 
-const size_t checkbox_unchecked_svg_size = 850;
-const unsigned char checkbox_unchecked_svg_data[850] = {
+const uint16_t checkbox_unchecked_svg_size = 850;
+const uint8_t checkbox_unchecked_svg_data[850] = {
     0x3c,0x3f,0x78,0x6d,0x6c,0x20,0x76,0x65,0x72,0x73,
     0x69,0x6f,0x6e,0x3d,0x22,0x31,0x2e,0x30,0x22,0x20,
     0x65,0x6e,0x63,0x6f,0x64,0x69,0x6e,0x67,0x3d,0x22,
diff --git a/data/converted/fav_add_svg.cpp b/data/converted/fav_add_svg.cpp
index 02365f5fe..f82b73067 100644
--- a/data/converted/fav_add_svg.cpp
+++ b/data/converted/fav_add_svg.cpp
@@ -1,9 +1,9 @@
-//this file was auto-generated from "fav_add.svg" by res2h
+// this file was auto-generated from "fav_add.svg" by res2h
 
 #include "../Resources.h"
 
-const size_t fav_add_svg_size = 638;
-const unsigned char fav_add_svg_data[638] = {
+const uint16_t fav_add_svg_size = 638;
+const uint8_t fav_add_svg_data[638] = {
     0x3c,0x3f,0x78,0x6d,0x6c,0x20,0x76,0x65,0x72,0x73,
     0x69,0x6f,0x6e,0x3d,0x22,0x31,0x2e,0x30,0x22,0x20,
     0x65,0x6e,0x63,0x6f,0x64,0x69,0x6e,0x67,0x3d,0x22,
diff --git a/data/converted/fav_remove_svg.cpp b/data/converted/fav_remove_svg.cpp
index 07ea8f759..b62b60710 100644
--- a/data/converted/fav_remove_svg.cpp
+++ b/data/converted/fav_remove_svg.cpp
@@ -1,9 +1,9 @@
-//this file was auto-generated from "fav_remove.svg" by res2h
+// this file was auto-generated from "fav_remove.svg" by res2h
 
 #include "../Resources.h"
 
-const size_t fav_remove_svg_size = 567;
-const unsigned char fav_remove_svg_data[567] = {
+const uint16_t fav_remove_svg_size = 567;
+const uint8_t fav_remove_svg_data[567] = {
     0x3c,0x3f,0x78,0x6d,0x6c,0x20,0x76,0x65,0x72,0x73,
     0x69,0x6f,0x6e,0x3d,0x22,0x31,0x2e,0x30,0x22,0x20,
     0x65,0x6e,0x63,0x6f,0x64,0x69,0x6e,0x67,0x3d,0x22,
diff --git a/data/converted/frame_png.cpp b/data/converted/frame_png.cpp
index 2afd0f94e..bfdc12cb9 100644
--- a/data/converted/frame_png.cpp
+++ b/data/converted/frame_png.cpp
@@ -1,9 +1,9 @@
-//this file was auto-generated from "frame.png" by res2h
+// this file was auto-generated from "frame.png" by res2h
 
 #include "../Resources.h"
 
-const size_t frame_png_size = 1729;
-const unsigned char frame_png_data[1729] = {
+const uint16_t frame_png_size = 1729;
+const uint8_t frame_png_data[1729] = {
     0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,
     0x00,0x0d,0x49,0x48,0x44,0x52,0x00,0x00,0x00,0x30,
     0x00,0x00,0x00,0x30,0x08,0x06,0x00,0x00,0x00,0x57,
diff --git a/data/converted/help_analog_down_svg.cpp b/data/converted/help__analog_down_svg.cpp
similarity index 98%
rename from data/converted/help_analog_down_svg.cpp
rename to data/converted/help__analog_down_svg.cpp
index 1a58a0189..d37e6c98c 100644
--- a/data/converted/help_analog_down_svg.cpp
+++ b/data/converted/help__analog_down_svg.cpp
@@ -1,9 +1,9 @@
-//this file was auto-generated from "analog_down.svg" by res2h
+// this file was auto-generated from "analog_down.svg" by res2h
 
 #include "../Resources.h"
 
-const size_t help_analog_down_svg_size = 2809;
-const unsigned char help_analog_down_svg_data[2809] = {
+const uint16_t help__analog_down_svg_size = 2809;
+const uint8_t help__analog_down_svg_data[2809] = {
     0x3c,0x3f,0x78,0x6d,0x6c,0x20,0x76,0x65,0x72,0x73,
     0x69,0x6f,0x6e,0x3d,0x22,0x31,0x2e,0x30,0x22,0x20,
     0x65,0x6e,0x63,0x6f,0x64,0x69,0x6e,0x67,0x3d,0x22,
diff --git a/data/converted/help_analog_left_svg.cpp b/data/converted/help__analog_left_svg.cpp
similarity index 98%
rename from data/converted/help_analog_left_svg.cpp
rename to data/converted/help__analog_left_svg.cpp
index 16f889cf7..ec8bd27b1 100644
--- a/data/converted/help_analog_left_svg.cpp
+++ b/data/converted/help__analog_left_svg.cpp
@@ -1,9 +1,9 @@
-//this file was auto-generated from "analog_left.svg" by res2h
+// this file was auto-generated from "analog_left.svg" by res2h
 
 #include "../Resources.h"
 
-const size_t help_analog_left_svg_size = 2834;
-const unsigned char help_analog_left_svg_data[2834] = {
+const uint16_t help__analog_left_svg_size = 2834;
+const uint8_t help__analog_left_svg_data[2834] = {
     0x3c,0x3f,0x78,0x6d,0x6c,0x20,0x76,0x65,0x72,0x73,
     0x69,0x6f,0x6e,0x3d,0x22,0x31,0x2e,0x30,0x22,0x20,
     0x65,0x6e,0x63,0x6f,0x64,0x69,0x6e,0x67,0x3d,0x22,
diff --git a/data/converted/help_analog_right_svg.cpp b/data/converted/help__analog_right_svg.cpp
similarity index 98%
rename from data/converted/help_analog_right_svg.cpp
rename to data/converted/help__analog_right_svg.cpp
index 2f66a33ac..4a4dbe222 100644
--- a/data/converted/help_analog_right_svg.cpp
+++ b/data/converted/help__analog_right_svg.cpp
@@ -1,9 +1,9 @@
-//this file was auto-generated from "analog_right.svg" by res2h
+// this file was auto-generated from "analog_right.svg" by res2h
 
 #include "../Resources.h"
 
-const size_t help_analog_right_svg_size = 2813;
-const unsigned char help_analog_right_svg_data[2813] = {
+const uint16_t help__analog_right_svg_size = 2813;
+const uint8_t help__analog_right_svg_data[2813] = {
     0x3c,0x3f,0x78,0x6d,0x6c,0x20,0x76,0x65,0x72,0x73,
     0x69,0x6f,0x6e,0x3d,0x22,0x31,0x2e,0x30,0x22,0x20,
     0x65,0x6e,0x63,0x6f,0x64,0x69,0x6e,0x67,0x3d,0x22,
diff --git a/data/converted/help_analog_thumb_svg.cpp b/data/converted/help__analog_thumb_svg.cpp
similarity index 98%
rename from data/converted/help_analog_thumb_svg.cpp
rename to data/converted/help__analog_thumb_svg.cpp
index 5bb06b9ad..ca41d87b9 100644
--- a/data/converted/help_analog_thumb_svg.cpp
+++ b/data/converted/help__analog_thumb_svg.cpp
@@ -1,9 +1,9 @@
-//this file was auto-generated from "analog_thumb.svg" by res2h
+// this file was auto-generated from "analog_thumb.svg" by res2h
 
 #include "../Resources.h"
 
-const size_t help_analog_thumb_svg_size = 2894;
-const unsigned char help_analog_thumb_svg_data[2894] = {
+const uint16_t help__analog_thumb_svg_size = 2894;
+const uint8_t help__analog_thumb_svg_data[2894] = {
     0x3c,0x3f,0x78,0x6d,0x6c,0x20,0x76,0x65,0x72,0x73,
     0x69,0x6f,0x6e,0x3d,0x22,0x31,0x2e,0x30,0x22,0x20,
     0x65,0x6e,0x63,0x6f,0x64,0x69,0x6e,0x67,0x3d,0x22,
diff --git a/data/converted/help_analog_up_svg.cpp b/data/converted/help__analog_up_svg.cpp
similarity index 98%
rename from data/converted/help_analog_up_svg.cpp
rename to data/converted/help__analog_up_svg.cpp
index bed20f926..56fd50e7b 100644
--- a/data/converted/help_analog_up_svg.cpp
+++ b/data/converted/help__analog_up_svg.cpp
@@ -1,9 +1,9 @@
-//this file was auto-generated from "analog_up.svg" by res2h
+// this file was auto-generated from "analog_up.svg" by res2h
 
 #include "../Resources.h"
 
-const size_t help_analog_up_svg_size = 2853;
-const unsigned char help_analog_up_svg_data[2853] = {
+const uint16_t help__analog_up_svg_size = 2853;
+const uint8_t help__analog_up_svg_data[2853] = {
     0x3c,0x3f,0x78,0x6d,0x6c,0x20,0x76,0x65,0x72,0x73,
     0x69,0x6f,0x6e,0x3d,0x22,0x31,0x2e,0x30,0x22,0x20,
     0x65,0x6e,0x63,0x6f,0x64,0x69,0x6e,0x67,0x3d,0x22,
diff --git a/data/converted/help_button_a_svg.cpp b/data/converted/help__button_a_svg.cpp
similarity index 97%
rename from data/converted/help_button_a_svg.cpp
rename to data/converted/help__button_a_svg.cpp
index cedb8d212..0c24630f3 100644
--- a/data/converted/help_button_a_svg.cpp
+++ b/data/converted/help__button_a_svg.cpp
@@ -1,9 +1,9 @@
-//this file was auto-generated from "button_a.svg" by res2h
+// this file was auto-generated from "button_a.svg" by res2h
 
 #include "../Resources.h"
 
-const size_t help_button_a_svg_size = 965;
-const unsigned char help_button_a_svg_data[965] = {
+const uint16_t help__button_a_svg_size = 965;
+const uint8_t help__button_a_svg_data[965] = {
     0x3c,0x3f,0x78,0x6d,0x6c,0x20,0x76,0x65,0x72,0x73,
     0x69,0x6f,0x6e,0x3d,0x22,0x31,0x2e,0x30,0x22,0x20,
     0x65,0x6e,0x63,0x6f,0x64,0x69,0x6e,0x67,0x3d,0x22,
diff --git a/data/converted/help_button_b_svg.cpp b/data/converted/help__button_b_svg.cpp
similarity index 98%
rename from data/converted/help_button_b_svg.cpp
rename to data/converted/help__button_b_svg.cpp
index 94da0650d..57403aa86 100644
--- a/data/converted/help_button_b_svg.cpp
+++ b/data/converted/help__button_b_svg.cpp
@@ -1,9 +1,9 @@
-//this file was auto-generated from "button_b.svg" by res2h
+// this file was auto-generated from "button_b.svg" by res2h
 
 #include "../Resources.h"
 
-const size_t help_button_b_svg_size = 1483;
-const unsigned char help_button_b_svg_data[1483] = {
+const uint16_t help__button_b_svg_size = 1483;
+const uint8_t help__button_b_svg_data[1483] = {
     0x3c,0x3f,0x78,0x6d,0x6c,0x20,0x76,0x65,0x72,0x73,
     0x69,0x6f,0x6e,0x3d,0x22,0x31,0x2e,0x30,0x22,0x20,
     0x65,0x6e,0x63,0x6f,0x64,0x69,0x6e,0x67,0x3d,0x22,
diff --git a/data/converted/help_button_hotkey_svg.cpp b/data/converted/help__button_hotkey_svg.cpp
similarity index 98%
rename from data/converted/help_button_hotkey_svg.cpp
rename to data/converted/help__button_hotkey_svg.cpp
index 5bf78e40c..0c5b59079 100644
--- a/data/converted/help_button_hotkey_svg.cpp
+++ b/data/converted/help__button_hotkey_svg.cpp
@@ -1,9 +1,9 @@
-//this file was auto-generated from "button_hotkey.svg" by res2h
+// this file was auto-generated from "button_hotkey.svg" by res2h
 
 #include "../Resources.h"
 
-const size_t help_button_hotkey_svg_size = 1905;
-const unsigned char help_button_hotkey_svg_data[1905] = {
+const uint16_t help__button_hotkey_svg_size = 1905;
+const uint8_t help__button_hotkey_svg_data[1905] = {
     0x3c,0x3f,0x78,0x6d,0x6c,0x20,0x76,0x65,0x72,0x73,
     0x69,0x6f,0x6e,0x3d,0x22,0x31,0x2e,0x30,0x22,0x20,
     0x65,0x6e,0x63,0x6f,0x64,0x69,0x6e,0x67,0x3d,0x22,
diff --git a/data/converted/help_button_l_svg.cpp b/data/converted/help__button_l_svg.cpp
similarity index 97%
rename from data/converted/help_button_l_svg.cpp
rename to data/converted/help__button_l_svg.cpp
index fb8eb343b..a34482f46 100644
--- a/data/converted/help_button_l_svg.cpp
+++ b/data/converted/help__button_l_svg.cpp
@@ -1,9 +1,9 @@
-//this file was auto-generated from "button_l.svg" by res2h
+// this file was auto-generated from "button_l.svg" by res2h
 
 #include "../Resources.h"
 
-const size_t help_button_l_svg_size = 1013;
-const unsigned char help_button_l_svg_data[1013] = {
+const uint16_t help__button_l_svg_size = 1013;
+const uint8_t help__button_l_svg_data[1013] = {
     0x3c,0x3f,0x78,0x6d,0x6c,0x20,0x76,0x65,0x72,0x73,
     0x69,0x6f,0x6e,0x3d,0x22,0x31,0x2e,0x30,0x22,0x20,
     0x65,0x6e,0x63,0x6f,0x64,0x69,0x6e,0x67,0x3d,0x22,
diff --git a/data/converted/help_button_r_svg.cpp b/data/converted/help__button_r_svg.cpp
similarity index 97%
rename from data/converted/help_button_r_svg.cpp
rename to data/converted/help__button_r_svg.cpp
index ea1eceb7a..79f5a5e74 100644
--- a/data/converted/help_button_r_svg.cpp
+++ b/data/converted/help__button_r_svg.cpp
@@ -1,9 +1,9 @@
-//this file was auto-generated from "button_r.svg" by res2h
+// this file was auto-generated from "button_r.svg" by res2h
 
 #include "../Resources.h"
 
-const size_t help_button_r_svg_size = 1315;
-const unsigned char help_button_r_svg_data[1315] = {
+const uint16_t help__button_r_svg_size = 1315;
+const uint8_t help__button_r_svg_data[1315] = {
     0x3c,0x3f,0x78,0x6d,0x6c,0x20,0x76,0x65,0x72,0x73,
     0x69,0x6f,0x6e,0x3d,0x22,0x31,0x2e,0x30,0x22,0x20,
     0x65,0x6e,0x63,0x6f,0x64,0x69,0x6e,0x67,0x3d,0x22,
diff --git a/data/converted/help_button_select_svg.cpp b/data/converted/help__button_select_svg.cpp
similarity index 98%
rename from data/converted/help_button_select_svg.cpp
rename to data/converted/help__button_select_svg.cpp
index b43a0ba62..5092d70ff 100644
--- a/data/converted/help_button_select_svg.cpp
+++ b/data/converted/help__button_select_svg.cpp
@@ -1,9 +1,9 @@
-//this file was auto-generated from "button_select.svg" by res2h
+// this file was auto-generated from "button_select.svg" by res2h
 
 #include "../Resources.h"
 
-const size_t help_button_select_svg_size = 1866;
-const unsigned char help_button_select_svg_data[1866] = {
+const uint16_t help__button_select_svg_size = 1866;
+const uint8_t help__button_select_svg_data[1866] = {
     0x3c,0x3f,0x78,0x6d,0x6c,0x20,0x76,0x65,0x72,0x73,
     0x69,0x6f,0x6e,0x3d,0x22,0x31,0x2e,0x30,0x22,0x20,
     0x65,0x6e,0x63,0x6f,0x64,0x69,0x6e,0x67,0x3d,0x22,
diff --git a/data/converted/help_button_start_svg.cpp b/data/converted/help__button_start_svg.cpp
similarity index 98%
rename from data/converted/help_button_start_svg.cpp
rename to data/converted/help__button_start_svg.cpp
index 06c552c91..0ba7caf37 100644
--- a/data/converted/help_button_start_svg.cpp
+++ b/data/converted/help__button_start_svg.cpp
@@ -1,9 +1,9 @@
-//this file was auto-generated from "button_start.svg" by res2h
+// this file was auto-generated from "button_start.svg" by res2h
 
 #include "../Resources.h"
 
-const size_t help_button_start_svg_size = 1769;
-const unsigned char help_button_start_svg_data[1769] = {
+const uint16_t help__button_start_svg_size = 1769;
+const uint8_t help__button_start_svg_data[1769] = {
     0x3c,0x3f,0x78,0x6d,0x6c,0x20,0x76,0x65,0x72,0x73,
     0x69,0x6f,0x6e,0x3d,0x22,0x31,0x2e,0x30,0x22,0x20,
     0x65,0x6e,0x63,0x6f,0x64,0x69,0x6e,0x67,0x3d,0x22,
diff --git a/data/converted/help_button_x_svg.cpp b/data/converted/help__button_x_svg.cpp
similarity index 97%
rename from data/converted/help_button_x_svg.cpp
rename to data/converted/help__button_x_svg.cpp
index 3d1d3093e..1f57cedf9 100644
--- a/data/converted/help_button_x_svg.cpp
+++ b/data/converted/help__button_x_svg.cpp
@@ -1,9 +1,9 @@
-//this file was auto-generated from "button_x.svg" by res2h
+// this file was auto-generated from "button_x.svg" by res2h
 
 #include "../Resources.h"
 
-const size_t help_button_x_svg_size = 949;
-const unsigned char help_button_x_svg_data[949] = {
+const uint16_t help__button_x_svg_size = 949;
+const uint8_t help__button_x_svg_data[949] = {
     0x3c,0x3f,0x78,0x6d,0x6c,0x20,0x76,0x65,0x72,0x73,
     0x69,0x6f,0x6e,0x3d,0x22,0x31,0x2e,0x30,0x22,0x20,
     0x65,0x6e,0x63,0x6f,0x64,0x69,0x6e,0x67,0x3d,0x22,
diff --git a/data/converted/help_button_y_svg.cpp b/data/converted/help__button_y_svg.cpp
similarity index 97%
rename from data/converted/help_button_y_svg.cpp
rename to data/converted/help__button_y_svg.cpp
index c05fc3b76..3f00065af 100644
--- a/data/converted/help_button_y_svg.cpp
+++ b/data/converted/help__button_y_svg.cpp
@@ -1,9 +1,9 @@
-//this file was auto-generated from "button_y.svg" by res2h
+// this file was auto-generated from "button_y.svg" by res2h
 
 #include "../Resources.h"
 
-const size_t help_button_y_svg_size = 911;
-const unsigned char help_button_y_svg_data[911] = {
+const uint16_t help__button_y_svg_size = 911;
+const uint8_t help__button_y_svg_data[911] = {
     0x3c,0x3f,0x78,0x6d,0x6c,0x20,0x76,0x65,0x72,0x73,
     0x69,0x6f,0x6e,0x3d,0x22,0x31,0x2e,0x30,0x22,0x20,
     0x65,0x6e,0x63,0x6f,0x64,0x69,0x6e,0x67,0x3d,0x22,
diff --git a/data/converted/help_dpad_all_svg.cpp b/data/converted/help__dpad_all_svg.cpp
similarity index 99%
rename from data/converted/help_dpad_all_svg.cpp
rename to data/converted/help__dpad_all_svg.cpp
index 226a111d5..e001a0b7c 100644
--- a/data/converted/help_dpad_all_svg.cpp
+++ b/data/converted/help__dpad_all_svg.cpp
@@ -1,9 +1,9 @@
-//this file was auto-generated from "dpad_all.svg" by res2h
+// this file was auto-generated from "dpad_all.svg" by res2h
 
 #include "../Resources.h"
 
-const size_t help_dpad_all_svg_size = 3470;
-const unsigned char help_dpad_all_svg_data[3470] = {
+const uint16_t help__dpad_all_svg_size = 3470;
+const uint8_t help__dpad_all_svg_data[3470] = {
     0x3c,0x3f,0x78,0x6d,0x6c,0x20,0x76,0x65,0x72,0x73,
     0x69,0x6f,0x6e,0x3d,0x22,0x31,0x2e,0x30,0x22,0x20,
     0x65,0x6e,0x63,0x6f,0x64,0x69,0x6e,0x67,0x3d,0x22,
diff --git a/data/converted/help_dpad_down_svg.cpp b/data/converted/help__dpad_down_svg.cpp
similarity index 99%
rename from data/converted/help_dpad_down_svg.cpp
rename to data/converted/help__dpad_down_svg.cpp
index 11fa7c313..f2371f0c2 100644
--- a/data/converted/help_dpad_down_svg.cpp
+++ b/data/converted/help__dpad_down_svg.cpp
@@ -1,9 +1,9 @@
-//this file was auto-generated from "dpad_down.svg" by res2h
+// this file was auto-generated from "dpad_down.svg" by res2h
 
 #include "../Resources.h"
 
-const size_t help_dpad_down_svg_size = 3167;
-const unsigned char help_dpad_down_svg_data[3167] = {
+const uint16_t help__dpad_down_svg_size = 3167;
+const uint8_t help__dpad_down_svg_data[3167] = {
     0x3c,0x3f,0x78,0x6d,0x6c,0x20,0x76,0x65,0x72,0x73,
     0x69,0x6f,0x6e,0x3d,0x22,0x31,0x2e,0x30,0x22,0x20,
     0x65,0x6e,0x63,0x6f,0x64,0x69,0x6e,0x67,0x3d,0x22,
diff --git a/data/converted/help_dpad_left_svg.cpp b/data/converted/help__dpad_left_svg.cpp
similarity index 99%
rename from data/converted/help_dpad_left_svg.cpp
rename to data/converted/help__dpad_left_svg.cpp
index dbf730d60..e4d755c61 100644
--- a/data/converted/help_dpad_left_svg.cpp
+++ b/data/converted/help__dpad_left_svg.cpp
@@ -1,9 +1,9 @@
-//this file was auto-generated from "dpad_left.svg" by res2h
+// this file was auto-generated from "dpad_left.svg" by res2h
 
 #include "../Resources.h"
 
-const size_t help_dpad_left_svg_size = 3164;
-const unsigned char help_dpad_left_svg_data[3164] = {
+const uint16_t help__dpad_left_svg_size = 3164;
+const uint8_t help__dpad_left_svg_data[3164] = {
     0x3c,0x3f,0x78,0x6d,0x6c,0x20,0x76,0x65,0x72,0x73,
     0x69,0x6f,0x6e,0x3d,0x22,0x31,0x2e,0x30,0x22,0x20,
     0x65,0x6e,0x63,0x6f,0x64,0x69,0x6e,0x67,0x3d,0x22,
diff --git a/data/converted/help_dpad_leftright_svg.cpp b/data/converted/help__dpad_leftright_svg.cpp
similarity index 99%
rename from data/converted/help_dpad_leftright_svg.cpp
rename to data/converted/help__dpad_leftright_svg.cpp
index 315f94c0d..3984364a8 100644
--- a/data/converted/help_dpad_leftright_svg.cpp
+++ b/data/converted/help__dpad_leftright_svg.cpp
@@ -1,9 +1,9 @@
-//this file was auto-generated from "dpad_leftright.svg" by res2h
+// this file was auto-generated from "dpad_leftright.svg" by res2h
 
 #include "../Resources.h"
 
-const size_t help_dpad_leftright_svg_size = 3241;
-const unsigned char help_dpad_leftright_svg_data[3241] = {
+const uint16_t help__dpad_leftright_svg_size = 3241;
+const uint8_t help__dpad_leftright_svg_data[3241] = {
     0x3c,0x3f,0x78,0x6d,0x6c,0x20,0x76,0x65,0x72,0x73,
     0x69,0x6f,0x6e,0x3d,0x22,0x31,0x2e,0x30,0x22,0x20,
     0x65,0x6e,0x63,0x6f,0x64,0x69,0x6e,0x67,0x3d,0x22,
diff --git a/data/converted/help_dpad_right_svg.cpp b/data/converted/help__dpad_right_svg.cpp
similarity index 99%
rename from data/converted/help_dpad_right_svg.cpp
rename to data/converted/help__dpad_right_svg.cpp
index 214053557..7005f3f83 100644
--- a/data/converted/help_dpad_right_svg.cpp
+++ b/data/converted/help__dpad_right_svg.cpp
@@ -1,9 +1,9 @@
-//this file was auto-generated from "dpad_right.svg" by res2h
+// this file was auto-generated from "dpad_right.svg" by res2h
 
 #include "../Resources.h"
 
-const size_t help_dpad_right_svg_size = 3168;
-const unsigned char help_dpad_right_svg_data[3168] = {
+const uint16_t help__dpad_right_svg_size = 3168;
+const uint8_t help__dpad_right_svg_data[3168] = {
     0x3c,0x3f,0x78,0x6d,0x6c,0x20,0x76,0x65,0x72,0x73,
     0x69,0x6f,0x6e,0x3d,0x22,0x31,0x2e,0x30,0x22,0x20,
     0x65,0x6e,0x63,0x6f,0x64,0x69,0x6e,0x67,0x3d,0x22,
diff --git a/data/converted/help_dpad_up_svg.cpp b/data/converted/help__dpad_up_svg.cpp
similarity index 99%
rename from data/converted/help_dpad_up_svg.cpp
rename to data/converted/help__dpad_up_svg.cpp
index a816609fe..5ce8aa331 100644
--- a/data/converted/help_dpad_up_svg.cpp
+++ b/data/converted/help__dpad_up_svg.cpp
@@ -1,9 +1,9 @@
-//this file was auto-generated from "dpad_up.svg" by res2h
+// this file was auto-generated from "dpad_up.svg" by res2h
 
 #include "../Resources.h"
 
-const size_t help_dpad_up_svg_size = 3165;
-const unsigned char help_dpad_up_svg_data[3165] = {
+const uint16_t help__dpad_up_svg_size = 3165;
+const uint8_t help__dpad_up_svg_data[3165] = {
     0x3c,0x3f,0x78,0x6d,0x6c,0x20,0x76,0x65,0x72,0x73,
     0x69,0x6f,0x6e,0x3d,0x22,0x31,0x2e,0x30,0x22,0x20,
     0x65,0x6e,0x63,0x6f,0x64,0x69,0x6e,0x67,0x3d,0x22,
diff --git a/data/converted/help_dpad_updown_svg.cpp b/data/converted/help__dpad_updown_svg.cpp
similarity index 99%
rename from data/converted/help_dpad_updown_svg.cpp
rename to data/converted/help__dpad_updown_svg.cpp
index f1612667d..163d2773b 100644
--- a/data/converted/help_dpad_updown_svg.cpp
+++ b/data/converted/help__dpad_updown_svg.cpp
@@ -1,9 +1,9 @@
-//this file was auto-generated from "dpad_updown.svg" by res2h
+// this file was auto-generated from "dpad_updown.svg" by res2h
 
 #include "../Resources.h"
 
-const size_t help_dpad_updown_svg_size = 3241;
-const unsigned char help_dpad_updown_svg_data[3241] = {
+const uint16_t help__dpad_updown_svg_size = 3241;
+const uint8_t help__dpad_updown_svg_data[3241] = {
     0x3c,0x3f,0x78,0x6d,0x6c,0x20,0x76,0x65,0x72,0x73,
     0x69,0x6f,0x6e,0x3d,0x22,0x31,0x2e,0x30,0x22,0x20,
     0x65,0x6e,0x63,0x6f,0x64,0x69,0x6e,0x67,0x3d,0x22,
diff --git a/data/converted/off_svg.cpp b/data/converted/off_svg.cpp
index f89baaee7..38ee78893 100644
--- a/data/converted/off_svg.cpp
+++ b/data/converted/off_svg.cpp
@@ -1,9 +1,9 @@
-//this file was auto-generated from "off.svg" by res2h
+// this file was auto-generated from "off.svg" by res2h
 
 #include "../Resources.h"
 
-const size_t off_svg_size = 1325;
-const unsigned char off_svg_data[1325] = {
+const uint16_t off_svg_size = 1325;
+const uint8_t off_svg_data[1325] = {
     0x3c,0x3f,0x78,0x6d,0x6c,0x20,0x76,0x65,0x72,0x73,
     0x69,0x6f,0x6e,0x3d,0x22,0x31,0x2e,0x30,0x22,0x20,
     0x65,0x6e,0x63,0x6f,0x64,0x69,0x6e,0x67,0x3d,0x22,
diff --git a/data/converted/on_svg.cpp b/data/converted/on_svg.cpp
index afd33eee6..27a1fe8c1 100644
--- a/data/converted/on_svg.cpp
+++ b/data/converted/on_svg.cpp
@@ -1,9 +1,9 @@
-//this file was auto-generated from "on.svg" by res2h
+// this file was auto-generated from "on.svg" by res2h
 
 #include "../Resources.h"
 
-const size_t on_svg_size = 1132;
-const unsigned char on_svg_data[1132] = {
+const uint16_t on_svg_size = 1132;
+const uint8_t on_svg_data[1132] = {
     0x3c,0x3f,0x78,0x6d,0x6c,0x20,0x76,0x65,0x72,0x73,
     0x69,0x6f,0x6e,0x3d,0x22,0x31,0x2e,0x30,0x22,0x20,
     0x65,0x6e,0x63,0x6f,0x64,0x69,0x6e,0x67,0x3d,0x22,
diff --git a/data/converted/opensans_hebrew_condensed_light_ttf.cpp b/data/converted/opensans_hebrew_condensed_light_ttf.cpp
index c40c808a8..7255a45a9 100644
--- a/data/converted/opensans_hebrew_condensed_light_ttf.cpp
+++ b/data/converted/opensans_hebrew_condensed_light_ttf.cpp
@@ -1,9 +1,9 @@
-//this file was auto-generated from "opensans_hebrew_condensed_light.ttf" by res2h
+// this file was auto-generated from "opensans_hebrew_condensed_light.ttf" by res2h
 
 #include "../Resources.h"
 
-const size_t opensans_hebrew_condensed_light_ttf_size = 32868;
-const unsigned char opensans_hebrew_condensed_light_ttf_data[32868] = {
+const uint16_t opensans_hebrew_condensed_light_ttf_size = 32868;
+const uint8_t opensans_hebrew_condensed_light_ttf_data[32868] = {
     0x00,0x01,0x00,0x00,0x00,0x10,0x01,0x00,0x00,0x04,
     0x00,0x00,0x46,0x46,0x54,0x4d,0x67,0x7f,0x0d,0x13,
     0x00,0x00,0x7c,0xb4,0x00,0x00,0x00,0x1c,0x47,0x44,
diff --git a/data/converted/opensans_hebrew_condensed_regular_ttf.cpp b/data/converted/opensans_hebrew_condensed_regular_ttf.cpp
index 5c79a5108..c89da4c62 100644
--- a/data/converted/opensans_hebrew_condensed_regular_ttf.cpp
+++ b/data/converted/opensans_hebrew_condensed_regular_ttf.cpp
@@ -1,9 +1,9 @@
-//this file was auto-generated from "opensans_hebrew_condensed_regular.ttf" by res2h
+// this file was auto-generated from "opensans_hebrew_condensed_regular.ttf" by res2h
 
 #include "../Resources.h"
 
-const size_t opensans_hebrew_condensed_regular_ttf_size = 32364;
-const unsigned char opensans_hebrew_condensed_regular_ttf_data[32364] = {
+const uint16_t opensans_hebrew_condensed_regular_ttf_size = 32364;
+const uint8_t opensans_hebrew_condensed_regular_ttf_data[32364] = {
     0x00,0x01,0x00,0x00,0x00,0x11,0x01,0x00,0x00,0x04,
     0x00,0x10,0x44,0x53,0x49,0x47,0x00,0x00,0x00,0x01,
     0x00,0x00,0x7e,0x64,0x00,0x00,0x00,0x08,0x46,0x46,
diff --git a/data/converted/option_arrow_svg.cpp b/data/converted/option_arrow_svg.cpp
index caaaad54a..edd4c0bbc 100644
--- a/data/converted/option_arrow_svg.cpp
+++ b/data/converted/option_arrow_svg.cpp
@@ -1,9 +1,9 @@
-//this file was auto-generated from "option_arrow.svg" by res2h
+// this file was auto-generated from "option_arrow.svg" by res2h
 
 #include "../Resources.h"
 
-const size_t option_arrow_svg_size = 839;
-const unsigned char option_arrow_svg_data[839] = {
+const uint16_t option_arrow_svg_size = 839;
+const uint8_t option_arrow_svg_data[839] = {
     0x3c,0x3f,0x78,0x6d,0x6c,0x20,0x76,0x65,0x72,0x73,
     0x69,0x6f,0x6e,0x3d,0x22,0x31,0x2e,0x30,0x22,0x20,
     0x65,0x6e,0x63,0x6f,0x64,0x69,0x6e,0x67,0x3d,0x22,
diff --git a/data/converted/scroll_gradient_png.cpp b/data/converted/scroll_gradient_png.cpp
index 77b84a54e..ee0f88a0c 100644
--- a/data/converted/scroll_gradient_png.cpp
+++ b/data/converted/scroll_gradient_png.cpp
@@ -1,9 +1,9 @@
-//this file was auto-generated from "scroll_gradient.png" by res2h
+// this file was auto-generated from "scroll_gradient.png" by res2h
 
 #include "../Resources.h"
 
-const size_t scroll_gradient_png_size = 83384;
-const unsigned char scroll_gradient_png_data[83384] = {
+const uint32_t scroll_gradient_png_size = 83384;
+const uint8_t scroll_gradient_png_data[83384] = {
     0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,
     0x00,0x0d,0x49,0x48,0x44,0x52,0x00,0x00,0x02,0x40,
     0x00,0x00,0x01,0x44,0x08,0x06,0x00,0x00,0x00,0xcf,
diff --git a/data/converted/slider_knob_svg.cpp b/data/converted/slider_knob_svg.cpp
index 8b99255f2..80233717d 100644
--- a/data/converted/slider_knob_svg.cpp
+++ b/data/converted/slider_knob_svg.cpp
@@ -1,9 +1,9 @@
-//this file was auto-generated from "slider_knob.svg" by res2h
+// this file was auto-generated from "slider_knob.svg" by res2h
 
 #include "../Resources.h"
 
-const size_t slider_knob_svg_size = 619;
-const unsigned char slider_knob_svg_data[619] = {
+const uint16_t slider_knob_svg_size = 619;
+const uint8_t slider_knob_svg_data[619] = {
     0x3c,0x3f,0x78,0x6d,0x6c,0x20,0x76,0x65,0x72,0x73,
     0x69,0x6f,0x6e,0x3d,0x22,0x31,0x2e,0x30,0x22,0x20,
     0x65,0x6e,0x63,0x6f,0x64,0x69,0x6e,0x67,0x3d,0x22,
diff --git a/data/converted/splash_svg.cpp b/data/converted/splash_svg.cpp
index 4a7c8c4fd..1a9ff3f12 100644
--- a/data/converted/splash_svg.cpp
+++ b/data/converted/splash_svg.cpp
@@ -1,9 +1,9 @@
-//this file was auto-generated from "splash.svg" by res2h
+// this file was auto-generated from "splash.svg" by res2h
 
 #include "../Resources.h"
 
-const size_t splash_svg_size = 19024;
-const unsigned char splash_svg_data[19024] = {
+const uint16_t splash_svg_size = 19024;
+const uint8_t splash_svg_data[19024] = {
     0x3c,0x3f,0x78,0x6d,0x6c,0x20,0x76,0x65,0x72,0x73,
     0x69,0x6f,0x6e,0x3d,0x22,0x31,0x2e,0x30,0x22,0x20,
     0x65,0x6e,0x63,0x6f,0x64,0x69,0x6e,0x67,0x3d,0x22,
diff --git a/data/converted/star_filled_svg.cpp b/data/converted/star_filled_svg.cpp
index 077872456..69ff258b2 100644
--- a/data/converted/star_filled_svg.cpp
+++ b/data/converted/star_filled_svg.cpp
@@ -1,9 +1,9 @@
-//this file was auto-generated from "star_filled.svg" by res2h
+// this file was auto-generated from "star_filled.svg" by res2h
 
 #include "../Resources.h"
 
-const size_t star_filled_svg_size = 1152;
-const unsigned char star_filled_svg_data[1152] = {
+const uint16_t star_filled_svg_size = 1152;
+const uint8_t star_filled_svg_data[1152] = {
     0x3c,0x3f,0x78,0x6d,0x6c,0x20,0x76,0x65,0x72,0x73,
     0x69,0x6f,0x6e,0x3d,0x22,0x31,0x2e,0x30,0x22,0x20,
     0x65,0x6e,0x63,0x6f,0x64,0x69,0x6e,0x67,0x3d,0x22,
diff --git a/data/converted/star_unfilled_svg.cpp b/data/converted/star_unfilled_svg.cpp
index aae8f75a1..3414ea5b4 100644
--- a/data/converted/star_unfilled_svg.cpp
+++ b/data/converted/star_unfilled_svg.cpp
@@ -1,9 +1,9 @@
-//this file was auto-generated from "star_unfilled.svg" by res2h
+// this file was auto-generated from "star_unfilled.svg" by res2h
 
 #include "../Resources.h"
 
-const size_t star_unfilled_svg_size = 1871;
-const unsigned char star_unfilled_svg_data[1871] = {
+const uint16_t star_unfilled_svg_size = 1871;
+const uint8_t star_unfilled_svg_data[1871] = {
     0x3c,0x3f,0x78,0x6d,0x6c,0x20,0x76,0x65,0x72,0x73,
     0x69,0x6f,0x6e,0x3d,0x22,0x31,0x2e,0x30,0x22,0x20,
     0x65,0x6e,0x63,0x6f,0x64,0x69,0x6e,0x67,0x3d,0x22,
diff --git a/data/converted/textinput_ninepatch_active_png.cpp b/data/converted/textinput_ninepatch_active_png.cpp
index 664b3f79e..3783e0207 100644
--- a/data/converted/textinput_ninepatch_active_png.cpp
+++ b/data/converted/textinput_ninepatch_active_png.cpp
@@ -1,9 +1,9 @@
-//this file was auto-generated from "textinput_ninepatch_active.png" by res2h
+// this file was auto-generated from "textinput_ninepatch_active.png" by res2h
 
 #include "../Resources.h"
 
-const size_t textinput_ninepatch_active_png_size = 3084;
-const unsigned char textinput_ninepatch_active_png_data[3084] = {
+const uint16_t textinput_ninepatch_active_png_size = 3084;
+const uint8_t textinput_ninepatch_active_png_data[3084] = {
     0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,
     0x00,0x0d,0x49,0x48,0x44,0x52,0x00,0x00,0x00,0x30,
     0x00,0x00,0x00,0x30,0x08,0x06,0x00,0x00,0x00,0x57,
diff --git a/data/converted/textinput_ninepatch_png.cpp b/data/converted/textinput_ninepatch_png.cpp
index 6d1fb2de9..4bafbcfc1 100644
--- a/data/converted/textinput_ninepatch_png.cpp
+++ b/data/converted/textinput_ninepatch_png.cpp
@@ -1,9 +1,9 @@
-//this file was auto-generated from "textinput_ninepatch.png" by res2h
+// this file was auto-generated from "textinput_ninepatch.png" by res2h
 
 #include "../Resources.h"
 
-const size_t textinput_ninepatch_png_size = 1275;
-const unsigned char textinput_ninepatch_png_data[1275] = {
+const uint16_t textinput_ninepatch_png_size = 1275;
+const uint8_t textinput_ninepatch_png_data[1275] = {
     0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,
     0x00,0x0d,0x49,0x48,0x44,0x52,0x00,0x00,0x00,0x30,
     0x00,0x00,0x00,0x30,0x08,0x06,0x00,0x00,0x00,0x57,
diff --git a/data/converted/window_icon_256_png.cpp b/data/converted/window_icon_256_png.cpp
index 20c5839c6..f102f2938 100644
--- a/data/converted/window_icon_256_png.cpp
+++ b/data/converted/window_icon_256_png.cpp
@@ -1,9 +1,9 @@
-//this file was auto-generated from "window_icon_256.png" by res2h
+// this file was auto-generated from "window_icon_256.png" by res2h
 
 #include "../Resources.h"
 
-const size_t window_icon_256_png_size = 4870;
-const unsigned char window_icon_256_png_data[4870] = {
+const uint16_t window_icon_256_png_size = 4870;
+const uint8_t window_icon_256_png_data[4870] = {
     0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,
     0x00,0x0d,0x49,0x48,0x44,0x52,0x00,0x00,0x01,0x00,
     0x00,0x00,0x01,0x00,0x08,0x06,0x00,0x00,0x00,0x5c,
diff --git a/es-core/CMakeLists.txt b/es-core/CMakeLists.txt
index 825208d1f..91c945c5f 100644
--- a/es-core/CMakeLists.txt
+++ b/es-core/CMakeLists.txt
@@ -131,27 +131,27 @@ set(EMBEDDED_ASSET_SOURCES
     ${emulationstation-all_SOURCE_DIR}/data/converted/frame_png.cpp
     ${emulationstation-all_SOURCE_DIR}/data/converted/scroll_gradient_png.cpp
 
-    ${emulationstation-all_SOURCE_DIR}/data/converted/help_analog_left_svg.cpp
-    ${emulationstation-all_SOURCE_DIR}/data/converted/help_analog_right_svg.cpp
-    ${emulationstation-all_SOURCE_DIR}/data/converted/help_analog_up_svg.cpp
-    ${emulationstation-all_SOURCE_DIR}/data/converted/help_analog_down_svg.cpp
-    ${emulationstation-all_SOURCE_DIR}/data/converted/help_analog_thumb_svg.cpp
-    ${emulationstation-all_SOURCE_DIR}/data/converted/help_button_a_svg.cpp
-    ${emulationstation-all_SOURCE_DIR}/data/converted/help_button_b_svg.cpp
-    ${emulationstation-all_SOURCE_DIR}/data/converted/help_button_x_svg.cpp
-    ${emulationstation-all_SOURCE_DIR}/data/converted/help_button_y_svg.cpp
-    ${emulationstation-all_SOURCE_DIR}/data/converted/help_button_l_svg.cpp
-    ${emulationstation-all_SOURCE_DIR}/data/converted/help_button_r_svg.cpp
-    ${emulationstation-all_SOURCE_DIR}/data/converted/help_button_start_svg.cpp
-    ${emulationstation-all_SOURCE_DIR}/data/converted/help_button_select_svg.cpp
-    ${emulationstation-all_SOURCE_DIR}/data/converted/help_button_hotkey_svg.cpp
-    ${emulationstation-all_SOURCE_DIR}/data/converted/help_dpad_up_svg.cpp
-    ${emulationstation-all_SOURCE_DIR}/data/converted/help_dpad_down_svg.cpp
-    ${emulationstation-all_SOURCE_DIR}/data/converted/help_dpad_left_svg.cpp
-    ${emulationstation-all_SOURCE_DIR}/data/converted/help_dpad_right_svg.cpp
-    ${emulationstation-all_SOURCE_DIR}/data/converted/help_dpad_updown_svg.cpp
-    ${emulationstation-all_SOURCE_DIR}/data/converted/help_dpad_leftright_svg.cpp
-    ${emulationstation-all_SOURCE_DIR}/data/converted/help_dpad_all_svg.cpp
+    ${emulationstation-all_SOURCE_DIR}/data/converted/help__analog_left_svg.cpp
+    ${emulationstation-all_SOURCE_DIR}/data/converted/help__analog_right_svg.cpp
+    ${emulationstation-all_SOURCE_DIR}/data/converted/help__analog_up_svg.cpp
+    ${emulationstation-all_SOURCE_DIR}/data/converted/help__analog_down_svg.cpp
+    ${emulationstation-all_SOURCE_DIR}/data/converted/help__analog_thumb_svg.cpp
+    ${emulationstation-all_SOURCE_DIR}/data/converted/help__button_a_svg.cpp
+    ${emulationstation-all_SOURCE_DIR}/data/converted/help__button_b_svg.cpp
+    ${emulationstation-all_SOURCE_DIR}/data/converted/help__button_x_svg.cpp
+    ${emulationstation-all_SOURCE_DIR}/data/converted/help__button_y_svg.cpp
+    ${emulationstation-all_SOURCE_DIR}/data/converted/help__button_l_svg.cpp
+    ${emulationstation-all_SOURCE_DIR}/data/converted/help__button_r_svg.cpp
+    ${emulationstation-all_SOURCE_DIR}/data/converted/help__button_start_svg.cpp
+    ${emulationstation-all_SOURCE_DIR}/data/converted/help__button_select_svg.cpp
+    ${emulationstation-all_SOURCE_DIR}/data/converted/help__button_hotkey_svg.cpp
+    ${emulationstation-all_SOURCE_DIR}/data/converted/help__dpad_up_svg.cpp
+    ${emulationstation-all_SOURCE_DIR}/data/converted/help__dpad_down_svg.cpp
+    ${emulationstation-all_SOURCE_DIR}/data/converted/help__dpad_left_svg.cpp
+    ${emulationstation-all_SOURCE_DIR}/data/converted/help__dpad_right_svg.cpp
+    ${emulationstation-all_SOURCE_DIR}/data/converted/help__dpad_updown_svg.cpp
+    ${emulationstation-all_SOURCE_DIR}/data/converted/help__dpad_leftright_svg.cpp
+    ${emulationstation-all_SOURCE_DIR}/data/converted/help__dpad_all_svg.cpp
 
     ${emulationstation-all_SOURCE_DIR}/data/converted/opensans_hebrew_condensed_regular_ttf.cpp
     ${emulationstation-all_SOURCE_DIR}/data/converted/opensans_hebrew_condensed_light_ttf.cpp