From 319dfd23e7dd1ecfedea113e49dfe30b5a814c67 Mon Sep 17 00:00:00 2001
From: ITCactus <n/a>
Date: Mon, 9 May 2022 17:45:53 +0200
Subject: [PATCH 01/10] [new watchface] watchface inspired by G7710, with day
 of year and week number info

---
 src/CMakeLists.txt                            |   3 +
 src/components/settings/Settings.h            |  12 +-
 src/displayapp/fonts/7segment.woff            | Bin 0 -> 2124 bytes
 src/displayapp/fonts/lv_font_7segment_115.c   | 735 ++++++++++++++++++
 src/displayapp/fonts/lv_font_7segment_40.c    | 228 ++++++
 src/displayapp/fonts/lv_font_dots_40.c        | 410 ++++++++++
 src/displayapp/fonts/repetitionscrolling.ttf  | Bin 0 -> 42872 bytes
 src/displayapp/screens/CheckboxList.cpp       | 115 +++
 src/displayapp/screens/CheckboxList.h         |  49 ++
 src/displayapp/screens/Clock.cpp              |  15 +
 src/displayapp/screens/Clock.h                |   1 +
 .../screens/WatchFaceCasioStyleG7710.cpp      | 297 +++++++
 .../screens/WatchFaceCasioStyleG7710.h        |  91 +++
 .../screens/settings/SettingWatchFace.h       |  13 +-
 src/libs/lv_conf.h                            |   3 +
 15 files changed, 1967 insertions(+), 5 deletions(-)
 create mode 100644 src/displayapp/fonts/7segment.woff
 create mode 100644 src/displayapp/fonts/lv_font_7segment_115.c
 create mode 100644 src/displayapp/fonts/lv_font_7segment_40.c
 create mode 100644 src/displayapp/fonts/lv_font_dots_40.c
 create mode 100644 src/displayapp/fonts/repetitionscrolling.ttf
 create mode 100644 src/displayapp/screens/CheckboxList.cpp
 create mode 100644 src/displayapp/screens/CheckboxList.h
 create mode 100644 src/displayapp/screens/WatchFaceCasioStyleG7710.cpp
 create mode 100644 src/displayapp/screens/WatchFaceCasioStyleG7710.h

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3b7503fd..59119c49 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -396,6 +396,7 @@ list(APPEND SOURCE_FILES
         displayapp/screens/Motion.cpp
         displayapp/screens/FlashLight.cpp
         displayapp/screens/List.cpp
+        displayapp/screens/CheckboxList.cpp
         displayapp/screens/BatteryInfo.cpp
         displayapp/screens/Steps.cpp
         displayapp/screens/Timer.cpp
@@ -426,6 +427,7 @@ list(APPEND SOURCE_FILES
         displayapp/screens/WatchFaceDigital.cpp
         displayapp/screens/WatchFaceTerminal.cpp
         displayapp/screens/WatchFacePineTimeStyle.cpp
+        displayapp/screens/WatchFaceCasioStyleG7710.cpp
 
         ##
 
@@ -600,6 +602,7 @@ set(INCLUDE_FILES
         displayapp/screens/FirmwareUpdate.h
         displayapp/screens/FirmwareValidation.h
         displayapp/screens/ApplicationList.h
+        displayapp/screens/CheckboxList.h
         displayapp/Apps.h
         displayapp/screens/Notifications.h
         displayapp/screens/HeartRate.h
diff --git a/src/components/settings/Settings.h b/src/components/settings/Settings.h
index 3b113ead..83987b77 100644
--- a/src/components/settings/Settings.h
+++ b/src/components/settings/Settings.h
@@ -102,6 +102,14 @@ namespace Pinetime {
         return appMenu;
       };
 
+      void SetWatchfacesMenu(uint8_t menu) {
+        watchFacesMenu = menu;
+      };
+
+      uint8_t GetWatchfacesMenu() const {
+        return watchFacesMenu;
+      };
+
       void SetSettingsMenu(uint8_t menu) {
         settingsMenu = menu;
       };
@@ -212,7 +220,7 @@ namespace Pinetime {
     private:
       Pinetime::Controllers::FS& fs;
 
-      static constexpr uint32_t settingsVersion = 0x0003;
+      static constexpr uint32_t settingsVersion = 0x0004;
       struct SettingsData {
         uint32_t version = settingsVersion;
         uint32_t stepsGoal = 10000;
@@ -236,6 +244,8 @@ namespace Pinetime {
 
       uint8_t appMenu = 0;
       uint8_t settingsMenu = 0;
+      uint8_t watchFacesMenu = 0;
+
       /* ble state is intentionally not saved with the other watch settings and initialized
        * to off (false) on every boot because we always want ble to be enabled on startup
        */
diff --git a/src/displayapp/fonts/7segment.woff b/src/displayapp/fonts/7segment.woff
new file mode 100644
index 0000000000000000000000000000000000000000..79ed924933bb24152a246eeaf303c60f6948ebdb
GIT binary patch
literal 2124
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
E0bwmy4*&oF

literal 0
HcmV?d00001

diff --git a/src/displayapp/fonts/lv_font_7segment_115.c b/src/displayapp/fonts/lv_font_7segment_115.c
new file mode 100644
index 00000000..1d509403
--- /dev/null
+++ b/src/displayapp/fonts/lv_font_7segment_115.c
@@ -0,0 +1,735 @@
+/*******************************************************************************
+ * Size: 115 px
+ * Bpp: 1
+ * Opts: 
+ ******************************************************************************/
+
+#ifdef LV_LVGL_H_INCLUDE_SIMPLE
+#include "lvgl.h"
+#else
+#include "lvgl/lvgl.h"
+#endif
+
+#ifndef LV_FONT_7SEGMENT_115
+#define LV_FONT_7SEGMENT_115 1
+#endif
+
+#if LV_FONT_7SEGMENT_115
+
+/*-----------------
+ *    BITMAPS
+ *----------------*/
+
+/*Store the image of the glyphs*/
+static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
+    /* U+0020 " " */
+    0x0,
+
+    /* U+0030 "0" */
+    0x0, 0xf, 0xff, 0xff, 0xff, 0x80, 0x0, 0x1f,
+    0xff, 0xff, 0xff, 0x88, 0x0, 0x1f, 0xff, 0xff,
+    0xff, 0xcf, 0x0, 0x7, 0xff, 0xff, 0xff, 0xc7,
+    0xc0, 0x11, 0xff, 0xff, 0xff, 0xe7, 0xe0, 0x1c,
+    0x7f, 0xff, 0xff, 0xf3, 0xf8, 0x1f, 0x1f, 0xff,
+    0xff, 0xf3, 0xfc, 0xf, 0xc7, 0xff, 0xff, 0xf9,
+    0xff, 0x7, 0xf1, 0xff, 0xff, 0xf9, 0xff, 0x83,
+    0xfc, 0x7f, 0xff, 0xfc, 0xff, 0xc3, 0xff, 0x0,
+    0x0, 0x0, 0x7f, 0xe1, 0xff, 0xc0, 0x0, 0x0,
+    0x7f, 0xf0, 0xff, 0xe0, 0x0, 0x0, 0x3f, 0xf8,
+    0x7f, 0xf0, 0x0, 0x0, 0x1f, 0xfc, 0x3f, 0xf8,
+    0x0, 0x0, 0xf, 0xfe, 0x1f, 0xfc, 0x0, 0x0,
+    0x7, 0xff, 0xf, 0xfe, 0x0, 0x0, 0x3, 0xff,
+    0x87, 0xff, 0x0, 0x0, 0x1, 0xff, 0x83, 0xff,
+    0x80, 0x0, 0x0, 0xff, 0xc1, 0xff, 0xc0, 0x0,
+    0x0, 0xff, 0xe0, 0xff, 0xe0, 0x0, 0x0, 0x7f,
+    0xf0, 0x7f, 0xe0, 0x0, 0x0, 0x3f, 0xf8, 0x3f,
+    0xf0, 0x0, 0x0, 0x1f, 0xfc, 0x1f, 0xf8, 0x0,
+    0x0, 0xf, 0xfe, 0xf, 0xfc, 0x0, 0x0, 0x7,
+    0xff, 0xf, 0xfe, 0x0, 0x0, 0x3, 0xff, 0x87,
+    0xff, 0x0, 0x0, 0x1, 0xff, 0xc3, 0xff, 0x80,
+    0x0, 0x0, 0xff, 0xe1, 0xff, 0xc0, 0x0, 0x0,
+    0x7f, 0xf0, 0xff, 0xe0, 0x0, 0x0, 0x3f, 0xf8,
+    0x7f, 0xf0, 0x0, 0x0, 0x1f, 0xfc, 0x3f, 0xf8,
+    0x0, 0x0, 0xf, 0xfe, 0x1f, 0xfc, 0x0, 0x0,
+    0x7, 0xff, 0xf, 0xfe, 0x0, 0x0, 0x3, 0xff,
+    0x7, 0xff, 0x0, 0x0, 0x1, 0xff, 0x83, 0xff,
+    0x80, 0x0, 0x1, 0xff, 0xc1, 0xff, 0x80, 0x0,
+    0x0, 0x7f, 0xe0, 0xff, 0x80, 0x0, 0x0, 0x1f,
+    0xf0, 0x7f, 0x0, 0x0, 0x0, 0x3, 0xf8, 0x1f,
+    0x0, 0x0, 0x0, 0x0, 0xf8, 0x7, 0x0, 0x0,
+    0x0, 0x0, 0x38, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x30, 0x0, 0x0, 0x0,
+    0x1, 0x80, 0x7c, 0x0, 0x0, 0x0, 0x1, 0xe0,
+    0x7f, 0x0, 0x0, 0x0, 0x3, 0xfc, 0x3f, 0xe0,
+    0x0, 0x0, 0x3, 0xfe, 0x1f, 0xf8, 0x0, 0x0,
+    0x7, 0xfe, 0xf, 0xfe, 0x0, 0x0, 0x3, 0xff,
+    0x7, 0xff, 0x0, 0x0, 0x1, 0xff, 0x83, 0xff,
+    0x80, 0x0, 0x1, 0xff, 0xc1, 0xff, 0xc0, 0x0,
+    0x0, 0xff, 0xe0, 0xff, 0xc0, 0x0, 0x0, 0x7f,
+    0xf0, 0x7f, 0xe0, 0x0, 0x0, 0x3f, 0xf8, 0x3f,
+    0xf0, 0x0, 0x0, 0x1f, 0xfc, 0x3f, 0xf8, 0x0,
+    0x0, 0xf, 0xfe, 0x1f, 0xfc, 0x0, 0x0, 0x7,
+    0xff, 0xf, 0xfe, 0x0, 0x0, 0x3, 0xff, 0x87,
+    0xff, 0x0, 0x0, 0x1, 0xff, 0xc3, 0xff, 0x80,
+    0x0, 0x0, 0xff, 0xe1, 0xff, 0xc0, 0x0, 0x0,
+    0x7f, 0xf0, 0xff, 0xe0, 0x0, 0x0, 0x3f, 0xf8,
+    0x7f, 0xf0, 0x0, 0x0, 0x1f, 0xfc, 0x3f, 0xf8,
+    0x0, 0x0, 0xf, 0xfc, 0x1f, 0xfc, 0x0, 0x0,
+    0x7, 0xfe, 0xf, 0xfe, 0x0, 0x0, 0x3, 0xff,
+    0x7, 0xff, 0x0, 0x0, 0x3, 0xff, 0x83, 0xff,
+    0x80, 0x0, 0x1, 0xff, 0xc1, 0xff, 0x80, 0x0,
+    0x0, 0xff, 0xe0, 0xff, 0xc0, 0x0, 0x0, 0x7f,
+    0xf0, 0x7f, 0xe0, 0x0, 0x0, 0x3f, 0xf8, 0x3f,
+    0xf0, 0x0, 0x0, 0x1f, 0xfc, 0x3f, 0xf8, 0x0,
+    0x0, 0xf, 0xfe, 0x1f, 0xf8, 0x0, 0x0, 0x7,
+    0xff, 0xf, 0xf8, 0xff, 0xff, 0xf9, 0xff, 0x87,
+    0xf8, 0xff, 0xff, 0xfc, 0xff, 0xc3, 0xf8, 0xff,
+    0xff, 0xfe, 0x7f, 0xc0, 0xf8, 0xff, 0xff, 0xff,
+    0x9f, 0xe0, 0x70, 0xff, 0xff, 0xff, 0xcf, 0xe0,
+    0x11, 0xff, 0xff, 0xff, 0xe7, 0xf0, 0x1, 0xff,
+    0xff, 0xff, 0xf1, 0xf0, 0x1, 0xff, 0xff, 0xff,
+    0xfc, 0xf0, 0x0, 0x7f, 0xff, 0xff, 0xfe, 0x60,
+    0x0, 0xf, 0xff, 0xff, 0xff, 0x0, 0x0,
+
+    /* U+0031 "1" */
+    0x0, 0x40, 0x1, 0xc0, 0x3, 0xe0, 0xf, 0xc0,
+    0x1f, 0xc0, 0x3f, 0x80, 0xff, 0x81, 0xff, 0x7,
+    0xfe, 0xf, 0xfc, 0x3f, 0xf8, 0x7f, 0xf0, 0xff,
+    0xe1, 0xff, 0xc3, 0xff, 0x87, 0xff, 0xf, 0xfc,
+    0x1f, 0xf8, 0x3f, 0xf0, 0xff, 0xe1, 0xff, 0xc3,
+    0xff, 0x87, 0xff, 0xf, 0xfe, 0x1f, 0xfc, 0x3f,
+    0xf8, 0x7f, 0xf0, 0xff, 0xe1, 0xff, 0xc3, 0xff,
+    0x87, 0xff, 0xf, 0xfe, 0x1f, 0xf8, 0x3f, 0xf0,
+    0xff, 0xe0, 0xff, 0xc0, 0xff, 0x80, 0xff, 0x0,
+    0x7c, 0x0, 0x70, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0xc, 0x0, 0x7c, 0x1, 0xfe,
+    0x7, 0xfc, 0x3f, 0xf0, 0x7f, 0xe0, 0xff, 0xc3,
+    0xff, 0x87, 0xff, 0xf, 0xfe, 0x1f, 0xfc, 0x3f,
+    0xf8, 0x7f, 0xf0, 0xff, 0xe1, 0xff, 0xc3, 0xff,
+    0x87, 0xff, 0xf, 0xfe, 0x1f, 0xfc, 0x3f, 0xf8,
+    0x7f, 0xe0, 0xff, 0xc3, 0xff, 0x87, 0xff, 0xf,
+    0xfe, 0x1f, 0xfc, 0x3f, 0xf8, 0x7f, 0xf0, 0xff,
+    0xe1, 0xff, 0xc1, 0xff, 0x83, 0xff, 0x7, 0xfe,
+    0x7, 0xf8, 0xf, 0xf0, 0x1f, 0xc0, 0x1f, 0x80,
+    0x3e, 0x0, 0x78, 0x0, 0xc0, 0x0,
+
+    /* U+0032 "2" */
+    0x0, 0xf, 0xff, 0xff, 0xff, 0x80, 0x0, 0x1f,
+    0xff, 0xff, 0xff, 0x88, 0x0, 0x1f, 0xff, 0xff,
+    0xff, 0xcf, 0x0, 0x7, 0xff, 0xff, 0xff, 0xc7,
+    0xc0, 0x1, 0xff, 0xff, 0xff, 0xe7, 0xe0, 0x0,
+    0x7f, 0xff, 0xff, 0xf3, 0xf8, 0x0, 0x1f, 0xff,
+    0xff, 0xf3, 0xfc, 0x0, 0x7, 0xff, 0xff, 0xf9,
+    0xff, 0x0, 0x1, 0xff, 0xff, 0xf9, 0xff, 0x80,
+    0x0, 0x7f, 0xff, 0xfc, 0xff, 0xc0, 0x0, 0x0,
+    0x0, 0x0, 0x7f, 0xe0, 0x0, 0x0, 0x0, 0x0,
+    0x7f, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xf8,
+    0x0, 0x0, 0x0, 0x0, 0x1f, 0xfc, 0x0, 0x0,
+    0x0, 0x0, 0xf, 0xfe, 0x0, 0x0, 0x0, 0x0,
+    0x7, 0xff, 0x0, 0x0, 0x0, 0x0, 0x3, 0xff,
+    0x80, 0x0, 0x0, 0x0, 0x1, 0xff, 0x80, 0x0,
+    0x0, 0x0, 0x0, 0xff, 0xc0, 0x0, 0x0, 0x0,
+    0x0, 0x7f, 0xe0, 0x0, 0x0, 0x0, 0x0, 0x7f,
+    0xf0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xf8, 0x0,
+    0x0, 0x0, 0x0, 0x1f, 0xfc, 0x0, 0x0, 0x0,
+    0x0, 0xf, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x7,
+    0xff, 0x0, 0x0, 0x0, 0x0, 0x3, 0xff, 0x80,
+    0x0, 0x0, 0x0, 0x1, 0xff, 0xc0, 0x0, 0x0,
+    0x0, 0x0, 0xff, 0xe0, 0x0, 0x0, 0x0, 0x0,
+    0x7f, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xf8,
+    0x0, 0x0, 0x0, 0x0, 0x1f, 0xfc, 0x0, 0x0,
+    0x0, 0x0, 0xf, 0xfe, 0x0, 0x0, 0x0, 0x0,
+    0x7, 0xff, 0x0, 0x0, 0x0, 0x0, 0x3, 0xff,
+    0x0, 0x0, 0x0, 0x0, 0x1, 0xff, 0x80, 0x0,
+    0x0, 0x0, 0x1, 0xff, 0xc0, 0x0, 0x0, 0x0,
+    0x0, 0xff, 0xe0, 0x0, 0x0, 0x0, 0x0, 0x1f,
+    0xf0, 0x0, 0xf, 0xff, 0xff, 0xc7, 0xf8, 0x0,
+    0xf, 0xff, 0xff, 0xf1, 0xf8, 0x0, 0x1f, 0xff,
+    0xff, 0xfc, 0x38, 0x0, 0x1f, 0xff, 0xff, 0xff,
+    0x88, 0x0, 0x3f, 0xff, 0xff, 0xff, 0xe0, 0x0,
+    0x1f, 0xff, 0xff, 0xff, 0xf0, 0x0, 0x3, 0xff,
+    0xff, 0xff, 0xe0, 0x0, 0x70, 0xff, 0xff, 0xff,
+    0xe0, 0x0, 0x7e, 0x3f, 0xff, 0xff, 0xc0, 0x0,
+    0x7f, 0x87, 0xff, 0xff, 0xc0, 0x0, 0x3f, 0xe0,
+    0x0, 0x0, 0x0, 0x0, 0x1f, 0xfc, 0x0, 0x0,
+    0x0, 0x0, 0xf, 0xfe, 0x0, 0x0, 0x0, 0x0,
+    0x7, 0xff, 0x0, 0x0, 0x0, 0x0, 0x3, 0xff,
+    0x80, 0x0, 0x0, 0x0, 0x1, 0xff, 0xc0, 0x0,
+    0x0, 0x0, 0x0, 0xff, 0xc0, 0x0, 0x0, 0x0,
+    0x0, 0x7f, 0xe0, 0x0, 0x0, 0x0, 0x0, 0x3f,
+    0xf0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xf8, 0x0,
+    0x0, 0x0, 0x0, 0x1f, 0xfc, 0x0, 0x0, 0x0,
+    0x0, 0xf, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x7,
+    0xff, 0x0, 0x0, 0x0, 0x0, 0x3, 0xff, 0x80,
+    0x0, 0x0, 0x0, 0x1, 0xff, 0xc0, 0x0, 0x0,
+    0x0, 0x0, 0xff, 0xe0, 0x0, 0x0, 0x0, 0x0,
+    0x7f, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xf8,
+    0x0, 0x0, 0x0, 0x0, 0x1f, 0xfc, 0x0, 0x0,
+    0x0, 0x0, 0xf, 0xfe, 0x0, 0x0, 0x0, 0x0,
+    0x7, 0xff, 0x0, 0x0, 0x0, 0x0, 0x3, 0xff,
+    0x80, 0x0, 0x0, 0x0, 0x1, 0xff, 0x80, 0x0,
+    0x0, 0x0, 0x0, 0xff, 0xc0, 0x0, 0x0, 0x0,
+    0x0, 0x7f, 0xe0, 0x0, 0x0, 0x0, 0x0, 0x3f,
+    0xf0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xf8, 0x0,
+    0x0, 0x0, 0x0, 0x1f, 0xf8, 0x0, 0x0, 0x0,
+    0x0, 0xf, 0xf8, 0xff, 0xff, 0xf8, 0x0, 0x7,
+    0xf8, 0xff, 0xff, 0xfc, 0x0, 0x3, 0xf8, 0xff,
+    0xff, 0xfe, 0x0, 0x0, 0xf8, 0xff, 0xff, 0xff,
+    0x80, 0x0, 0x70, 0xff, 0xff, 0xff, 0xc0, 0x0,
+    0x11, 0xff, 0xff, 0xff, 0xe0, 0x0, 0x1, 0xff,
+    0xff, 0xff, 0xf0, 0x0, 0x1, 0xff, 0xff, 0xff,
+    0xfc, 0x0, 0x0, 0x7f, 0xff, 0xff, 0xfe, 0x0,
+    0x0, 0xf, 0xff, 0xff, 0xff, 0x0, 0x0,
+
+    /* U+0033 "3" */
+    0x0, 0xff, 0xff, 0xff, 0xf8, 0x0, 0x1f, 0xff,
+    0xff, 0xff, 0x88, 0x1, 0xff, 0xff, 0xff, 0xfc,
+    0xf0, 0x7, 0xff, 0xff, 0xff, 0xc7, 0xc0, 0x1f,
+    0xff, 0xff, 0xfe, 0x7e, 0x0, 0x7f, 0xff, 0xff,
+    0xf3, 0xf8, 0x1, 0xff, 0xff, 0xff, 0x3f, 0xc0,
+    0x7, 0xff, 0xff, 0xf9, 0xff, 0x0, 0x1f, 0xff,
+    0xff, 0x9f, 0xf8, 0x0, 0x7f, 0xff, 0xfc, 0xff,
+    0xc0, 0x0, 0x0, 0x0, 0x7, 0xfe, 0x0, 0x0,
+    0x0, 0x0, 0x7f, 0xf0, 0x0, 0x0, 0x0, 0x3,
+    0xff, 0x80, 0x0, 0x0, 0x0, 0x1f, 0xfc, 0x0,
+    0x0, 0x0, 0x0, 0xff, 0xe0, 0x0, 0x0, 0x0,
+    0x7, 0xff, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xf8,
+    0x0, 0x0, 0x0, 0x1, 0xff, 0x80, 0x0, 0x0,
+    0x0, 0xf, 0xfc, 0x0, 0x0, 0x0, 0x0, 0x7f,
+    0xe0, 0x0, 0x0, 0x0, 0x7, 0xff, 0x0, 0x0,
+    0x0, 0x0, 0x3f, 0xf8, 0x0, 0x0, 0x0, 0x1,
+    0xff, 0xc0, 0x0, 0x0, 0x0, 0xf, 0xfe, 0x0,
+    0x0, 0x0, 0x0, 0x7f, 0xf0, 0x0, 0x0, 0x0,
+    0x3, 0xff, 0x80, 0x0, 0x0, 0x0, 0x1f, 0xfc,
+    0x0, 0x0, 0x0, 0x0, 0xff, 0xe0, 0x0, 0x0,
+    0x0, 0x7, 0xff, 0x0, 0x0, 0x0, 0x0, 0x3f,
+    0xf8, 0x0, 0x0, 0x0, 0x1, 0xff, 0xc0, 0x0,
+    0x0, 0x0, 0xf, 0xfe, 0x0, 0x0, 0x0, 0x0,
+    0x7f, 0xf0, 0x0, 0x0, 0x0, 0x3, 0xff, 0x0,
+    0x0, 0x0, 0x0, 0x1f, 0xf8, 0x0, 0x0, 0x0,
+    0x1, 0xff, 0xc0, 0x0, 0x0, 0x0, 0xf, 0xfe,
+    0x0, 0x0, 0x0, 0x0, 0x1f, 0xf0, 0x0, 0xff,
+    0xff, 0xfc, 0x7f, 0x80, 0xf, 0xff, 0xff, 0xf1,
+    0xf8, 0x1, 0xff, 0xff, 0xff, 0xc3, 0x80, 0x1f,
+    0xff, 0xff, 0xff, 0x88, 0x3, 0xff, 0xff, 0xff,
+    0xfe, 0x0, 0x1f, 0xff, 0xff, 0xff, 0xf0, 0x0,
+    0x3f, 0xff, 0xff, 0xfe, 0x0, 0x0, 0xff, 0xff,
+    0xff, 0xe1, 0x80, 0x3, 0xff, 0xff, 0xfc, 0x3f,
+    0x0, 0x7, 0xff, 0xff, 0xc3, 0xfc, 0x0, 0x0,
+    0x0, 0x0, 0x7f, 0xc0, 0x0, 0x0, 0x0, 0x7,
+    0xfe, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xf0, 0x0,
+    0x0, 0x0, 0x1, 0xff, 0x80, 0x0, 0x0, 0x0,
+    0x1f, 0xfc, 0x0, 0x0, 0x0, 0x0, 0xff, 0xe0,
+    0x0, 0x0, 0x0, 0x7, 0xff, 0x0, 0x0, 0x0,
+    0x0, 0x3f, 0xf8, 0x0, 0x0, 0x0, 0x1, 0xff,
+    0xc0, 0x0, 0x0, 0x0, 0xf, 0xfe, 0x0, 0x0,
+    0x0, 0x0, 0x7f, 0xf0, 0x0, 0x0, 0x0, 0x3,
+    0xff, 0x80, 0x0, 0x0, 0x0, 0x1f, 0xfc, 0x0,
+    0x0, 0x0, 0x0, 0xff, 0xe0, 0x0, 0x0, 0x0,
+    0x7, 0xff, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xf8,
+    0x0, 0x0, 0x0, 0x1, 0xff, 0xc0, 0x0, 0x0,
+    0x0, 0xf, 0xfc, 0x0, 0x0, 0x0, 0x0, 0x7f,
+    0xe0, 0x0, 0x0, 0x0, 0x3, 0xff, 0x0, 0x0,
+    0x0, 0x0, 0x3f, 0xf8, 0x0, 0x0, 0x0, 0x1,
+    0xff, 0xc0, 0x0, 0x0, 0x0, 0xf, 0xfe, 0x0,
+    0x0, 0x0, 0x0, 0x7f, 0xf0, 0x0, 0x0, 0x0,
+    0x3, 0xff, 0x80, 0x0, 0x0, 0x0, 0x1f, 0xfc,
+    0x0, 0x0, 0x0, 0x0, 0xff, 0xe0, 0x0, 0x0,
+    0x0, 0x7, 0xff, 0x0, 0xf, 0xff, 0xff, 0x9f,
+    0xf8, 0x0, 0xff, 0xff, 0xfc, 0xff, 0xc0, 0xf,
+    0xff, 0xff, 0xe7, 0xfc, 0x0, 0xff, 0xff, 0xff,
+    0x9f, 0xe0, 0xf, 0xff, 0xff, 0xfc, 0xfe, 0x1,
+    0xff, 0xff, 0xff, 0xe7, 0xf0, 0x1f, 0xff, 0xff,
+    0xff, 0x1f, 0x1, 0xff, 0xff, 0xff, 0xfc, 0xf0,
+    0x7, 0xff, 0xff, 0xff, 0xe6, 0x0, 0xf, 0xff,
+    0xff, 0xff, 0x0, 0x0,
+
+    /* U+0034 "4" */
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x7, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x1e, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7c, 0x18,
+    0x0, 0x0, 0x0, 0x3, 0xf8, 0x70, 0x0, 0x0,
+    0x0, 0xf, 0xe3, 0xe0, 0x0, 0x0, 0x0, 0x7f,
+    0xcf, 0xc0, 0x0, 0x0, 0x1, 0xff, 0x3f, 0x80,
+    0x0, 0x0, 0xf, 0xfd, 0xff, 0x0, 0x0, 0x0,
+    0x3f, 0xf7, 0xfe, 0x0, 0x0, 0x0, 0xff, 0xdf,
+    0xfc, 0x0, 0x0, 0x7, 0xff, 0x7f, 0xf0, 0x0,
+    0x0, 0x1f, 0xfd, 0xff, 0xc0, 0x0, 0x0, 0x7f,
+    0xf7, 0xff, 0x0, 0x0, 0x1, 0xff, 0xdf, 0xfc,
+    0x0, 0x0, 0x7, 0xff, 0x7f, 0xf0, 0x0, 0x0,
+    0x1f, 0xfd, 0xff, 0xc0, 0x0, 0x0, 0x7f, 0xe7,
+    0xff, 0x0, 0x0, 0x1, 0xff, 0x9f, 0xfc, 0x0,
+    0x0, 0xf, 0xfe, 0x7f, 0xf0, 0x0, 0x0, 0x3f,
+    0xf9, 0xff, 0x80, 0x0, 0x0, 0xff, 0xe7, 0xfe,
+    0x0, 0x0, 0x3, 0xff, 0x9f, 0xf8, 0x0, 0x0,
+    0xf, 0xfe, 0xff, 0xe0, 0x0, 0x0, 0x3f, 0xfb,
+    0xff, 0x80, 0x0, 0x0, 0xff, 0xef, 0xfe, 0x0,
+    0x0, 0x3, 0xff, 0xbf, 0xf8, 0x0, 0x0, 0xf,
+    0xfe, 0xff, 0xe0, 0x0, 0x0, 0x3f, 0xfb, 0xff,
+    0x80, 0x0, 0x0, 0xff, 0xef, 0xfe, 0x0, 0x0,
+    0x3, 0xff, 0xbf, 0xf8, 0x0, 0x0, 0xf, 0xfe,
+    0xff, 0xe0, 0x0, 0x0, 0x3f, 0xf3, 0xff, 0x80,
+    0x0, 0x0, 0xff, 0xcf, 0xfe, 0x0, 0x0, 0x7,
+    0xff, 0x3f, 0xf8, 0x0, 0x0, 0x1f, 0xfc, 0xff,
+    0x80, 0x0, 0x0, 0x1f, 0xf3, 0xfc, 0x7f, 0xff,
+    0xfe, 0x3f, 0xcf, 0xc3, 0xff, 0xff, 0xfc, 0x7e,
+    0xe, 0x3f, 0xff, 0xff, 0xf8, 0x70, 0x1, 0xff,
+    0xff, 0xff, 0xf8, 0x80, 0x1f, 0xff, 0xff, 0xff,
+    0xf0, 0x0, 0x7f, 0xff, 0xff, 0xff, 0xc0, 0x0,
+    0x7f, 0xff, 0xff, 0xfc, 0x0, 0x0, 0xff, 0xff,
+    0xff, 0xe1, 0x80, 0x1, 0xff, 0xff, 0xfe, 0x1f,
+    0x80, 0x1, 0xff, 0xff, 0xf0, 0xff, 0x0, 0x0,
+    0x0, 0x0, 0xf, 0xf8, 0x0, 0x0, 0x0, 0x0,
+    0x7f, 0xe0, 0x0, 0x0, 0x0, 0x1, 0xff, 0x80,
+    0x0, 0x0, 0x0, 0x7, 0xfe, 0x0, 0x0, 0x0,
+    0x0, 0x3f, 0xf8, 0x0, 0x0, 0x0, 0x0, 0xff,
+    0xe0, 0x0, 0x0, 0x0, 0x3, 0xff, 0x80, 0x0,
+    0x0, 0x0, 0xf, 0xfe, 0x0, 0x0, 0x0, 0x0,
+    0x3f, 0xf8, 0x0, 0x0, 0x0, 0x0, 0xff, 0xe0,
+    0x0, 0x0, 0x0, 0x3, 0xff, 0x80, 0x0, 0x0,
+    0x0, 0xf, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x3f,
+    0xf8, 0x0, 0x0, 0x0, 0x0, 0xff, 0xe0, 0x0,
+    0x0, 0x0, 0x3, 0xff, 0x80, 0x0, 0x0, 0x0,
+    0xf, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xf0,
+    0x0, 0x0, 0x0, 0x0, 0xff, 0xc0, 0x0, 0x0,
+    0x0, 0x3, 0xff, 0x0, 0x0, 0x0, 0x0, 0x1f,
+    0xfc, 0x0, 0x0, 0x0, 0x0, 0x7f, 0xf0, 0x0,
+    0x0, 0x0, 0x1, 0xff, 0xc0, 0x0, 0x0, 0x0,
+    0x7, 0xff, 0x0, 0x0, 0x0, 0x0, 0x1f, 0xfc,
+    0x0, 0x0, 0x0, 0x0, 0x7f, 0xf0, 0x0, 0x0,
+    0x0, 0x1, 0xff, 0xc0, 0x0, 0x0, 0x0, 0x7,
+    0xff, 0x0, 0x0, 0x0, 0x0, 0xf, 0xfc, 0x0,
+    0x0, 0x0, 0x0, 0x3f, 0xf0, 0x0, 0x0, 0x0,
+    0x0, 0xff, 0x80, 0x0, 0x0, 0x0, 0x1, 0xfe,
+    0x0, 0x0, 0x0, 0x0, 0x7, 0xf8, 0x0, 0x0,
+    0x0, 0x0, 0x1f, 0xc0, 0x0, 0x0, 0x0, 0x0,
+    0x3e, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf0, 0x0,
+    0x0, 0x0, 0x0, 0x3, 0x80, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0,
+
+    /* U+0035 "5" */
+    0x0, 0x7f, 0xff, 0xff, 0xfc, 0x0, 0x1f, 0xff,
+    0xff, 0xff, 0x80, 0x3, 0xff, 0xff, 0xff, 0xf8,
+    0x0, 0x1f, 0xff, 0xff, 0xff, 0x0, 0x8, 0xff,
+    0xff, 0xff, 0xf0, 0x1, 0xc7, 0xff, 0xff, 0xff,
+    0x0, 0x3e, 0x3f, 0xff, 0xff, 0xe0, 0x3, 0xf1,
+    0xff, 0xff, 0xfe, 0x0, 0x3f, 0x8f, 0xff, 0xff,
+    0xc0, 0x3, 0xfc, 0x7f, 0xff, 0xfc, 0x0, 0x7f,
+    0xe0, 0x0, 0x0, 0x0, 0x7, 0xff, 0x0, 0x0,
+    0x0, 0x0, 0x7f, 0xf0, 0x0, 0x0, 0x0, 0x7,
+    0xff, 0x0, 0x0, 0x0, 0x0, 0x7f, 0xf0, 0x0,
+    0x0, 0x0, 0x7, 0xff, 0x0, 0x0, 0x0, 0x0,
+    0x7f, 0xf0, 0x0, 0x0, 0x0, 0x7, 0xff, 0x0,
+    0x0, 0x0, 0x0, 0x7f, 0xf0, 0x0, 0x0, 0x0,
+    0x7, 0xff, 0x0, 0x0, 0x0, 0x0, 0x7f, 0xf0,
+    0x0, 0x0, 0x0, 0x7, 0xff, 0x0, 0x0, 0x0,
+    0x0, 0x7f, 0xe0, 0x0, 0x0, 0x0, 0x7, 0xfe,
+    0x0, 0x0, 0x0, 0x0, 0x7f, 0xe0, 0x0, 0x0,
+    0x0, 0xf, 0xfe, 0x0, 0x0, 0x0, 0x0, 0xff,
+    0xe0, 0x0, 0x0, 0x0, 0xf, 0xfe, 0x0, 0x0,
+    0x0, 0x0, 0xff, 0xe0, 0x0, 0x0, 0x0, 0xf,
+    0xfe, 0x0, 0x0, 0x0, 0x0, 0xff, 0xe0, 0x0,
+    0x0, 0x0, 0xf, 0xfe, 0x0, 0x0, 0x0, 0x0,
+    0xff, 0xe0, 0x0, 0x0, 0x0, 0xf, 0xfe, 0x0,
+    0x0, 0x0, 0x0, 0xff, 0xe0, 0x0, 0x0, 0x0,
+    0xf, 0xfe, 0x0, 0x0, 0x0, 0x0, 0xff, 0xe0,
+    0x0, 0x0, 0x0, 0xf, 0xf8, 0x0, 0x0, 0x0,
+    0x0, 0xff, 0x1f, 0xff, 0xff, 0x80, 0xf, 0xc3,
+    0xff, 0xff, 0xfc, 0x0, 0x38, 0xff, 0xff, 0xff,
+    0xe0, 0x0, 0x1f, 0xff, 0xff, 0xff, 0x80, 0x7,
+    0xff, 0xff, 0xff, 0xfc, 0x0, 0x7f, 0xff, 0xff,
+    0xff, 0xc0, 0x1, 0xff, 0xff, 0xff, 0xf0, 0x0,
+    0xf, 0xff, 0xff, 0xfe, 0x18, 0x0, 0x7f, 0xff,
+    0xff, 0x87, 0xe0, 0x1, 0xff, 0xff, 0xf0, 0xff,
+    0x0, 0x0, 0x0, 0x0, 0x3f, 0xe0, 0x0, 0x0,
+    0x0, 0x7, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x7f,
+    0xe0, 0x0, 0x0, 0x0, 0x7, 0xfe, 0x0, 0x0,
+    0x0, 0x0, 0xff, 0xe0, 0x0, 0x0, 0x0, 0xf,
+    0xfe, 0x0, 0x0, 0x0, 0x0, 0xff, 0xe0, 0x0,
+    0x0, 0x0, 0xf, 0xfe, 0x0, 0x0, 0x0, 0x0,
+    0xff, 0xe0, 0x0, 0x0, 0x0, 0xf, 0xfe, 0x0,
+    0x0, 0x0, 0x0, 0xff, 0xe0, 0x0, 0x0, 0x0,
+    0xf, 0xfe, 0x0, 0x0, 0x0, 0x0, 0xff, 0xe0,
+    0x0, 0x0, 0x0, 0xf, 0xfe, 0x0, 0x0, 0x0,
+    0x0, 0xff, 0xe0, 0x0, 0x0, 0x0, 0xf, 0xfe,
+    0x0, 0x0, 0x0, 0x0, 0xff, 0xe0, 0x0, 0x0,
+    0x0, 0xf, 0xfc, 0x0, 0x0, 0x0, 0x0, 0xff,
+    0xc0, 0x0, 0x0, 0x0, 0xf, 0xfc, 0x0, 0x0,
+    0x0, 0x1, 0xff, 0xc0, 0x0, 0x0, 0x0, 0x1f,
+    0xfc, 0x0, 0x0, 0x0, 0x1, 0xff, 0xc0, 0x0,
+    0x0, 0x0, 0x1f, 0xfc, 0x0, 0x0, 0x0, 0x1,
+    0xff, 0xc0, 0x0, 0x0, 0x0, 0x1f, 0xfc, 0x0,
+    0x0, 0x0, 0x1, 0xff, 0xc0, 0x0, 0x0, 0x0,
+    0x1f, 0xfc, 0x0, 0x7f, 0xff, 0xfc, 0xff, 0xc0,
+    0xf, 0xff, 0xff, 0xcf, 0xfc, 0x1, 0xff, 0xff,
+    0xfc, 0xff, 0x80, 0x3f, 0xff, 0xff, 0xe7, 0xf8,
+    0x7, 0xff, 0xff, 0xfe, 0x7f, 0x1, 0xff, 0xff,
+    0xff, 0xe7, 0xf0, 0x3f, 0xff, 0xff, 0xfe, 0x3e,
+    0x7, 0xff, 0xff, 0xff, 0xf3, 0xc0, 0x3f, 0xff,
+    0xff, 0xff, 0x30, 0x0, 0xff, 0xff, 0xff, 0xf0,
+    0x0,
+
+    /* U+0036 "6" */
+    0x0, 0xf, 0xff, 0xff, 0xff, 0x80, 0x0, 0x7f,
+    0xff, 0xff, 0xfe, 0x0, 0x1, 0xff, 0xff, 0xff,
+    0xfc, 0x0, 0x1, 0xff, 0xff, 0xff, 0xf0, 0x0,
+    0x11, 0xff, 0xff, 0xff, 0xe0, 0x0, 0x71, 0xff,
+    0xff, 0xff, 0xc0, 0x1, 0xf1, 0xff, 0xff, 0xff,
+    0x0, 0x3, 0xf1, 0xff, 0xff, 0xfe, 0x0, 0x7,
+    0xf1, 0xff, 0xff, 0xf8, 0x0, 0xf, 0xf1, 0xff,
+    0xff, 0xf0, 0x0, 0x3f, 0xf0, 0x0, 0x0, 0x0,
+    0x0, 0x7f, 0xf0, 0x0, 0x0, 0x0, 0x0, 0xff,
+    0xe0, 0x0, 0x0, 0x0, 0x1, 0xff, 0xc0, 0x0,
+    0x0, 0x0, 0x3, 0xff, 0x80, 0x0, 0x0, 0x0,
+    0x7, 0xff, 0x0, 0x0, 0x0, 0x0, 0xf, 0xfe,
+    0x0, 0x0, 0x0, 0x0, 0x1f, 0xfc, 0x0, 0x0,
+    0x0, 0x0, 0x3f, 0xf8, 0x0, 0x0, 0x0, 0x0,
+    0x7f, 0xf0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xe0,
+    0x0, 0x0, 0x0, 0x1, 0xff, 0xc0, 0x0, 0x0,
+    0x0, 0x3, 0xff, 0x0, 0x0, 0x0, 0x0, 0x7,
+    0xfe, 0x0, 0x0, 0x0, 0x0, 0xf, 0xfc, 0x0,
+    0x0, 0x0, 0x0, 0x3f, 0xf8, 0x0, 0x0, 0x0,
+    0x0, 0x7f, 0xf0, 0x0, 0x0, 0x0, 0x0, 0xff,
+    0xe0, 0x0, 0x0, 0x0, 0x1, 0xff, 0xc0, 0x0,
+    0x0, 0x0, 0x3, 0xff, 0x80, 0x0, 0x0, 0x0,
+    0x7, 0xff, 0x0, 0x0, 0x0, 0x0, 0xf, 0xfe,
+    0x0, 0x0, 0x0, 0x0, 0x1f, 0xfc, 0x0, 0x0,
+    0x0, 0x0, 0x3f, 0xf8, 0x0, 0x0, 0x0, 0x0,
+    0x7f, 0xf0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xe0,
+    0x0, 0x0, 0x0, 0x1, 0xff, 0xc0, 0x0, 0x0,
+    0x0, 0x3, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x7,
+    0xf8, 0xff, 0xff, 0xfc, 0x0, 0xf, 0xc3, 0xff,
+    0xff, 0xfc, 0x0, 0x7, 0x1f, 0xff, 0xff, 0xfc,
+    0x0, 0x0, 0x7f, 0xff, 0xff, 0xfe, 0x0, 0x3,
+    0xff, 0xff, 0xff, 0xfe, 0x0, 0x7, 0xff, 0xff,
+    0xff, 0xfc, 0x0, 0x3, 0xff, 0xff, 0xff, 0xe0,
+    0x1, 0xc3, 0xff, 0xff, 0xff, 0x86, 0x7, 0xe3,
+    0xff, 0xff, 0xfc, 0x3f, 0x1f, 0xe1, 0xff, 0xff,
+    0xf0, 0xff, 0x3f, 0xe0, 0x0, 0x0, 0x7, 0xfc,
+    0x7f, 0xf0, 0x0, 0x0, 0x1f, 0xf8, 0xff, 0xe0,
+    0x0, 0x0, 0x3f, 0xf1, 0xff, 0xc0, 0x0, 0x0,
+    0x7f, 0xe3, 0xff, 0x80, 0x0, 0x1, 0xff, 0xc7,
+    0xff, 0x0, 0x0, 0x3, 0xff, 0x8f, 0xfc, 0x0,
+    0x0, 0x7, 0xff, 0x1f, 0xf8, 0x0, 0x0, 0xf,
+    0xfe, 0x3f, 0xf0, 0x0, 0x0, 0x1f, 0xfc, 0xff,
+    0xe0, 0x0, 0x0, 0x3f, 0xf9, 0xff, 0xc0, 0x0,
+    0x0, 0x7f, 0xf3, 0xff, 0x80, 0x0, 0x0, 0xff,
+    0xe7, 0xff, 0x0, 0x0, 0x1, 0xff, 0xcf, 0xfe,
+    0x0, 0x0, 0x3, 0xff, 0x9f, 0xfc, 0x0, 0x0,
+    0x7, 0xff, 0x3f, 0xf8, 0x0, 0x0, 0xf, 0xfe,
+    0x7f, 0xf0, 0x0, 0x0, 0x1f, 0xfc, 0xff, 0xe0,
+    0x0, 0x0, 0x3f, 0xf1, 0xff, 0xc0, 0x0, 0x0,
+    0x7f, 0xe3, 0xff, 0x80, 0x0, 0x0, 0xff, 0xc7,
+    0xff, 0x0, 0x0, 0x3, 0xff, 0x8f, 0xfe, 0x0,
+    0x0, 0x7, 0xff, 0x1f, 0xf8, 0x0, 0x0, 0xf,
+    0xfe, 0x3f, 0xf0, 0x0, 0x0, 0x1f, 0xfc, 0x7f,
+    0xe0, 0x0, 0x0, 0x3f, 0xf8, 0xff, 0xc0, 0x0,
+    0x0, 0x7f, 0xf3, 0xff, 0x80, 0x0, 0x0, 0xff,
+    0xe7, 0xfe, 0x0, 0x0, 0x1, 0xff, 0xcf, 0xf8,
+    0xff, 0xff, 0xf9, 0xff, 0x9f, 0xe3, 0xff, 0xff,
+    0xf3, 0xff, 0x3f, 0x8f, 0xff, 0xff, 0xe7, 0xfc,
+    0x3e, 0x3f, 0xff, 0xff, 0xe7, 0xf8, 0x70, 0xff,
+    0xff, 0xff, 0xcf, 0xe0, 0x47, 0xff, 0xff, 0xff,
+    0x9f, 0xc0, 0x1f, 0xff, 0xff, 0xff, 0x1f, 0x0,
+    0x7f, 0xff, 0xff, 0xff, 0x3c, 0x0, 0x7f, 0xff,
+    0xff, 0xfe, 0x60, 0x0, 0x3f, 0xff, 0xff, 0xfc,
+    0x0, 0x0,
+
+    /* U+0037 "7" */
+    0x1f, 0xff, 0xff, 0xff, 0x0, 0x7f, 0xff, 0xff,
+    0xfe, 0x20, 0xff, 0xff, 0xff, 0xfe, 0x78, 0x7f,
+    0xff, 0xff, 0xfc, 0x7c, 0x3f, 0xff, 0xff, 0xfc,
+    0xfe, 0x1f, 0xff, 0xff, 0xfc, 0xfe, 0xf, 0xff,
+    0xff, 0xf9, 0xfe, 0x7, 0xff, 0xff, 0xf9, 0xff,
+    0x3, 0xff, 0xff, 0xf3, 0xff, 0x1, 0xff, 0xff,
+    0xf3, 0xff, 0x0, 0x0, 0x0, 0x3, 0xff, 0x0,
+    0x0, 0x0, 0x7, 0xff, 0x0, 0x0, 0x0, 0x7,
+    0xff, 0x0, 0x0, 0x0, 0x7, 0xff, 0x0, 0x0,
+    0x0, 0x7, 0xff, 0x0, 0x0, 0x0, 0x7, 0xff,
+    0x0, 0x0, 0x0, 0x7, 0xff, 0x0, 0x0, 0x0,
+    0x7, 0xfe, 0x0, 0x0, 0x0, 0x7, 0xfe, 0x0,
+    0x0, 0x0, 0xf, 0xfe, 0x0, 0x0, 0x0, 0xf,
+    0xfe, 0x0, 0x0, 0x0, 0xf, 0xfe, 0x0, 0x0,
+    0x0, 0xf, 0xfe, 0x0, 0x0, 0x0, 0xf, 0xfe,
+    0x0, 0x0, 0x0, 0xf, 0xfe, 0x0, 0x0, 0x0,
+    0xf, 0xfe, 0x0, 0x0, 0x0, 0xf, 0xfe, 0x0,
+    0x0, 0x0, 0xf, 0xfe, 0x0, 0x0, 0x0, 0xf,
+    0xfe, 0x0, 0x0, 0x0, 0xf, 0xfe, 0x0, 0x0,
+    0x0, 0xf, 0xfe, 0x0, 0x0, 0x0, 0xf, 0xfe,
+    0x0, 0x0, 0x0, 0xf, 0xfc, 0x0, 0x0, 0x0,
+    0xf, 0xfc, 0x0, 0x0, 0x0, 0x1f, 0xfc, 0x0,
+    0x0, 0x0, 0xf, 0xfc, 0x0, 0x0, 0x0, 0x7,
+    0xfc, 0x0, 0x0, 0x0, 0x3, 0xfc, 0x0, 0x0,
+    0x0, 0x1, 0xf8, 0x0, 0x0, 0x0, 0x0, 0x70,
+    0x0, 0x0, 0x0, 0x0, 0x20, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x60, 0x0, 0x0, 0x0, 0x0, 0xf0, 0x0, 0x0,
+    0x0, 0x3, 0xf8, 0x0, 0x0, 0x0, 0x7, 0xf8,
+    0x0, 0x0, 0x0, 0xf, 0xf8, 0x0, 0x0, 0x0,
+    0x1f, 0xf8, 0x0, 0x0, 0x0, 0x1f, 0xf8, 0x0,
+    0x0, 0x0, 0x3f, 0xf8, 0x0, 0x0, 0x0, 0x3f,
+    0xf8, 0x0, 0x0, 0x0, 0x3f, 0xf8, 0x0, 0x0,
+    0x0, 0x3f, 0xf8, 0x0, 0x0, 0x0, 0x3f, 0xf8,
+    0x0, 0x0, 0x0, 0x3f, 0xf8, 0x0, 0x0, 0x0,
+    0x3f, 0xf8, 0x0, 0x0, 0x0, 0x3f, 0xf8, 0x0,
+    0x0, 0x0, 0x3f, 0xf8, 0x0, 0x0, 0x0, 0x3f,
+    0xf8, 0x0, 0x0, 0x0, 0x3f, 0xf8, 0x0, 0x0,
+    0x0, 0x3f, 0xf8, 0x0, 0x0, 0x0, 0x3f, 0xf8,
+    0x0, 0x0, 0x0, 0x3f, 0xf0, 0x0, 0x0, 0x0,
+    0x3f, 0xf0, 0x0, 0x0, 0x0, 0x7f, 0xf0, 0x0,
+    0x0, 0x0, 0x7f, 0xf0, 0x0, 0x0, 0x0, 0x7f,
+    0xf0, 0x0, 0x0, 0x0, 0x7f, 0xf0, 0x0, 0x0,
+    0x0, 0x7f, 0xf0, 0x0, 0x0, 0x0, 0x7f, 0xf0,
+    0x0, 0x0, 0x0, 0x7f, 0xf0, 0x0, 0x0, 0x0,
+    0x7f, 0xf0, 0x0, 0x0, 0x0, 0x3f, 0xf0, 0x0,
+    0x0, 0x0, 0x3f, 0xf0, 0x0, 0x0, 0x0, 0x3f,
+    0xf0, 0x0, 0x0, 0x0, 0x1f, 0xe0, 0x0, 0x0,
+    0x0, 0x1f, 0xe0, 0x0, 0x0, 0x0, 0x1f, 0xc0,
+    0x0, 0x0, 0x0, 0x1f, 0xc0, 0x0, 0x0, 0x0,
+    0xf, 0x80, 0x0, 0x0, 0x0, 0xf, 0x0, 0x0,
+    0x0, 0x0, 0xc, 0x0,
+
+    /* U+0038 "8" */
+    0x0, 0xf, 0xff, 0xff, 0xff, 0x80, 0x0, 0x1f,
+    0xff, 0xff, 0xff, 0x88, 0x0, 0x1f, 0xff, 0xff,
+    0xff, 0xcf, 0x0, 0x7, 0xff, 0xff, 0xff, 0xc7,
+    0xc0, 0x11, 0xff, 0xff, 0xff, 0xe7, 0xe0, 0x1c,
+    0x7f, 0xff, 0xff, 0xf3, 0xf8, 0x1f, 0x1f, 0xff,
+    0xff, 0xf3, 0xfc, 0xf, 0xc7, 0xff, 0xff, 0xf9,
+    0xff, 0x7, 0xf1, 0xff, 0xff, 0xf9, 0xff, 0x83,
+    0xfc, 0x7f, 0xff, 0xfc, 0xff, 0xc3, 0xff, 0x0,
+    0x0, 0x0, 0x7f, 0xe1, 0xff, 0xc0, 0x0, 0x0,
+    0x7f, 0xf0, 0xff, 0xe0, 0x0, 0x0, 0x3f, 0xf8,
+    0x7f, 0xf0, 0x0, 0x0, 0x1f, 0xfc, 0x3f, 0xf8,
+    0x0, 0x0, 0xf, 0xfe, 0x1f, 0xfc, 0x0, 0x0,
+    0x7, 0xff, 0xf, 0xfe, 0x0, 0x0, 0x3, 0xff,
+    0x87, 0xff, 0x0, 0x0, 0x1, 0xff, 0x83, 0xff,
+    0x80, 0x0, 0x0, 0xff, 0xc1, 0xff, 0xc0, 0x0,
+    0x0, 0x7f, 0xe0, 0xff, 0xe0, 0x0, 0x0, 0x7f,
+    0xf0, 0x7f, 0xf0, 0x0, 0x0, 0x3f, 0xf8, 0x3f,
+    0xf0, 0x0, 0x0, 0x1f, 0xfc, 0x1f, 0xf8, 0x0,
+    0x0, 0xf, 0xfe, 0xf, 0xfc, 0x0, 0x0, 0x7,
+    0xff, 0xf, 0xfe, 0x0, 0x0, 0x3, 0xff, 0x87,
+    0xff, 0x0, 0x0, 0x1, 0xff, 0xc3, 0xff, 0x80,
+    0x0, 0x0, 0xff, 0xe1, 0xff, 0xc0, 0x0, 0x0,
+    0x7f, 0xf0, 0xff, 0xe0, 0x0, 0x0, 0x3f, 0xf8,
+    0x7f, 0xf0, 0x0, 0x0, 0x1f, 0xfc, 0x3f, 0xf8,
+    0x0, 0x0, 0xf, 0xfe, 0x1f, 0xfc, 0x0, 0x0,
+    0x7, 0xff, 0xf, 0xfe, 0x0, 0x0, 0x3, 0xff,
+    0x7, 0xff, 0x0, 0x0, 0x1, 0xff, 0x83, 0xff,
+    0x80, 0x0, 0x1, 0xff, 0xc1, 0xff, 0xc0, 0x0,
+    0x0, 0xff, 0xe0, 0xff, 0x80, 0x0, 0x0, 0x1f,
+    0xf0, 0x7f, 0x8f, 0xff, 0xff, 0xc7, 0xf8, 0x3f,
+    0xf, 0xff, 0xff, 0xf1, 0xf8, 0x7, 0x1f, 0xff,
+    0xff, 0xfc, 0x38, 0x0, 0x1f, 0xff, 0xff, 0xff,
+    0x88, 0x0, 0x3f, 0xff, 0xff, 0xff, 0xe0, 0x0,
+    0x1f, 0xff, 0xff, 0xff, 0xf0, 0x0, 0x3, 0xff,
+    0xff, 0xff, 0xe0, 0x0, 0x70, 0xff, 0xff, 0xff,
+    0xe1, 0x80, 0x7e, 0x3f, 0xff, 0xff, 0xc3, 0xf0,
+    0x7f, 0x87, 0xff, 0xff, 0xc3, 0xfc, 0x3f, 0xe0,
+    0x0, 0x0, 0x7, 0xfc, 0x1f, 0xfc, 0x0, 0x0,
+    0x7, 0xfe, 0xf, 0xfe, 0x0, 0x0, 0x3, 0xff,
+    0x7, 0xff, 0x0, 0x0, 0x1, 0xff, 0x83, 0xff,
+    0x80, 0x0, 0x1, 0xff, 0xc1, 0xff, 0xc0, 0x0,
+    0x0, 0xff, 0xe0, 0xff, 0xc0, 0x0, 0x0, 0x7f,
+    0xf0, 0x7f, 0xe0, 0x0, 0x0, 0x3f, 0xf8, 0x3f,
+    0xf0, 0x0, 0x0, 0x1f, 0xfc, 0x3f, 0xf8, 0x0,
+    0x0, 0xf, 0xfe, 0x1f, 0xfc, 0x0, 0x0, 0x7,
+    0xff, 0xf, 0xfe, 0x0, 0x0, 0x3, 0xff, 0x87,
+    0xff, 0x0, 0x0, 0x1, 0xff, 0xc3, 0xff, 0x80,
+    0x0, 0x0, 0xff, 0xe1, 0xff, 0xc0, 0x0, 0x0,
+    0x7f, 0xf0, 0xff, 0xe0, 0x0, 0x0, 0x3f, 0xf8,
+    0x7f, 0xf0, 0x0, 0x0, 0x1f, 0xfc, 0x3f, 0xf8,
+    0x0, 0x0, 0xf, 0xfc, 0x1f, 0xfc, 0x0, 0x0,
+    0x7, 0xfe, 0xf, 0xfe, 0x0, 0x0, 0x3, 0xff,
+    0x7, 0xff, 0x0, 0x0, 0x3, 0xff, 0x83, 0xff,
+    0x80, 0x0, 0x1, 0xff, 0xc1, 0xff, 0x80, 0x0,
+    0x0, 0xff, 0xe0, 0xff, 0xc0, 0x0, 0x0, 0x7f,
+    0xf0, 0x7f, 0xe0, 0x0, 0x0, 0x3f, 0xf8, 0x3f,
+    0xf0, 0x0, 0x0, 0x1f, 0xfc, 0x3f, 0xf8, 0x0,
+    0x0, 0xf, 0xfe, 0x1f, 0xf8, 0x0, 0x0, 0x7,
+    0xff, 0xf, 0xf8, 0xff, 0xff, 0xf9, 0xff, 0x87,
+    0xf8, 0xff, 0xff, 0xfc, 0xff, 0xc3, 0xf8, 0xff,
+    0xff, 0xfe, 0x7f, 0xc0, 0xf8, 0xff, 0xff, 0xff,
+    0x9f, 0xe0, 0x70, 0xff, 0xff, 0xff, 0xcf, 0xe0,
+    0x11, 0xff, 0xff, 0xff, 0xe7, 0xf0, 0x1, 0xff,
+    0xff, 0xff, 0xf1, 0xf0, 0x1, 0xff, 0xff, 0xff,
+    0xfc, 0xf0, 0x0, 0x7f, 0xff, 0xff, 0xfe, 0x60,
+    0x0, 0xf, 0xff, 0xff, 0xff, 0x0, 0x0,
+
+    /* U+0039 "9" */
+    0x0, 0x7f, 0xff, 0xff, 0xfc, 0x0, 0x7, 0xff,
+    0xff, 0xff, 0xe2, 0x0, 0x3f, 0xff, 0xff, 0xff,
+    0x9e, 0x0, 0x7f, 0xff, 0xff, 0xfc, 0x7c, 0x8,
+    0xff, 0xff, 0xff, 0xf3, 0xf0, 0x71, 0xff, 0xff,
+    0xff, 0xcf, 0xe3, 0xe3, 0xff, 0xff, 0xfe, 0x7f,
+    0x8f, 0xc7, 0xff, 0xff, 0xf9, 0xff, 0x3f, 0x8f,
+    0xff, 0xff, 0xcf, 0xfc, 0xff, 0x1f, 0xff, 0xff,
+    0x3f, 0xf7, 0xfe, 0x0, 0x0, 0x0, 0xff, 0xdf,
+    0xfc, 0x0, 0x0, 0x7, 0xff, 0x7f, 0xf0, 0x0,
+    0x0, 0x1f, 0xfd, 0xff, 0xc0, 0x0, 0x0, 0x7f,
+    0xf7, 0xff, 0x0, 0x0, 0x1, 0xff, 0xdf, 0xfc,
+    0x0, 0x0, 0x7, 0xff, 0x7f, 0xf0, 0x0, 0x0,
+    0x1f, 0xfd, 0xff, 0xc0, 0x0, 0x0, 0x7f, 0xe7,
+    0xff, 0x0, 0x0, 0x1, 0xff, 0x9f, 0xfc, 0x0,
+    0x0, 0x7, 0xfe, 0x7f, 0xf0, 0x0, 0x0, 0x3f,
+    0xf9, 0xff, 0xc0, 0x0, 0x0, 0xff, 0xe7, 0xfe,
+    0x0, 0x0, 0x3, 0xff, 0x9f, 0xf8, 0x0, 0x0,
+    0xf, 0xfe, 0x7f, 0xe0, 0x0, 0x0, 0x3f, 0xfb,
+    0xff, 0x80, 0x0, 0x0, 0xff, 0xef, 0xfe, 0x0,
+    0x0, 0x3, 0xff, 0xbf, 0xf8, 0x0, 0x0, 0xf,
+    0xfe, 0xff, 0xe0, 0x0, 0x0, 0x3f, 0xfb, 0xff,
+    0x80, 0x0, 0x0, 0xff, 0xef, 0xfe, 0x0, 0x0,
+    0x3, 0xff, 0xbf, 0xf8, 0x0, 0x0, 0xf, 0xfe,
+    0xff, 0xe0, 0x0, 0x0, 0x3f, 0xfb, 0xff, 0x80,
+    0x0, 0x0, 0xff, 0xcf, 0xfe, 0x0, 0x0, 0x3,
+    0xff, 0x3f, 0xf8, 0x0, 0x0, 0x1f, 0xfc, 0xff,
+    0xe0, 0x0, 0x0, 0x7f, 0xf3, 0xfe, 0x0, 0x0,
+    0x0, 0x7f, 0xcf, 0xf1, 0xff, 0xff, 0xf8, 0xff,
+    0x3f, 0xf, 0xff, 0xff, 0xf1, 0xf8, 0x38, 0xff,
+    0xff, 0xff, 0xe1, 0xc0, 0x7, 0xff, 0xff, 0xff,
+    0xe2, 0x0, 0x7f, 0xff, 0xff, 0xff, 0xc0, 0x1,
+    0xff, 0xff, 0xff, 0xff, 0x0, 0x1, 0xff, 0xff,
+    0xff, 0xf0, 0x0, 0x3, 0xff, 0xff, 0xff, 0x86,
+    0x0, 0x7, 0xff, 0xff, 0xf8, 0x7e, 0x0, 0x7,
+    0xff, 0xff, 0xc3, 0xfc, 0x0, 0x0, 0x0, 0x0,
+    0x3f, 0xe0, 0x0, 0x0, 0x0, 0x1, 0xff, 0x80,
+    0x0, 0x0, 0x0, 0x7, 0xfe, 0x0, 0x0, 0x0,
+    0x0, 0x1f, 0xf8, 0x0, 0x0, 0x0, 0x0, 0xff,
+    0xe0, 0x0, 0x0, 0x0, 0x3, 0xff, 0x80, 0x0,
+    0x0, 0x0, 0xf, 0xfe, 0x0, 0x0, 0x0, 0x0,
+    0x3f, 0xf8, 0x0, 0x0, 0x0, 0x0, 0xff, 0xe0,
+    0x0, 0x0, 0x0, 0x3, 0xff, 0x80, 0x0, 0x0,
+    0x0, 0xf, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x3f,
+    0xf8, 0x0, 0x0, 0x0, 0x0, 0xff, 0xe0, 0x0,
+    0x0, 0x0, 0x3, 0xff, 0x80, 0x0, 0x0, 0x0,
+    0xf, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xf8,
+    0x0, 0x0, 0x0, 0x0, 0xff, 0xe0, 0x0, 0x0,
+    0x0, 0x3, 0xff, 0x0, 0x0, 0x0, 0x0, 0xf,
+    0xfc, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xf0, 0x0,
+    0x0, 0x0, 0x1, 0xff, 0xc0, 0x0, 0x0, 0x0,
+    0x7, 0xff, 0x0, 0x0, 0x0, 0x0, 0x1f, 0xfc,
+    0x0, 0x0, 0x0, 0x0, 0x7f, 0xf0, 0x0, 0x0,
+    0x0, 0x1, 0xff, 0xc0, 0x0, 0x0, 0x0, 0x7,
+    0xff, 0x0, 0x0, 0x0, 0x0, 0x1f, 0xfc, 0x0,
+    0x0, 0x0, 0x0, 0x7f, 0xf0, 0x0, 0x7f, 0xff,
+    0xfc, 0xff, 0xc0, 0x3, 0xff, 0xff, 0xf3, 0xff,
+    0x0, 0x1f, 0xff, 0xff, 0xcf, 0xf8, 0x0, 0xff,
+    0xff, 0xff, 0x9f, 0xe0, 0x7, 0xff, 0xff, 0xfe,
+    0x7f, 0x0, 0x7f, 0xff, 0xff, 0xf9, 0xfc, 0x3,
+    0xff, 0xff, 0xff, 0xe3, 0xe0, 0x1f, 0xff, 0xff,
+    0xff, 0xcf, 0x0, 0x3f, 0xff, 0xff, 0xff, 0x30,
+    0x0, 0x3f, 0xff, 0xff, 0xfc, 0x0, 0x0,
+
+    /* U+003A ":" */
+    0x3f, 0xf9, 0xff, 0xcf, 0xfe, 0x7f, 0xf3, 0xff,
+    0x9f, 0xfc, 0xff, 0xe7, 0xff, 0x3f, 0xf9, 0xff,
+    0xc0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0xff, 0x9f,
+    0xfc, 0xff, 0xe7, 0xff, 0x3f, 0xf9, 0xff, 0xcf,
+    0xfe, 0x7f, 0xf3, 0xff, 0x9f, 0xfc
+};
+
+
+/*---------------------
+ *  GLYPH DESCRIPTION
+ *--------------------*/
+
+static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
+    {.bitmap_index = 0, .adv_w = 0, .box_w = 0, .box_h = 0, .ofs_x = 0, .ofs_y = 0} /* id = 0 reserved */,
+    {.bitmap_index = 0, .adv_w = 863, .box_w = 1, .box_h = 1, .ofs_x = 0, .ofs_y = 0},
+    {.bitmap_index = 1, .adv_w = 863, .box_w = 49, .box_h = 86, .ofs_x = 5, .ofs_y = 0},
+    {.bitmap_index = 528, .adv_w = 863, .box_w = 15, .box_h = 84, .ofs_x = 39, .ofs_y = 1},
+    {.bitmap_index = 686, .adv_w = 863, .box_w = 49, .box_h = 86, .ofs_x = 5, .ofs_y = 0},
+    {.bitmap_index = 1213, .adv_w = 863, .box_w = 45, .box_h = 86, .ofs_x = 9, .ofs_y = 0},
+    {.bitmap_index = 1697, .adv_w = 863, .box_w = 46, .box_h = 84, .ofs_x = 8, .ofs_y = 1},
+    {.bitmap_index = 2180, .adv_w = 863, .box_w = 44, .box_h = 86, .ofs_x = 8, .ofs_y = 0},
+    {.bitmap_index = 2653, .adv_w = 863, .box_w = 47, .box_h = 86, .ofs_x = 5, .ofs_y = 0},
+    {.bitmap_index = 3159, .adv_w = 863, .box_w = 40, .box_h = 84, .ofs_x = 14, .ofs_y = 2},
+    {.bitmap_index = 3579, .adv_w = 863, .box_w = 49, .box_h = 86, .ofs_x = 5, .ofs_y = 0},
+    {.bitmap_index = 4106, .adv_w = 863, .box_w = 46, .box_h = 86, .ofs_x = 8, .ofs_y = 0},
+    {.bitmap_index = 4601, .adv_w = 323, .box_w = 13, .box_h = 48, .ofs_x = 6, .ofs_y = 19}
+};
+
+/*---------------------
+ *  CHARACTER MAPPING
+ *--------------------*/
+
+
+
+/*Collect the unicode lists and glyph_id offsets*/
+static const lv_font_fmt_txt_cmap_t cmaps[] =
+{
+    {
+        .range_start = 32, .range_length = 1, .glyph_id_start = 1,
+        .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
+    },
+    {
+        .range_start = 48, .range_length = 11, .glyph_id_start = 2,
+        .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
+    }
+};
+
+
+
+/*--------------------
+ *  ALL CUSTOM DATA
+ *--------------------*/
+
+#if LV_VERSION_CHECK(8, 0, 0)
+/*Store all the custom data of the font*/
+static  lv_font_fmt_txt_glyph_cache_t cache;
+static const lv_font_fmt_txt_dsc_t font_dsc = {
+#else
+static lv_font_fmt_txt_dsc_t font_dsc = {
+#endif
+    .glyph_bitmap = glyph_bitmap,
+    .glyph_dsc = glyph_dsc,
+    .cmaps = cmaps,
+    .kern_dsc = NULL,
+    .kern_scale = 0,
+    .cmap_num = 2,
+    .bpp = 1,
+    .kern_classes = 0,
+    .bitmap_format = 0,
+#if LV_VERSION_CHECK(8, 0, 0)
+    .cache = &cache
+#endif
+};
+
+
+/*-----------------
+ *  PUBLIC FONT
+ *----------------*/
+
+/*Initialize a public general font descriptor*/
+#if LV_VERSION_CHECK(8, 0, 0)
+const lv_font_t lv_font_7segment_115 = {
+#else
+lv_font_t lv_font_7segment_115 = {
+#endif
+    .get_glyph_dsc = lv_font_get_glyph_dsc_fmt_txt,    /*Function pointer to get glyph's data*/
+    .get_glyph_bitmap = lv_font_get_bitmap_fmt_txt,    /*Function pointer to get glyph's bitmap*/
+    .line_height = 86,          /*The maximum line height required by the font*/
+    .base_line = 0,             /*Baseline measured from the bottom of the line*/
+#if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0)
+    .subpx = LV_FONT_SUBPX_NONE,
+#endif
+#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8
+    .underline_position = -7,
+    .underline_thickness = 4,
+#endif
+    .dsc = &font_dsc           /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */
+};
+
+
+
+#endif /*#if LV_FONT_7SEGMENT_115*/
+
diff --git a/src/displayapp/fonts/lv_font_7segment_40.c b/src/displayapp/fonts/lv_font_7segment_40.c
new file mode 100644
index 00000000..ebcb1424
--- /dev/null
+++ b/src/displayapp/fonts/lv_font_7segment_40.c
@@ -0,0 +1,228 @@
+/*******************************************************************************
+ * Size: 40 px
+ * Bpp: 1
+ * Opts: 
+ ******************************************************************************/
+
+#ifdef LV_LVGL_H_INCLUDE_SIMPLE
+#include "lvgl.h"
+#else
+#include "lvgl/lvgl.h"
+#endif
+
+#ifndef LV_FONT_7SEGMENT_40
+#define LV_FONT_7SEGMENT_40 1
+#endif
+
+#if LV_FONT_7SEGMENT_40
+
+/*-----------------
+ *    BITMAPS
+ *----------------*/
+
+/*Store the image of the glyphs*/
+static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
+    /* U+0020 " " */
+    0x0,
+
+    /* U+002D "-" */
+    0x3f, 0xc7, 0xff, 0x7f, 0xf3, 0xfc,
+
+    /* U+0030 "0" */
+    0x1f, 0xfc, 0x1f, 0xfb, 0x6f, 0xff, 0x77, 0xf7,
+    0x78, 0xf, 0x78, 0xf, 0x78, 0xf, 0x78, 0xf,
+    0x78, 0xf, 0x78, 0xf, 0x78, 0xf, 0x78, 0xf,
+    0x78, 0xf, 0x70, 0x7, 0x0, 0x0, 0x0, 0x0,
+    0xe0, 0x7, 0xf0, 0xf, 0xf0, 0xf, 0xf0, 0xf,
+    0xf0, 0xf, 0xf0, 0xf, 0xf0, 0xf, 0xf0, 0xf,
+    0xf0, 0xf, 0xf0, 0xf, 0xef, 0xef, 0xdf, 0xef,
+    0xbf, 0xfe, 0x3f, 0xf8,
+
+    /* U+0031 "1" */
+    0x11, 0xce, 0xf7, 0xbd, 0xef, 0x7b, 0xde, 0xf7,
+    0x9c, 0x0, 0x77, 0xbd, 0xef, 0x7b, 0xde, 0xf7,
+    0xbc, 0xe6, 0x20,
+
+    /* U+0032 "2" */
+    0x1f, 0xf8, 0x1f, 0xfa, 0xf, 0xf7, 0x7, 0xf7,
+    0x0, 0xf, 0x0, 0xf, 0x0, 0xf, 0x0, 0xf,
+    0x0, 0xf, 0x0, 0xf, 0x0, 0xf, 0x0, 0xf,
+    0x0, 0xf, 0xf, 0xf7, 0x1f, 0xf8, 0x1f, 0xf8,
+    0xef, 0xf0, 0xf0, 0x0, 0xf0, 0x0, 0xf0, 0x0,
+    0xf0, 0x0, 0xf0, 0x0, 0xf0, 0x0, 0xf0, 0x0,
+    0xf0, 0x0, 0xf0, 0x0, 0xef, 0xe0, 0xdf, 0xe0,
+    0x3f, 0xe0, 0x7f, 0xe0,
+
+    /* U+0033 "3" */
+    0x1f, 0xf8, 0x3f, 0xfe, 0x1f, 0xf7, 0xf, 0xf7,
+    0x0, 0xf, 0x0, 0xf, 0x0, 0xf, 0x0, 0xf,
+    0x0, 0xf, 0x0, 0xf, 0x0, 0xf, 0x0, 0xf,
+    0x0, 0xf, 0x1f, 0xf7, 0x3f, 0xf8, 0x3f, 0xf8,
+    0x1f, 0xe6, 0x0, 0x1e, 0x0, 0x1e, 0x0, 0x1e,
+    0x0, 0x1e, 0x0, 0x1e, 0x0, 0x1e, 0x0, 0x1e,
+    0x0, 0x1e, 0x0, 0x1e, 0x1f, 0xde, 0x3f, 0xee,
+    0x7f, 0xec, 0x7f, 0xe8,
+
+    /* U+0034 "4" */
+    0x0, 0x2, 0x40, 0x7, 0xe0, 0x7, 0xe0, 0xf,
+    0xf0, 0xf, 0xf0, 0xf, 0xf0, 0xf, 0xf0, 0xf,
+    0xf0, 0xf, 0xf0, 0xf, 0xf0, 0xf, 0xf0, 0xf,
+    0xf0, 0xf, 0xcf, 0xf7, 0x3f, 0xf8, 0x3f, 0xf8,
+    0x1f, 0xe6, 0x0, 0x1e, 0x0, 0x1e, 0x0, 0x1e,
+    0x0, 0x1e, 0x0, 0x1e, 0x0, 0x1e, 0x0, 0x1e,
+    0x0, 0x1e, 0x0, 0x1e, 0x0, 0x1e, 0x0, 0x1e,
+    0x0, 0xc, 0x0, 0x8,
+
+    /* U+0035 "5" */
+    0x1f, 0xf8, 0x7f, 0xf3, 0x7f, 0xc7, 0x7f, 0x8f,
+    0x0, 0x1e, 0x0, 0x3c, 0x0, 0x78, 0x0, 0xf0,
+    0x1, 0xe0, 0x3, 0xc0, 0x7, 0x80, 0xf, 0x0,
+    0x19, 0xfe, 0xf, 0xfe, 0x1f, 0xfc, 0x1f, 0xe6,
+    0x0, 0x3c, 0x0, 0x78, 0x0, 0xf0, 0x1, 0xe0,
+    0x3, 0xc0, 0x7, 0x80, 0xf, 0x0, 0x1e, 0x0,
+    0x3c, 0x7f, 0x79, 0xff, 0x77, 0xfe, 0xcf, 0xfd,
+    0x0,
+
+    /* U+0036 "6" */
+    0x1f, 0xfc, 0x1f, 0xfc, 0x6f, 0xf8, 0x77, 0xf8,
+    0x78, 0x0, 0x78, 0x0, 0x78, 0x0, 0x78, 0x0,
+    0x78, 0x0, 0x78, 0x0, 0x78, 0x0, 0x78, 0x0,
+    0x78, 0x0, 0x67, 0xf8, 0x1f, 0xfc, 0x1f, 0xfc,
+    0xef, 0xf3, 0xf0, 0xf, 0xf0, 0xf, 0xf0, 0xf,
+    0xf0, 0xf, 0xf0, 0xf, 0xf0, 0xf, 0xf0, 0xf,
+    0xf0, 0xf, 0xf0, 0xf, 0xef, 0xef, 0xdf, 0xf7,
+    0xbf, 0xf6, 0x3f, 0xf4,
+
+    /* U+0037 "7" */
+    0x7f, 0xe3, 0xff, 0xa7, 0xfd, 0xcf, 0xf7, 0x0,
+    0x3c, 0x0, 0xf0, 0x3, 0xc0, 0xf, 0x0, 0x3c,
+    0x0, 0xf0, 0x3, 0xc0, 0xf, 0x0, 0x3c, 0x0,
+    0x70, 0x0, 0x80, 0x0, 0x0, 0x18, 0x0, 0xe0,
+    0x7, 0x80, 0x1e, 0x0, 0x78, 0x1, 0xe0, 0x7,
+    0x80, 0x1e, 0x0, 0x78, 0x1, 0xe0, 0x7, 0x80,
+    0x1e, 0x0, 0x38, 0x0, 0xc0,
+
+    /* U+0038 "8" */
+    0x1f, 0xfc, 0x1f, 0xfb, 0x6f, 0xff, 0x77, 0xf7,
+    0x78, 0xf, 0x78, 0xf, 0x78, 0xf, 0x78, 0xf,
+    0x78, 0xf, 0x78, 0xf, 0x78, 0xf, 0x78, 0xf,
+    0x78, 0xf, 0x67, 0xff, 0x1f, 0xfc, 0x1f, 0xfc,
+    0xef, 0xf7, 0xf0, 0xf, 0xf0, 0xf, 0xf0, 0xf,
+    0xf0, 0xf, 0xf0, 0xf, 0xf0, 0xf, 0xf0, 0xf,
+    0xf0, 0xf, 0xf0, 0xf, 0xef, 0xef, 0xdf, 0xef,
+    0xbf, 0xfe, 0x3f, 0xf8,
+
+    /* U+0039 "9" */
+    0x1f, 0xf8, 0x3f, 0xfe, 0xdf, 0xf7, 0xef, 0xf7,
+    0xf0, 0xf, 0xf0, 0xf, 0xf0, 0xf, 0xf0, 0xf,
+    0xf0, 0xf, 0xf0, 0xf, 0xf0, 0xf, 0xf0, 0xf,
+    0xf0, 0xf, 0xcf, 0xf7, 0x3f, 0xf8, 0x3f, 0xf8,
+    0x1f, 0xe6, 0x0, 0x1e, 0x0, 0x1e, 0x0, 0x1e,
+    0x0, 0x1e, 0x0, 0x1e, 0x0, 0x1e, 0x0, 0x1e,
+    0x0, 0x1e, 0x0, 0x1e, 0x1f, 0xde, 0x3f, 0xee,
+    0x7f, 0xec, 0x7f, 0xe8,
+
+    /* U+003A ":" */
+    0x7b, 0xde, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x7b, 0xde, 0xf0
+};
+
+
+/*---------------------
+ *  GLYPH DESCRIPTION
+ *--------------------*/
+
+static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
+    {.bitmap_index = 0, .adv_w = 0, .box_w = 0, .box_h = 0, .ofs_x = 0, .ofs_y = 0} /* id = 0 reserved */,
+    {.bitmap_index = 0, .adv_w = 300, .box_w = 1, .box_h = 1, .ofs_x = 0, .ofs_y = 0},
+    {.bitmap_index = 1, .adv_w = 300, .box_w = 12, .box_h = 4, .ofs_x = 4, .ofs_y = 13},
+    {.bitmap_index = 7, .adv_w = 300, .box_w = 16, .box_h = 30, .ofs_x = 2, .ofs_y = 0},
+    {.bitmap_index = 67, .adv_w = 300, .box_w = 5, .box_h = 30, .ofs_x = 14, .ofs_y = 0},
+    {.bitmap_index = 86, .adv_w = 300, .box_w = 16, .box_h = 30, .ofs_x = 2, .ofs_y = 0},
+    {.bitmap_index = 146, .adv_w = 300, .box_w = 16, .box_h = 30, .ofs_x = 3, .ofs_y = 0},
+    {.bitmap_index = 206, .adv_w = 300, .box_w = 16, .box_h = 30, .ofs_x = 3, .ofs_y = 0},
+    {.bitmap_index = 266, .adv_w = 300, .box_w = 15, .box_h = 30, .ofs_x = 3, .ofs_y = 0},
+    {.bitmap_index = 323, .adv_w = 300, .box_w = 16, .box_h = 30, .ofs_x = 2, .ofs_y = 0},
+    {.bitmap_index = 383, .adv_w = 300, .box_w = 14, .box_h = 30, .ofs_x = 5, .ofs_y = 0},
+    {.bitmap_index = 436, .adv_w = 300, .box_w = 16, .box_h = 30, .ofs_x = 2, .ofs_y = 0},
+    {.bitmap_index = 496, .adv_w = 300, .box_w = 16, .box_h = 30, .ofs_x = 3, .ofs_y = 0},
+    {.bitmap_index = 556, .adv_w = 113, .box_w = 5, .box_h = 17, .ofs_x = 2, .ofs_y = 7}
+};
+
+/*---------------------
+ *  CHARACTER MAPPING
+ *--------------------*/
+
+static const uint16_t unicode_list_0[] = {
+    0x0, 0xd
+};
+
+/*Collect the unicode lists and glyph_id offsets*/
+static const lv_font_fmt_txt_cmap_t cmaps[] =
+{
+    {
+        .range_start = 32, .range_length = 14, .glyph_id_start = 1,
+        .unicode_list = unicode_list_0, .glyph_id_ofs_list = NULL, .list_length = 2, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY
+    },
+    {
+        .range_start = 48, .range_length = 11, .glyph_id_start = 3,
+        .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
+    }
+};
+
+
+
+/*--------------------
+ *  ALL CUSTOM DATA
+ *--------------------*/
+
+#if LV_VERSION_CHECK(8, 0, 0)
+/*Store all the custom data of the font*/
+static  lv_font_fmt_txt_glyph_cache_t cache;
+static const lv_font_fmt_txt_dsc_t font_dsc = {
+#else
+static lv_font_fmt_txt_dsc_t font_dsc = {
+#endif
+    .glyph_bitmap = glyph_bitmap,
+    .glyph_dsc = glyph_dsc,
+    .cmaps = cmaps,
+    .kern_dsc = NULL,
+    .kern_scale = 0,
+    .cmap_num = 2,
+    .bpp = 1,
+    .kern_classes = 0,
+    .bitmap_format = 0,
+#if LV_VERSION_CHECK(8, 0, 0)
+    .cache = &cache
+#endif
+};
+
+
+/*-----------------
+ *  PUBLIC FONT
+ *----------------*/
+
+/*Initialize a public general font descriptor*/
+#if LV_VERSION_CHECK(8, 0, 0)
+const lv_font_t lv_font_7segment_40 = {
+#else
+lv_font_t lv_font_7segment_40 = {
+#endif
+    .get_glyph_dsc = lv_font_get_glyph_dsc_fmt_txt,    /*Function pointer to get glyph's data*/
+    .get_glyph_bitmap = lv_font_get_bitmap_fmt_txt,    /*Function pointer to get glyph's bitmap*/
+    .line_height = 30,          /*The maximum line height required by the font*/
+    .base_line = 0,             /*Baseline measured from the bottom of the line*/
+#if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0)
+    .subpx = LV_FONT_SUBPX_NONE,
+#endif
+#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8
+    .underline_position = -2,
+    .underline_thickness = 1,
+#endif
+    .dsc = &font_dsc           /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */
+};
+
+
+
+#endif /*#if LV_FONT_7SEGMENT_40*/
+
diff --git a/src/displayapp/fonts/lv_font_dots_40.c b/src/displayapp/fonts/lv_font_dots_40.c
new file mode 100644
index 00000000..921ff085
--- /dev/null
+++ b/src/displayapp/fonts/lv_font_dots_40.c
@@ -0,0 +1,410 @@
+/*******************************************************************************
+ * Size: 40 px
+ * Bpp: 1
+ * Opts: 
+ ******************************************************************************/
+
+#ifdef LV_LVGL_H_INCLUDE_SIMPLE
+#include "lvgl.h"
+#else
+#include "lvgl/lvgl.h"
+#endif
+
+#ifndef LV_FONT_DOTS_40
+#define LV_FONT_DOTS_40 1
+#endif
+
+#if LV_FONT_DOTS_40
+
+/*-----------------
+ *    BITMAPS
+ *----------------*/
+
+/*Store the image of the glyphs*/
+static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
+    /* U+0020 " " */
+    0x0,
+
+    /* U+002D "-" */
+    0xee, 0xfd, 0xdf, 0xbb, 0x80,
+
+    /* U+0030 "0" */
+    0xe, 0xee, 0x1, 0xdd, 0xc0, 0x3b, 0xb8, 0x0,
+    0x0, 0xe, 0x0, 0xf, 0xc0, 0x1, 0xf8, 0x0,
+    0x38, 0x0, 0x0, 0xe0, 0x0, 0xfc, 0x0, 0x1f,
+    0x80, 0x3, 0x80, 0x0, 0xe, 0x0, 0xf, 0xc0,
+    0x1, 0xf8, 0x0, 0x38, 0x0, 0x0, 0xe0, 0x0,
+    0xfc, 0x0, 0x1f, 0x80, 0x3, 0x80, 0x0, 0xe,
+    0x0, 0xf, 0xc0, 0x1, 0xf8, 0x0, 0x38, 0x0,
+    0x0, 0xe, 0xee, 0x1, 0xdd, 0xc0, 0x3b, 0xb8,
+    0x0,
+
+    /* U+0031 "1" */
+    0xe, 0x1, 0xc0, 0x38, 0x0, 0xe, 0xe1, 0xdc,
+    0x3b, 0x80, 0x0, 0xe, 0x1, 0xc0, 0x38, 0x0,
+    0x0, 0xe0, 0x1c, 0x3, 0x80, 0x0, 0xe, 0x1,
+    0xc0, 0x38, 0x0, 0x0, 0xe0, 0x1c, 0x3, 0x80,
+    0x0, 0xee, 0xfd, 0xdf, 0xbb, 0x80,
+
+    /* U+0032 "2" */
+    0xe, 0xee, 0x1, 0xdd, 0xc0, 0x3b, 0xb8, 0x0,
+    0x0, 0xe, 0x0, 0xf, 0xc0, 0x1, 0xf8, 0x0,
+    0x38, 0x0, 0x0, 0x0, 0x0, 0xe0, 0x0, 0x1c,
+    0x0, 0x3, 0x80, 0x0, 0x0, 0x0, 0xe0, 0x0,
+    0x1c, 0x0, 0x3, 0x80, 0x0, 0x0, 0x0, 0xe0,
+    0x0, 0x1c, 0x0, 0x3, 0x80, 0x0, 0x0, 0x0,
+    0xe0, 0x0, 0x1c, 0x0, 0x3, 0x80, 0x0, 0x0,
+    0x0, 0xee, 0xee, 0xfd, 0xdd, 0xdf, 0xbb, 0xbb,
+    0x80,
+
+    /* U+0033 "3" */
+    0xe, 0xee, 0x1, 0xdd, 0xc0, 0x3b, 0xb8, 0x0,
+    0x0, 0xe, 0x0, 0xf, 0xc0, 0x1, 0xf8, 0x0,
+    0x38, 0x0, 0x0, 0x0, 0x0, 0xe0, 0x0, 0x1c,
+    0x0, 0x3, 0x80, 0x0, 0x0, 0xee, 0xe0, 0x1d,
+    0xdc, 0x3, 0xbb, 0x80, 0x0, 0x0, 0x0, 0x0,
+    0xe0, 0x0, 0x1c, 0x0, 0x3, 0x80, 0x0, 0xe,
+    0x0, 0xf, 0xc0, 0x1, 0xf8, 0x0, 0x38, 0x0,
+    0x0, 0xe, 0xee, 0x1, 0xdd, 0xc0, 0x3b, 0xb8,
+    0x0,
+
+    /* U+0034 "4" */
+    0x0, 0xe, 0x0, 0x1, 0xc0, 0x0, 0x38, 0x0,
+    0x0, 0x0, 0xe, 0xe0, 0x1, 0xdc, 0x0, 0x3b,
+    0x80, 0x0, 0x0, 0xe, 0xe, 0x1, 0xc1, 0xc0,
+    0x38, 0x38, 0x0, 0x0, 0xe, 0x0, 0xe1, 0xc0,
+    0x1c, 0x38, 0x3, 0x80, 0x0, 0x0, 0xee, 0xee,
+    0xfd, 0xdd, 0xdf, 0xbb, 0xbb, 0x80, 0x0, 0x0,
+    0x0, 0xe0, 0x0, 0x1c, 0x0, 0x3, 0x80, 0x0,
+    0x0, 0x0, 0xe, 0x0, 0x1, 0xc0, 0x0, 0x38,
+    0x0,
+
+    /* U+0035 "5" */
+    0xee, 0xee, 0xfd, 0xdd, 0xdf, 0xbb, 0xbb, 0x80,
+    0x0, 0xe, 0x0, 0x1, 0xc0, 0x0, 0x38, 0x0,
+    0x0, 0x0, 0x0, 0xee, 0xee, 0x1d, 0xdd, 0xc3,
+    0xbb, 0xb8, 0x0, 0x0, 0x0, 0x0, 0xe, 0x0,
+    0x1, 0xc0, 0x0, 0x38, 0x0, 0x0, 0x0, 0x0,
+    0xe0, 0x0, 0x1c, 0x0, 0x3, 0x80, 0x0, 0xe,
+    0x0, 0xf, 0xc0, 0x1, 0xf8, 0x0, 0x38, 0x0,
+    0x0, 0xe, 0xee, 0x1, 0xdd, 0xc0, 0x3b, 0xb8,
+    0x0,
+
+    /* U+0036 "6" */
+    0x0, 0xee, 0x0, 0x1d, 0xc0, 0x3, 0xb8, 0x0,
+    0x0, 0x0, 0xe0, 0x0, 0x1c, 0x0, 0x3, 0x80,
+    0x0, 0x0, 0x0, 0xe0, 0x0, 0x1c, 0x0, 0x3,
+    0x80, 0x0, 0x0, 0x0, 0xe, 0xee, 0xe1, 0xdd,
+    0xdc, 0x3b, 0xbb, 0x80, 0x0, 0x0, 0xe0, 0x0,
+    0xfc, 0x0, 0x1f, 0x80, 0x3, 0x80, 0x0, 0xe,
+    0x0, 0xf, 0xc0, 0x1, 0xf8, 0x0, 0x38, 0x0,
+    0x0, 0xe, 0xee, 0x1, 0xdd, 0xc0, 0x3b, 0xb8,
+    0x0,
+
+    /* U+0037 "7" */
+    0xee, 0xee, 0xfd, 0xdd, 0xdf, 0xbb, 0xbb, 0x80,
+    0x0, 0x0, 0x0, 0xe, 0x0, 0x1, 0xc0, 0x0,
+    0x38, 0x0, 0x0, 0x0, 0xe, 0x0, 0x1, 0xc0,
+    0x0, 0x38, 0x0, 0x0, 0x0, 0xe, 0x0, 0x1,
+    0xc0, 0x0, 0x38, 0x0, 0x0, 0x0, 0xe, 0x0,
+    0x1, 0xc0, 0x0, 0x38, 0x0, 0x0, 0x0, 0xe,
+    0x0, 0x1, 0xc0, 0x0, 0x38, 0x0, 0x0, 0x0,
+    0x0, 0xe0, 0x0, 0x1c, 0x0, 0x3, 0x80, 0x0,
+    0x0,
+
+    /* U+0038 "8" */
+    0xe, 0xee, 0x1, 0xdd, 0xc0, 0x3b, 0xb8, 0x0,
+    0x0, 0xe, 0x0, 0xf, 0xc0, 0x1, 0xf8, 0x0,
+    0x38, 0x0, 0x0, 0xe0, 0x0, 0xfc, 0x0, 0x1f,
+    0x80, 0x3, 0x80, 0x0, 0x0, 0xee, 0xe0, 0x1d,
+    0xdc, 0x3, 0xbb, 0x80, 0x0, 0x0, 0xe0, 0x0,
+    0xfc, 0x0, 0x1f, 0x80, 0x3, 0x80, 0x0, 0xe,
+    0x0, 0xf, 0xc0, 0x1, 0xf8, 0x0, 0x38, 0x0,
+    0x0, 0xe, 0xee, 0x1, 0xdd, 0xc0, 0x3b, 0xb8,
+    0x0,
+
+    /* U+0039 "9" */
+    0xe, 0xee, 0x1, 0xdd, 0xc0, 0x3b, 0xb8, 0x0,
+    0x0, 0xe, 0x0, 0xf, 0xc0, 0x1, 0xf8, 0x0,
+    0x38, 0x0, 0x0, 0xe0, 0x0, 0xfc, 0x0, 0x1f,
+    0x80, 0x3, 0x80, 0x0, 0x0, 0xee, 0xee, 0x1d,
+    0xdd, 0xc3, 0xbb, 0xb8, 0x0, 0x0, 0x0, 0x0,
+    0xe0, 0x0, 0x1c, 0x0, 0x3, 0x80, 0x0, 0x0,
+    0x0, 0xe0, 0x0, 0x1c, 0x0, 0x3, 0x80, 0x0,
+    0x0, 0xe, 0xe0, 0x1, 0xdc, 0x0, 0x3b, 0x80,
+    0x0,
+
+    /* U+0041 "A" */
+    0xe, 0xee, 0x1, 0xdd, 0xc0, 0x3b, 0xb8, 0x0,
+    0x0, 0xe, 0x0, 0xf, 0xc0, 0x1, 0xf8, 0x0,
+    0x38, 0x0, 0x0, 0xe0, 0x0, 0xfc, 0x0, 0x1f,
+    0x80, 0x3, 0x80, 0x0, 0xe, 0xee, 0xef, 0xdd,
+    0xdd, 0xfb, 0xbb, 0xb8, 0x0, 0x0, 0xe0, 0x0,
+    0xfc, 0x0, 0x1f, 0x80, 0x3, 0x80, 0x0, 0xe,
+    0x0, 0xf, 0xc0, 0x1, 0xf8, 0x0, 0x38, 0x0,
+    0x0, 0xe0, 0x0, 0xfc, 0x0, 0x1f, 0x80, 0x3,
+    0x80,
+
+    /* U+0044 "D" */
+    0xee, 0xee, 0x1d, 0xdd, 0xc3, 0xbb, 0xb8, 0x0,
+    0x0, 0xe, 0x0, 0xf, 0xc0, 0x1, 0xf8, 0x0,
+    0x38, 0x0, 0x0, 0xe0, 0x0, 0xfc, 0x0, 0x1f,
+    0x80, 0x3, 0x80, 0x0, 0xe, 0x0, 0xf, 0xc0,
+    0x1, 0xf8, 0x0, 0x38, 0x0, 0x0, 0xe0, 0x0,
+    0xfc, 0x0, 0x1f, 0x80, 0x3, 0x80, 0x0, 0xe,
+    0x0, 0xf, 0xc0, 0x1, 0xf8, 0x0, 0x38, 0x0,
+    0x0, 0xee, 0xee, 0x1d, 0xdd, 0xc3, 0xbb, 0xb8,
+    0x0,
+
+    /* U+0045 "E" */
+    0xee, 0xee, 0xfd, 0xdd, 0xdf, 0xbb, 0xbb, 0x80,
+    0x0, 0xe, 0x0, 0x1, 0xc0, 0x0, 0x38, 0x0,
+    0x0, 0x0, 0x0, 0xe0, 0x0, 0x1c, 0x0, 0x3,
+    0x80, 0x0, 0x0, 0x0, 0xe, 0xee, 0xef, 0xdd,
+    0xdd, 0xfb, 0xbb, 0xb8, 0x0, 0x0, 0xe0, 0x0,
+    0x1c, 0x0, 0x3, 0x80, 0x0, 0x0, 0x0, 0xe,
+    0x0, 0x1, 0xc0, 0x0, 0x38, 0x0, 0x0, 0x0,
+    0x0, 0xee, 0xee, 0xfd, 0xdd, 0xdf, 0xbb, 0xbb,
+    0x80,
+
+    /* U+0046 "F" */
+    0xee, 0xee, 0xfd, 0xdd, 0xdf, 0xbb, 0xbb, 0x80,
+    0x0, 0xe, 0x0, 0x1, 0xc0, 0x0, 0x38, 0x0,
+    0x0, 0x0, 0x0, 0xe0, 0x0, 0x1c, 0x0, 0x3,
+    0x80, 0x0, 0x0, 0x0, 0xe, 0xee, 0xef, 0xdd,
+    0xdd, 0xfb, 0xbb, 0xb8, 0x0, 0x0, 0xe0, 0x0,
+    0x1c, 0x0, 0x3, 0x80, 0x0, 0x0, 0x0, 0xe,
+    0x0, 0x1, 0xc0, 0x0, 0x38, 0x0, 0x0, 0x0,
+    0x0, 0xe0, 0x0, 0x1c, 0x0, 0x3, 0x80, 0x0,
+    0x0,
+
+    /* U+0048 "H" */
+    0xe0, 0x0, 0xfc, 0x0, 0x1f, 0x80, 0x3, 0x80,
+    0x0, 0xe, 0x0, 0xf, 0xc0, 0x1, 0xf8, 0x0,
+    0x38, 0x0, 0x0, 0xe0, 0x0, 0xfc, 0x0, 0x1f,
+    0x80, 0x3, 0x80, 0x0, 0xe, 0xee, 0xef, 0xdd,
+    0xdd, 0xfb, 0xbb, 0xb8, 0x0, 0x0, 0xe0, 0x0,
+    0xfc, 0x0, 0x1f, 0x80, 0x3, 0x80, 0x0, 0xe,
+    0x0, 0xf, 0xc0, 0x1, 0xf8, 0x0, 0x38, 0x0,
+    0x0, 0xe0, 0x0, 0xfc, 0x0, 0x1f, 0x80, 0x3,
+    0x80,
+
+    /* U+0049 "I" */
+    0xee, 0xfd, 0xdf, 0xbb, 0x80, 0x0, 0xe0, 0x1c,
+    0x3, 0x80, 0x0, 0xe, 0x1, 0xc0, 0x38, 0x0,
+    0x0, 0xe0, 0x1c, 0x3, 0x80, 0x0, 0xe, 0x1,
+    0xc0, 0x38, 0x0, 0x0, 0xe0, 0x1c, 0x3, 0x80,
+    0x0, 0xee, 0xfd, 0xdf, 0xbb, 0x80,
+
+    /* U+004B "K" */
+    0xe0, 0x0, 0xfc, 0x0, 0x1f, 0x80, 0x3, 0x80,
+    0x0, 0xe, 0x0, 0xe1, 0xc0, 0x1c, 0x38, 0x3,
+    0x80, 0x0, 0x0, 0xe0, 0xe0, 0x1c, 0x1c, 0x3,
+    0x83, 0x80, 0x0, 0x0, 0xe, 0xe0, 0x1, 0xdc,
+    0x0, 0x3b, 0x80, 0x0, 0x0, 0x0, 0xe0, 0xe0,
+    0x1c, 0x1c, 0x3, 0x83, 0x80, 0x0, 0x0, 0xe,
+    0x0, 0xe1, 0xc0, 0x1c, 0x38, 0x3, 0x80, 0x0,
+    0x0, 0xe0, 0x0, 0xfc, 0x0, 0x1f, 0x80, 0x3,
+    0x80,
+
+    /* U+004D "M" */
+    0xe0, 0x0, 0xfc, 0x0, 0x1f, 0x80, 0x3, 0x80,
+    0x0, 0xe, 0xe0, 0xef, 0xdc, 0x1d, 0xfb, 0x83,
+    0xb8, 0x0, 0x0, 0xe0, 0xe0, 0xfc, 0x1c, 0x1f,
+    0x83, 0x83, 0x80, 0x0, 0xe, 0xe, 0xf, 0xc1,
+    0xc1, 0xf8, 0x38, 0x38, 0x0, 0x0, 0xe0, 0x0,
+    0xfc, 0x0, 0x1f, 0x80, 0x3, 0x80, 0x0, 0xe,
+    0x0, 0xf, 0xc0, 0x1, 0xf8, 0x0, 0x38, 0x0,
+    0x0, 0xe0, 0x0, 0xfc, 0x0, 0x1f, 0x80, 0x3,
+    0x80,
+
+    /* U+004E "N" */
+    0xe0, 0x0, 0xfc, 0x0, 0x1f, 0x80, 0x3, 0x80,
+    0x0, 0xe, 0xe0, 0xf, 0xdc, 0x1, 0xfb, 0x80,
+    0x38, 0x0, 0x0, 0xe0, 0xe0, 0xfc, 0x1c, 0x1f,
+    0x83, 0x83, 0x80, 0x0, 0xe, 0x0, 0xef, 0xc0,
+    0x1d, 0xf8, 0x3, 0xb8, 0x0, 0x0, 0xe0, 0x0,
+    0xfc, 0x0, 0x1f, 0x80, 0x3, 0x80, 0x0, 0xe,
+    0x0, 0xf, 0xc0, 0x1, 0xf8, 0x0, 0x38, 0x0,
+    0x0, 0xe0, 0x0, 0xfc, 0x0, 0x1f, 0x80, 0x3,
+    0x80,
+
+    /* U+004F "O" */
+    0xe, 0xee, 0x1, 0xdd, 0xc0, 0x3b, 0xb8, 0x0,
+    0x0, 0xe, 0x0, 0xf, 0xc0, 0x1, 0xf8, 0x0,
+    0x38, 0x0, 0x0, 0xe0, 0x0, 0xfc, 0x0, 0x1f,
+    0x80, 0x3, 0x80, 0x0, 0xe, 0x0, 0xf, 0xc0,
+    0x1, 0xf8, 0x0, 0x38, 0x0, 0x0, 0xe0, 0x0,
+    0xfc, 0x0, 0x1f, 0x80, 0x3, 0x80, 0x0, 0xe,
+    0x0, 0xf, 0xc0, 0x1, 0xf8, 0x0, 0x38, 0x0,
+    0x0, 0xe, 0xee, 0x1, 0xdd, 0xc0, 0x3b, 0xb8,
+    0x0,
+
+    /* U+0052 "R" */
+    0xee, 0xee, 0x1d, 0xdd, 0xc3, 0xbb, 0xb8, 0x0,
+    0x0, 0xe, 0x0, 0xf, 0xc0, 0x1, 0xf8, 0x0,
+    0x38, 0x0, 0x0, 0xe0, 0x0, 0xfc, 0x0, 0x1f,
+    0x80, 0x3, 0x80, 0x0, 0xe, 0xee, 0xe1, 0xdd,
+    0xdc, 0x3b, 0xbb, 0x80, 0x0, 0x0, 0xe0, 0x0,
+    0xfc, 0x0, 0x1f, 0x80, 0x3, 0x80, 0x0, 0xe,
+    0x0, 0xf, 0xc0, 0x1, 0xf8, 0x0, 0x38, 0x0,
+    0x0, 0xe0, 0x0, 0xfc, 0x0, 0x1f, 0x80, 0x3,
+    0x80,
+
+    /* U+0053 "S" */
+    0xe, 0xee, 0x1, 0xdd, 0xc0, 0x3b, 0xb8, 0x0,
+    0x0, 0xe, 0x0, 0xf, 0xc0, 0x1, 0xf8, 0x0,
+    0x38, 0x0, 0x0, 0xe0, 0x0, 0x1c, 0x0, 0x3,
+    0x80, 0x0, 0x0, 0x0, 0x0, 0xee, 0xe0, 0x1d,
+    0xdc, 0x3, 0xbb, 0x80, 0x0, 0x0, 0x0, 0x0,
+    0xe0, 0x0, 0x1c, 0x0, 0x3, 0x80, 0x0, 0xe,
+    0x0, 0xf, 0xc0, 0x1, 0xf8, 0x0, 0x38, 0x0,
+    0x0, 0xe, 0xee, 0x1, 0xdd, 0xc0, 0x3b, 0xb8,
+    0x0,
+
+    /* U+0054 "T" */
+    0xee, 0xee, 0xfd, 0xdd, 0xdf, 0xbb, 0xbb, 0x80,
+    0x0, 0x0, 0xe, 0x0, 0x1, 0xc0, 0x0, 0x38,
+    0x0, 0x0, 0x0, 0x0, 0xe0, 0x0, 0x1c, 0x0,
+    0x3, 0x80, 0x0, 0x0, 0x0, 0xe, 0x0, 0x1,
+    0xc0, 0x0, 0x38, 0x0, 0x0, 0x0, 0x0, 0xe0,
+    0x0, 0x1c, 0x0, 0x3, 0x80, 0x0, 0x0, 0x0,
+    0xe, 0x0, 0x1, 0xc0, 0x0, 0x38, 0x0, 0x0,
+    0x0, 0x0, 0xe0, 0x0, 0x1c, 0x0, 0x3, 0x80,
+    0x0,
+
+    /* U+0055 "U" */
+    0xe0, 0x0, 0xfc, 0x0, 0x1f, 0x80, 0x3, 0x80,
+    0x0, 0xe, 0x0, 0xf, 0xc0, 0x1, 0xf8, 0x0,
+    0x38, 0x0, 0x0, 0xe0, 0x0, 0xfc, 0x0, 0x1f,
+    0x80, 0x3, 0x80, 0x0, 0xe, 0x0, 0xf, 0xc0,
+    0x1, 0xf8, 0x0, 0x38, 0x0, 0x0, 0xe0, 0x0,
+    0xfc, 0x0, 0x1f, 0x80, 0x3, 0x80, 0x0, 0xe,
+    0x0, 0xf, 0xc0, 0x1, 0xf8, 0x0, 0x38, 0x0,
+    0x0, 0xe, 0xee, 0x1, 0xdd, 0xc0, 0x3b, 0xb8,
+    0x0,
+
+    /* U+0057 "W" */
+    0xe0, 0x0, 0xfc, 0x0, 0x1f, 0x80, 0x3, 0x80,
+    0x0, 0xe, 0x0, 0xf, 0xc0, 0x1, 0xf8, 0x0,
+    0x38, 0x0, 0x0, 0xe0, 0x0, 0xfc, 0x0, 0x1f,
+    0x80, 0x3, 0x80, 0x0, 0xe, 0xe, 0xf, 0xc1,
+    0xc1, 0xf8, 0x38, 0x38, 0x0, 0x0, 0xe0, 0xe0,
+    0xfc, 0x1c, 0x1f, 0x83, 0x83, 0x80, 0x0, 0xe,
+    0xe0, 0xef, 0xdc, 0x1d, 0xfb, 0x83, 0xb8, 0x0,
+    0x0, 0xe0, 0x0, 0xfc, 0x0, 0x1f, 0x80, 0x3,
+    0x80
+};
+
+
+/*---------------------
+ *  GLYPH DESCRIPTION
+ *--------------------*/
+
+static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
+    {.bitmap_index = 0, .adv_w = 0, .box_w = 0, .box_h = 0, .ofs_x = 0, .ofs_y = 0} /* id = 0 reserved */,
+    {.bitmap_index = 0, .adv_w = 353, .box_w = 1, .box_h = 1, .ofs_x = 0, .ofs_y = 0},
+    {.bitmap_index = 1, .adv_w = 353, .box_w = 11, .box_h = 3, .ofs_x = 5, .ofs_y = 8},
+    {.bitmap_index = 6, .adv_w = 353, .box_w = 19, .box_h = 27, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 71, .adv_w = 353, .box_w = 11, .box_h = 27, .ofs_x = 5, .ofs_y = 0},
+    {.bitmap_index = 109, .adv_w = 353, .box_w = 19, .box_h = 27, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 174, .adv_w = 353, .box_w = 19, .box_h = 27, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 239, .adv_w = 353, .box_w = 19, .box_h = 27, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 304, .adv_w = 353, .box_w = 19, .box_h = 27, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 369, .adv_w = 353, .box_w = 19, .box_h = 27, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 434, .adv_w = 353, .box_w = 19, .box_h = 27, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 499, .adv_w = 353, .box_w = 19, .box_h = 27, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 564, .adv_w = 353, .box_w = 19, .box_h = 27, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 629, .adv_w = 353, .box_w = 19, .box_h = 27, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 694, .adv_w = 353, .box_w = 19, .box_h = 27, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 759, .adv_w = 353, .box_w = 19, .box_h = 27, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 824, .adv_w = 353, .box_w = 19, .box_h = 27, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 889, .adv_w = 353, .box_w = 19, .box_h = 27, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 954, .adv_w = 353, .box_w = 11, .box_h = 27, .ofs_x = 5, .ofs_y = 0},
+    {.bitmap_index = 992, .adv_w = 353, .box_w = 19, .box_h = 27, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 1057, .adv_w = 353, .box_w = 19, .box_h = 27, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 1122, .adv_w = 353, .box_w = 19, .box_h = 27, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 1187, .adv_w = 353, .box_w = 19, .box_h = 27, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 1252, .adv_w = 353, .box_w = 19, .box_h = 27, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 1317, .adv_w = 353, .box_w = 19, .box_h = 27, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 1382, .adv_w = 353, .box_w = 19, .box_h = 27, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 1447, .adv_w = 353, .box_w = 19, .box_h = 27, .ofs_x = 1, .ofs_y = 0},
+    {.bitmap_index = 1512, .adv_w = 353, .box_w = 19, .box_h = 27, .ofs_x = 1, .ofs_y = 0}
+};
+
+/*---------------------
+ *  CHARACTER MAPPING
+ *--------------------*/
+
+static const uint16_t unicode_list_0[] = {
+    0x0, 0xd, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15,
+    0x16, 0x17, 0x18, 0x19, 0x21, 0x24, 0x25, 0x26,
+    0x28, 0x29, 0x2b, 0x2d, 0x2e, 0x2f, 0x32, 0x33,
+    0x34, 0x35, 0x37
+};
+
+/*Collect the unicode lists and glyph_id offsets*/
+static const lv_font_fmt_txt_cmap_t cmaps[] =
+{
+    {
+        .range_start = 32, .range_length = 56, .glyph_id_start = 1,
+        .unicode_list = unicode_list_0, .glyph_id_ofs_list = NULL, .list_length = 27, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY
+    }
+};
+
+
+
+/*--------------------
+ *  ALL CUSTOM DATA
+ *--------------------*/
+
+#if LV_VERSION_CHECK(8, 0, 0)
+/*Store all the custom data of the font*/
+static  lv_font_fmt_txt_glyph_cache_t cache;
+static const lv_font_fmt_txt_dsc_t font_dsc = {
+#else
+static lv_font_fmt_txt_dsc_t font_dsc = {
+#endif
+    .glyph_bitmap = glyph_bitmap,
+    .glyph_dsc = glyph_dsc,
+    .cmaps = cmaps,
+    .kern_dsc = NULL,
+    .kern_scale = 0,
+    .cmap_num = 1,
+    .bpp = 1,
+    .kern_classes = 0,
+    .bitmap_format = 0,
+#if LV_VERSION_CHECK(8, 0, 0)
+    .cache = &cache
+#endif
+};
+
+
+/*-----------------
+ *  PUBLIC FONT
+ *----------------*/
+
+/*Initialize a public general font descriptor*/
+#if LV_VERSION_CHECK(8, 0, 0)
+const lv_font_t lv_font_dots_40 = {
+#else
+lv_font_t lv_font_dots_40 = {
+#endif
+    .get_glyph_dsc = lv_font_get_glyph_dsc_fmt_txt,    /*Function pointer to get glyph's data*/
+    .get_glyph_bitmap = lv_font_get_bitmap_fmt_txt,    /*Function pointer to get glyph's bitmap*/
+    .line_height = 27,          /*The maximum line height required by the font*/
+    .base_line = 0,             /*Baseline measured from the bottom of the line*/
+#if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0)
+    .subpx = LV_FONT_SUBPX_NONE,
+#endif
+#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8
+    .underline_position = -5,
+    .underline_thickness = 1,
+#endif
+    .dsc = &font_dsc           /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */
+};
+
+
+
+#endif /*#if LV_FONT_DOTS_40*/
+
diff --git a/src/displayapp/fonts/repetitionscrolling.ttf b/src/displayapp/fonts/repetitionscrolling.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..dc124164424fc1696f36e4af8319607c1a5150ea
GIT binary patch
literal 42872
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
WD}ALN7ts4wM(-PY7QTgZ$^QX@HiAR|

literal 0
HcmV?d00001

diff --git a/src/displayapp/screens/CheckboxList.cpp b/src/displayapp/screens/CheckboxList.cpp
new file mode 100644
index 00000000..7667946a
--- /dev/null
+++ b/src/displayapp/screens/CheckboxList.cpp
@@ -0,0 +1,115 @@
+#include "displayapp/screens/CheckboxList.h"
+#include "displayapp/DisplayApp.h"
+#include "displayapp/screens/Styles.h"
+#include "displayapp/screens/Symbols.h"
+
+using namespace Pinetime::Applications::Screens;
+
+namespace {
+  static void event_handler(lv_obj_t* obj, lv_event_t event) {
+    CheckboxList* screen = static_cast<CheckboxList*>(obj->user_data);
+    screen->UpdateSelected(obj, event);
+  }
+
+}
+
+CheckboxList::CheckboxList(const uint8_t screenID,
+                           const uint8_t numScreens,
+                           DisplayApp* app,
+                           Controllers::Settings& settingsController,
+                           const char* optionsTitle,
+                           const char* optionsSymbol,
+                           void (Controllers::Settings::*SetOptionIndex)(uint8_t),
+                           uint8_t (Controllers::Settings::*GetOptionIndex )() const,
+                           std::array<const char*, MAXLISTITEMS> options)
+  : Screen(app), screenID {screenID}, settingsController {settingsController},
+    SetOptionIndex {SetOptionIndex}, GetOptionIndex {GetOptionIndex},
+    options {options} {
+
+  settingsController.SetWatchfacesMenu(screenID);
+
+  // Set the background to Black
+  lv_obj_set_style_local_bg_color(lv_scr_act(), LV_OBJ_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_BLACK);
+
+  if (numScreens > 1) {
+    pageIndicatorBasePoints[0].x = LV_HOR_RES - 1;
+    pageIndicatorBasePoints[0].y = 0;
+    pageIndicatorBasePoints[1].x = LV_HOR_RES - 1;
+    pageIndicatorBasePoints[1].y = LV_VER_RES;
+
+    pageIndicatorBase = lv_line_create(lv_scr_act(), NULL);
+    lv_obj_set_style_local_line_width(pageIndicatorBase, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, 3);
+    lv_obj_set_style_local_line_color(pageIndicatorBase, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x111111));
+    lv_line_set_points(pageIndicatorBase, pageIndicatorBasePoints, 2);
+
+    const uint16_t indicatorSize = LV_VER_RES / numScreens;
+    const uint16_t indicatorPos = indicatorSize * screenID;
+
+    pageIndicatorPoints[0].x = LV_HOR_RES - 1;
+    pageIndicatorPoints[0].y = indicatorPos;
+    pageIndicatorPoints[1].x = LV_HOR_RES - 1;
+    pageIndicatorPoints[1].y = indicatorPos + indicatorSize;
+
+    pageIndicator = lv_line_create(lv_scr_act(), NULL);
+    lv_obj_set_style_local_line_width(pageIndicator, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, 3);
+    lv_obj_set_style_local_line_color(pageIndicator, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_GRAY);
+    lv_line_set_points(pageIndicator, pageIndicatorPoints, 2);
+  }
+
+  lv_obj_t* container1 = lv_cont_create(lv_scr_act(), nullptr);
+
+  lv_obj_set_style_local_bg_opa(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_TRANSP);
+  lv_obj_set_style_local_pad_all(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 10);
+  lv_obj_set_style_local_pad_inner(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 5);
+  lv_obj_set_style_local_border_width(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 0);
+
+  lv_obj_set_pos(container1, 10, 60);
+  lv_obj_set_width(container1, LV_HOR_RES - 20);
+  lv_obj_set_height(container1, LV_VER_RES - 50);
+  lv_cont_set_layout(container1, LV_LAYOUT_COLUMN_LEFT);
+
+  lv_obj_t* title = lv_label_create(lv_scr_act(), nullptr);
+  lv_label_set_text_static(title, optionsTitle);
+  lv_label_set_align(title, LV_LABEL_ALIGN_CENTER);
+  lv_obj_align(title, lv_scr_act(), LV_ALIGN_IN_TOP_MID, 10, 15);
+
+  lv_obj_t* icon = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_color(icon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_ORANGE);
+  lv_label_set_text_static(icon, optionsSymbol);
+  lv_label_set_align(icon, LV_LABEL_ALIGN_CENTER);
+  lv_obj_align(icon, title, LV_ALIGN_OUT_LEFT_MID, -10, 0);
+
+  for (unsigned int i = 0; i < options.size(); i++) {
+    if (strcmp(options[i], "")) {
+      cbOption[i] = lv_checkbox_create(container1, nullptr);
+      lv_checkbox_set_text(cbOption[i], options[i]);
+      cbOption[i]->user_data = this;
+      lv_obj_set_event_cb(cbOption[i], event_handler);
+      SetRadioButtonStyle(cbOption[i]);
+
+      if (static_cast<unsigned int>((settingsController.*GetOptionIndex)() - MAXLISTITEMS*screenID) == i) {
+        lv_checkbox_set_checked(cbOption[i], true);
+      }
+    }
+  }
+}
+
+CheckboxList::~CheckboxList() {
+  lv_obj_clean(lv_scr_act());
+  settingsController.SaveSettings();
+}
+
+void CheckboxList::UpdateSelected(lv_obj_t* object, lv_event_t event) {
+  if (event == LV_EVENT_VALUE_CHANGED) {
+    for (unsigned int i = 0; i < options.size(); i++) {
+      if (strcmp(options[i], "")) {
+        if (object == cbOption[i]) {
+          lv_checkbox_set_checked(cbOption[i], true);
+          (settingsController.*SetOptionIndex)(MAXLISTITEMS*screenID + i);
+        } else {
+          lv_checkbox_set_checked(cbOption[i], false);
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/displayapp/screens/CheckboxList.h b/src/displayapp/screens/CheckboxList.h
new file mode 100644
index 00000000..e90dcd30
--- /dev/null
+++ b/src/displayapp/screens/CheckboxList.h
@@ -0,0 +1,49 @@
+#pragma once
+
+#include <lvgl/lvgl.h>
+#include <cstdint>
+#include <memory>
+#include "displayapp/screens/Screen.h"
+#include "displayapp/Apps.h"
+#include "components/settings/Settings.h"
+
+#define MAXLISTITEMS 4
+
+namespace Pinetime {
+  namespace Applications {
+    namespace Screens {
+      class CheckboxList : public Screen {
+      public:
+        CheckboxList(const uint8_t screenID,
+                     const uint8_t numScreens,
+                     DisplayApp* app,
+                     Controllers::Settings& settingsController,
+                     const char* optionsTitle,
+                     const char* optionsSymbol,
+                     void (Controllers::Settings::*SetOptionIndex)(uint8_t),
+                     uint8_t (Controllers::Settings::*GetOptionIndex)() const,
+                     std::array<const char*, MAXLISTITEMS> options);
+
+        ~CheckboxList() override;
+
+        void UpdateSelected(lv_obj_t* object, lv_event_t event);
+
+      private:
+        const uint8_t screenID;
+        Controllers::Settings& settingsController;
+        const char* optionsTitle;
+        const char* optionsSymbol;
+        void (Controllers::Settings::*SetOptionIndex)(uint8_t);
+        uint8_t (Controllers::Settings::*GetOptionIndex)() const;
+        std::array<const char*, MAXLISTITEMS> options;
+
+        lv_obj_t* cbOption[MAXLISTITEMS];
+
+        lv_point_t pageIndicatorBasePoints[2];
+        lv_point_t pageIndicatorPoints[2];
+        lv_obj_t* pageIndicatorBase;
+        lv_obj_t* pageIndicator;
+      };
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/displayapp/screens/Clock.cpp b/src/displayapp/screens/Clock.cpp
index 1687dccf..4e76af18 100644
--- a/src/displayapp/screens/Clock.cpp
+++ b/src/displayapp/screens/Clock.cpp
@@ -12,6 +12,7 @@
 #include "displayapp/screens/WatchFaceTerminal.h"
 #include "displayapp/screens/WatchFaceAnalog.h"
 #include "displayapp/screens/WatchFacePineTimeStyle.h"
+#include "displayapp/screens/WatchFaceCasioStyleG7710.h"
 
 using namespace Pinetime::Applications::Screens;
 
@@ -45,6 +46,9 @@ Clock::Clock(DisplayApp* app,
         case 3:
           return WatchFaceTerminalScreen();
           break;
+        case 4:
+          return WatchFaceCasioStyleG7710();
+          break;
       }
       return WatchFaceDigitalScreen();
     }()} {
@@ -103,3 +107,14 @@ std::unique_ptr<Screen> Clock::WatchFaceTerminalScreen() {
                                                       heartRateController,
                                                       motionController);
 }
+
+std::unique_ptr<Screen> Clock::WatchFaceCasioStyleG7710() {
+  return std::make_unique<Screens::WatchFaceCasioStyleG7710>(app,
+                                                              dateTimeController,
+                                                              batteryController,
+                                                              bleController,
+                                                              notificatioManager,
+                                                              settingsController,
+                                                              heartRateController,
+                                                              motionController);
+}
diff --git a/src/displayapp/screens/Clock.h b/src/displayapp/screens/Clock.h
index 1ba752c7..5446a11b 100644
--- a/src/displayapp/screens/Clock.h
+++ b/src/displayapp/screens/Clock.h
@@ -48,6 +48,7 @@ namespace Pinetime {
         std::unique_ptr<Screen> WatchFaceAnalogScreen();
         std::unique_ptr<Screen> WatchFacePineTimeStyleScreen();
         std::unique_ptr<Screen> WatchFaceTerminalScreen();
+        std::unique_ptr<Screen> WatchFaceCasioStyleG7710();
       };
     }
   }
diff --git a/src/displayapp/screens/WatchFaceCasioStyleG7710.cpp b/src/displayapp/screens/WatchFaceCasioStyleG7710.cpp
new file mode 100644
index 00000000..8f730d52
--- /dev/null
+++ b/src/displayapp/screens/WatchFaceCasioStyleG7710.cpp
@@ -0,0 +1,297 @@
+#include "displayapp/screens/WatchFaceCasioStyleG7710.h"
+
+#include <date/date.h>
+#include <lvgl/lvgl.h>
+#include <cstdio>
+#include "displayapp/screens/BatteryIcon.h"
+#include "displayapp/screens/BleIcon.h"
+#include "displayapp/screens/NotificationIcon.h"
+#include "displayapp/screens/Symbols.h"
+#include "components/battery/BatteryController.h"
+#include "components/ble/BleController.h"
+#include "components/ble/NotificationManager.h"
+#include "components/heartrate/HeartRateController.h"
+#include "components/motion/MotionController.h"
+#include "components/settings/Settings.h"
+using namespace Pinetime::Applications::Screens;
+
+
+WatchFaceCasioStyleG7710::WatchFaceCasioStyleG7710(DisplayApp* app,
+                                   Controllers::DateTime& dateTimeController,
+                                   Controllers::Battery& batteryController,
+                                   Controllers::Ble& bleController,
+                                   Controllers::NotificationManager& notificatioManager,
+                                   Controllers::Settings& settingsController,
+                                   Controllers::HeartRateController& heartRateController,
+                                   Controllers::MotionController& motionController)
+  : Screen(app),
+    currentDateTime {{}},
+    dateTimeController {dateTimeController},
+    batteryController {batteryController},
+    bleController {bleController},
+    notificatioManager {notificatioManager},
+    settingsController {settingsController},
+    heartRateController {heartRateController},
+    motionController {motionController} {
+
+  batteryIcon = lv_label_create(lv_scr_act(), nullptr);
+  lv_label_set_text_static(batteryIcon, Symbols::batteryFull);
+  lv_obj_set_style_local_text_color(batteryIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x98B69A));
+  lv_obj_align(batteryIcon, lv_scr_act(), LV_ALIGN_IN_TOP_RIGHT, -5, 0);
+
+  batteryPlug = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_color(batteryPlug, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x98B69A));
+  lv_label_set_text_static(batteryPlug, Symbols::plug);
+  lv_obj_align(batteryPlug, batteryIcon, LV_ALIGN_OUT_LEFT_MID, -5, 0);
+
+  bleIcon = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_color(bleIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x98B69A));
+  lv_label_set_text_static(bleIcon, Symbols::bluetooth);
+  lv_obj_align(bleIcon, batteryPlug, LV_ALIGN_OUT_LEFT_MID, -5, 0);
+
+  notificationIcon = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_color(notificationIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x98B69A));
+  lv_label_set_text_static(notificationIcon, NotificationIcon::GetIcon(false));
+  lv_obj_align(notificationIcon, nullptr, LV_ALIGN_IN_TOP_LEFT, 5, 0);
+
+
+  label_day_of_week = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_align(label_day_of_week, lv_scr_act(), LV_ALIGN_IN_TOP_LEFT, 10, 64);
+  lv_obj_set_style_local_text_color(label_day_of_week, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x98B69A));
+  lv_obj_set_style_local_text_font(label_day_of_week, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &lv_font_dots_40);
+  lv_label_set_text_static(label_day_of_week, "SUN");
+
+  label_week_number = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_align(label_week_number, lv_scr_act(), LV_ALIGN_IN_TOP_LEFT, 5, 34);
+  lv_obj_set_style_local_text_color(label_week_number, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x98B69A));
+  lv_obj_set_style_local_text_font(label_week_number, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &lv_font_dots_40);
+  lv_label_set_text_static(label_week_number, "WK26");
+
+  label_day_of_year = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_align(label_day_of_year, lv_scr_act(), LV_ALIGN_IN_TOP_LEFT, 100, 25);
+  lv_obj_set_style_local_text_color(label_day_of_year, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x98B69A));
+  lv_obj_set_style_local_text_font(label_day_of_year, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &lv_font_7segment_40);
+  lv_label_set_text_static(label_day_of_year, "181-184");
+
+  static lv_style_t style_line;
+  lv_style_init(&style_line);
+  lv_style_set_line_width(&style_line, LV_STATE_DEFAULT, 2);
+  lv_style_set_line_color(&style_line, LV_STATE_DEFAULT, lv_color_hex(0x98B69A));
+  lv_style_set_line_rounded(&style_line, LV_STATE_DEFAULT, true);
+
+  static lv_style_t style_border;
+  lv_style_init(&style_border);
+  lv_style_set_line_width(&style_border, LV_STATE_DEFAULT, 6);
+  lv_style_set_line_color(&style_border, LV_STATE_DEFAULT, lv_color_hex(0x98B69A));
+  lv_style_set_line_rounded(&style_border, LV_STATE_DEFAULT, true);
+
+  line_day_of_week_number = lv_line_create(lv_scr_act(), nullptr);
+  static lv_point_t line_day_of_week_number_points[] = {{0, 0}, {100, 0}, {94, 70}, {0, 70}};
+  lv_line_set_points(line_day_of_week_number, line_day_of_week_number_points, 4);
+  lv_obj_add_style(line_day_of_week_number, LV_LINE_PART_MAIN, &style_border);
+  lv_obj_align(line_day_of_week_number, NULL, LV_ALIGN_IN_TOP_LEFT, 0, 28);
+
+  line_day_of_year = lv_line_create(lv_scr_act(), nullptr);
+  static lv_point_t line_day_of_year_points[] = {{0, 5}, {130, 5}, {135, 0}};
+  lv_line_set_points(line_day_of_year, line_day_of_year_points, 3);
+  lv_obj_add_style(line_day_of_year, LV_LINE_PART_MAIN, &style_line);
+  lv_obj_align(line_day_of_year, NULL, LV_ALIGN_IN_TOP_RIGHT, 0, 55);
+
+  label_date = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_align(label_date, lv_scr_act(), LV_ALIGN_IN_TOP_LEFT, 100, 65);
+  lv_obj_set_style_local_text_color(label_date, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x98B69A));
+  lv_obj_set_style_local_text_font(label_date, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &lv_font_7segment_40);
+  lv_label_set_text_static(label_date, "6-30");
+
+  line_date = lv_line_create(lv_scr_act(), nullptr);
+  static lv_point_t line_date_points[] = {{0, 5}, {135, 5}, {140, 0}};
+  lv_line_set_points(line_date, line_date_points, 3);
+  lv_obj_add_style(line_date, LV_LINE_PART_MAIN, &style_line);
+  lv_obj_align(line_date, NULL, LV_ALIGN_IN_TOP_RIGHT, 0, 95);
+
+  label_time = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_color(label_time, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x98B69A));
+  lv_obj_set_style_local_text_font(label_time, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &lv_font_7segment_115);
+  lv_obj_align(label_time, lv_scr_act(), LV_ALIGN_CENTER, 0, 0);
+
+  line_time = lv_line_create(lv_scr_act(), nullptr);
+  static lv_point_t line_time_points[] = {{0, 0}, {230, 0}, {235, 5}};
+  lv_line_set_points(line_time, line_time_points, 3);
+  lv_obj_add_style(line_time, LV_LINE_PART_MAIN, &style_line);
+  lv_obj_align(line_time, NULL, LV_ALIGN_IN_BOTTOM_RIGHT, 0, -35);
+
+  label_time_ampm = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_color(label_time_ampm, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x98B69A));
+  lv_label_set_text_static(label_time_ampm, "");
+  lv_obj_align(label_time_ampm, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 5, -5);
+
+  backgroundLabel = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_click(backgroundLabel, true);
+  lv_label_set_long_mode(backgroundLabel, LV_LABEL_LONG_CROP);
+  lv_obj_set_size(backgroundLabel, 240, 240);
+  lv_obj_set_pos(backgroundLabel, 0, 0);
+  lv_label_set_text_static(backgroundLabel, "");
+
+  heartbeatIcon = lv_label_create(lv_scr_act(), nullptr);
+  lv_label_set_text_static(heartbeatIcon, Symbols::heartBeat);
+  lv_obj_set_style_local_text_color(heartbeatIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x98B69A));
+  lv_obj_align(heartbeatIcon, lv_scr_act(), LV_ALIGN_IN_BOTTOM_LEFT, 5, -2);
+
+  heartbeatValue = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_color(heartbeatValue, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x98B69A));
+  lv_label_set_text_static(heartbeatValue, "");
+  lv_obj_align(heartbeatValue, heartbeatIcon, LV_ALIGN_OUT_RIGHT_MID, 5, 0);
+
+  stepValue = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_color(stepValue, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x98B69A));
+  lv_label_set_text_static(stepValue, "0");
+  lv_obj_align(stepValue, lv_scr_act(), LV_ALIGN_IN_BOTTOM_RIGHT, -5, -2);
+
+  stepIcon = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_set_style_local_text_color(stepIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x98B69A));
+  lv_label_set_text_static(stepIcon, Symbols::shoe);
+  lv_obj_align(stepIcon, stepValue, LV_ALIGN_OUT_LEFT_MID, -5, 0);
+
+  taskRefresh = lv_task_create(RefreshTaskCallback, LV_DISP_DEF_REFR_PERIOD, LV_TASK_PRIO_MID, this);
+  Refresh();
+}
+
+WatchFaceCasioStyleG7710::~WatchFaceCasioStyleG7710() {
+  lv_task_del(taskRefresh);
+  lv_obj_clean(lv_scr_act());
+}
+
+void WatchFaceCasioStyleG7710::Refresh() {
+  powerPresent = batteryController.IsPowerPresent();
+  if (powerPresent.IsUpdated()) {
+    lv_label_set_text_static(batteryPlug, BatteryIcon::GetPlugIcon(powerPresent.Get()));
+  }
+
+  batteryPercentRemaining = batteryController.PercentRemaining();
+  if (batteryPercentRemaining.IsUpdated()) {
+    auto batteryPercent = batteryPercentRemaining.Get();
+    lv_label_set_text_static(batteryIcon, BatteryIcon::GetBatteryIcon(batteryPercent));
+  }
+
+  bleState = bleController.IsConnected();
+  bleRadioEnabled = bleController.IsRadioEnabled();
+  if (bleState.IsUpdated() || bleRadioEnabled.IsUpdated()) {
+    lv_label_set_text_static(bleIcon, BleIcon::GetIcon(bleState.Get()));
+  }
+  lv_obj_realign(batteryPlug);
+  lv_obj_realign(bleIcon);
+
+  notificationState = notificatioManager.AreNewNotificationsAvailable();
+  if (notificationState.IsUpdated()) {
+    lv_label_set_text_static(notificationIcon, NotificationIcon::GetIcon(notificationState.Get()));
+  }
+
+  currentDateTime = dateTimeController.CurrentDateTime();
+
+  if (currentDateTime.IsUpdated()) {
+    auto newDateTime = currentDateTime.Get();
+
+    auto dp = date::floor<date::days>(newDateTime);
+    auto time = date::make_time(newDateTime - dp);
+    auto yearMonthDay = date::year_month_day(dp);
+
+    auto year = static_cast<int>(yearMonthDay.year());
+    auto month = static_cast<Pinetime::Controllers::DateTime::Months>(static_cast<unsigned>(yearMonthDay.month()));
+    auto day = static_cast<unsigned>(yearMonthDay.day());
+    auto dayOfWeek = static_cast<Pinetime::Controllers::DateTime::Days>(date::weekday(yearMonthDay).iso_encoding());
+
+    uint8_t hour = time.hours().count();
+    uint8_t minute = time.minutes().count();
+    auto weekNumberFormat = "%V";
+
+    if (displayedHour != hour || displayedMinute != minute) {
+      displayedHour = hour;
+      displayedMinute = minute;
+
+      if (settingsController.GetClockType() == Controllers::Settings::ClockType::H12) {
+        char ampmChar[2] = "A";
+        if (hour == 0) {
+          hour = 12;
+        } else if (hour == 12) {
+          ampmChar[0] = 'P';
+        } else if (hour > 12) {
+          hour = hour - 12;
+          ampmChar[0] = 'P';
+        }
+        lv_label_set_text(label_time_ampm, ampmChar);
+        lv_label_set_text_fmt(label_time, "%2d:%02d", hour, minute);
+        lv_obj_align(label_time, lv_scr_act(), LV_ALIGN_CENTER, 0, 30);
+      } else {
+        lv_label_set_text_fmt(label_time, "%02d:%02d", hour, minute);
+        lv_obj_align(label_time, lv_scr_act(), LV_ALIGN_CENTER, 0, 30);
+      }
+    }
+
+    if ((year != currentYear) || (month != currentMonth) || (dayOfWeek != currentDayOfWeek) || (day != currentDay)) {
+      if (settingsController.GetClockType() == Controllers::Settings::ClockType::H24) {
+        // 24h mode: ddmmyyyy, first DOW=Monday;
+        lv_label_set_text_fmt(
+          label_date, "%3d-%2d", day, month);
+          weekNumberFormat = "%V"; // Replaced by the week number of the year (Monday as the first day of the week) as a decimal number [01,53]. If the week containing 1 January has four or more days in the new year, then it is considered week 1. Otherwise, it is the last week of the previous year, and the next week is week 1. Both January 4th and the first Thursday of January are always in week 1. [ tm_year, tm_wday, tm_yday]
+      } else {
+        // 12h mode: mmddyyyy, first DOW=Sunday;
+        lv_label_set_text_fmt(
+          label_date, "%3d-%2d", month, day);
+          weekNumberFormat = "%U"; // Replaced by the week number of the year as a decimal number [00,53]. The first Sunday of January is the first day of week 1; days in the new year before this are in week 0. [ tm_year, tm_wday, tm_yday]
+      }
+
+      uint8_t weekNumber;
+      uint16_t dayOfYearNumber, daysTillEndOfYearNumber;
+
+      std::tm date = {};
+      date.tm_year = year - 1900;
+      date.tm_mon = static_cast<unsigned>(yearMonthDay.month()) - 1;
+      date.tm_mday = day + 1;
+      std::mktime( &date );
+
+      dayOfYearNumber = date.tm_yday;
+      daysTillEndOfYearNumber = yearMonthDay.year().is_leap() ? 366 : 365 - dayOfYearNumber;
+
+      char buffer[8];
+      strftime(buffer, 8, weekNumberFormat, &date); 
+      weekNumber = atoi(buffer);
+
+      lv_label_set_text_fmt(label_day_of_week, "%s", dateTimeController.DayOfWeekShortToString());
+      lv_label_set_text_fmt(label_day_of_year, "%3d-%3d", dayOfYearNumber, daysTillEndOfYearNumber);
+      lv_label_set_text_fmt(label_week_number, "WK%02d", weekNumber);
+
+      lv_obj_realign(label_day_of_week);
+      lv_obj_realign(label_day_of_year);
+      lv_obj_realign(label_week_number);
+      lv_obj_realign(label_date);
+
+      currentYear = year;
+      currentMonth = month;
+      currentDayOfWeek = dayOfWeek;
+      currentDay = day;
+    }
+  }
+
+  heartbeat = heartRateController.HeartRate();
+  heartbeatRunning = heartRateController.State() != Controllers::HeartRateController::States::Stopped;
+  if (heartbeat.IsUpdated() || heartbeatRunning.IsUpdated()) {
+    if (heartbeatRunning.Get()) {
+      lv_obj_set_style_local_text_color(heartbeatIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x98B69A));
+      lv_label_set_text_fmt(heartbeatValue, "%d", heartbeat.Get());
+    } else {
+      lv_obj_set_style_local_text_color(heartbeatIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x1B1B1B));
+      lv_label_set_text_static(heartbeatValue, "");
+    }
+
+    lv_obj_realign(heartbeatIcon);
+    lv_obj_realign(heartbeatValue);
+  }
+
+  stepCount = motionController.NbSteps();
+  motionSensorOk = motionController.IsSensorOk();
+  if (stepCount.IsUpdated() || motionSensorOk.IsUpdated()) {
+    lv_label_set_text_fmt(stepValue, "%lu", stepCount.Get());
+    lv_obj_realign(stepValue);
+    lv_obj_realign(stepIcon);
+  }
+}
diff --git a/src/displayapp/screens/WatchFaceCasioStyleG7710.h b/src/displayapp/screens/WatchFaceCasioStyleG7710.h
new file mode 100644
index 00000000..0cf7bbbf
--- /dev/null
+++ b/src/displayapp/screens/WatchFaceCasioStyleG7710.h
@@ -0,0 +1,91 @@
+#pragma once
+
+#include <displayapp/screens/BatteryIcon.h>
+#include <lvgl/src/lv_core/lv_obj.h>
+#include <chrono>
+#include <cstdint>
+#include <memory>
+#include "displayapp/screens/Screen.h"
+#include "components/datetime/DateTimeController.h"
+#include "components/ble/BleController.h"
+
+namespace Pinetime {
+  namespace Controllers {
+    class Settings;
+    class Battery;
+    class Ble;
+    class NotificationManager;
+    class HeartRateController;
+    class MotionController;
+  }
+
+  namespace Applications {
+    namespace Screens {
+
+      class WatchFaceCasioStyleG7710 : public Screen {
+      public:
+        WatchFaceCasioStyleG7710(DisplayApp* app,
+                         Controllers::DateTime& dateTimeController,
+                         Controllers::Battery& batteryController,
+                         Controllers::Ble& bleController,
+                         Controllers::NotificationManager& notificatioManager,
+                         Controllers::Settings& settingsController,
+                         Controllers::HeartRateController& heartRateController,
+                         Controllers::MotionController& motionController);
+        ~WatchFaceCasioStyleG7710() override;
+
+        void Refresh() override;
+
+      private:
+        uint8_t displayedHour = -1;
+        uint8_t displayedMinute = -1;
+
+        uint16_t currentYear = 1970;
+        Controllers::DateTime::Months currentMonth = Pinetime::Controllers::DateTime::Months::Unknown;
+        Controllers::DateTime::Days currentDayOfWeek = Pinetime::Controllers::DateTime::Days::Unknown;
+        uint8_t currentDay = 0;
+
+        DirtyValue<uint8_t> batteryPercentRemaining {};
+        DirtyValue<bool> powerPresent {};
+        DirtyValue<bool> bleState {};
+        DirtyValue<bool> bleRadioEnabled {};
+        DirtyValue<std::chrono::time_point<std::chrono::system_clock, std::chrono::nanoseconds>> currentDateTime {};
+        DirtyValue<bool> motionSensorOk {};
+        DirtyValue<uint32_t> stepCount {};
+        DirtyValue<uint8_t> heartbeat {};
+        DirtyValue<bool> heartbeatRunning {};
+        DirtyValue<bool> notificationState {};
+
+        lv_obj_t* label_time;
+        lv_obj_t* line_time;
+        lv_obj_t* label_time_ampm;
+        lv_obj_t* label_date;
+        lv_obj_t* line_date;
+        lv_obj_t* label_day_of_week;
+        lv_obj_t* label_week_number;
+        lv_obj_t* line_day_of_week_number;
+        lv_obj_t* label_day_of_year;
+        lv_obj_t* line_day_of_year;
+        lv_obj_t* backgroundLabel;
+        lv_obj_t* bleIcon;
+        lv_obj_t* batteryPlug;
+        lv_obj_t* heartbeatIcon;
+        lv_obj_t* heartbeatValue;
+        lv_obj_t* stepIcon;
+        lv_obj_t* stepValue;
+        lv_obj_t* notificationIcon;
+        lv_obj_t* batteryIcon;
+
+        Controllers::DateTime& dateTimeController;
+        Controllers::Battery& batteryController;
+        Controllers::Ble& bleController;
+        Controllers::NotificationManager& notificatioManager;
+        Controllers::Settings& settingsController;
+        Controllers::HeartRateController& heartRateController;
+        Controllers::MotionController& motionController;
+
+        lv_task_t* taskRefresh;
+      };
+    }
+  }
+}
diff --git a/src/displayapp/screens/settings/SettingWatchFace.h b/src/displayapp/screens/settings/SettingWatchFace.h
index 62427b4f..801dcd73 100644
--- a/src/displayapp/screens/settings/SettingWatchFace.h
+++ b/src/displayapp/screens/settings/SettingWatchFace.h
@@ -4,8 +4,10 @@
 #include <cstdint>
 #include <lvgl/lvgl.h>
 
+#include "displayapp/screens/ScreenList.h"
 #include "components/settings/Settings.h"
 #include "displayapp/screens/Screen.h"
+#include "displayapp/screens/Symbols.h"
 
 namespace Pinetime {
 
@@ -17,14 +19,17 @@ namespace Pinetime {
         SettingWatchFace(DisplayApp* app, Pinetime::Controllers::Settings& settingsController);
         ~SettingWatchFace() override;
 
-        void UpdateSelected(lv_obj_t* object, lv_event_t event);
+        bool OnTouchEvent(TouchEvents event) override;
 
       private:
-        static constexpr std::array<const char*, 4> options = {" Digital face", " Analog face", " PineTimeStyle", " Terminal"};
         Controllers::Settings& settingsController;
+        ScreenList<2> screens;
 
-        lv_obj_t* cbOption[options.size()];
+        static constexpr const char* title = "Watch face";
+        static constexpr const char* symbol = Symbols::home;
+        std::unique_ptr<Screen> CreateScreen1();
+        std::unique_ptr<Screen> CreateScreen2();
       };
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/libs/lv_conf.h b/src/libs/lv_conf.h
index 73109c5a..3dfe9d7c 100644
--- a/src/libs/lv_conf.h
+++ b/src/libs/lv_conf.h
@@ -418,6 +418,9 @@ typedef void* lv_indev_drv_user_data_t;            /*Type of user data in the in
                                LV_FONT_DECLARE(jetbrains_mono_42) \
                                LV_FONT_DECLARE(jetbrains_mono_76) \
                                LV_FONT_DECLARE(open_sans_light) \
+                               LV_FONT_DECLARE(lv_font_7segment_115) \
+                               LV_FONT_DECLARE(lv_font_7segment_40) \
+                               LV_FONT_DECLARE(lv_font_dots_40) \
                                LV_FONT_DECLARE(lv_font_sys_48)
 
 /* Enable it if you have fonts with a lot of characters.

From 917e46c684a590f708b12458dc5f197cc9bee0fc Mon Sep 17 00:00:00 2001
From: ITCactus <n/a>
Date: Mon, 16 May 2022 12:05:14 +0200
Subject: [PATCH 02/10] post rebase fixes

---
 src/components/settings/Settings.h            |  9 +-
 src/displayapp/fonts/CMakeLists.txt           |  2 +-
 src/displayapp/fonts/fonts.json               | 32 ++++++-
 src/displayapp/screens/CheckboxList.cpp       |  2 +-
 src/displayapp/screens/CheckboxList.h         |  2 +-
 .../screens/WatchFaceCasioStyleG7710.cpp      | 53 +++++++----
 .../screens/WatchFaceCasioStyleG7710.h        |  5 +-
 .../screens/settings/SettingWatchFace.cpp     | 91 +++++++------------
 .../screens/settings/SettingWatchFace.h       |  2 +-
 9 files changed, 113 insertions(+), 85 deletions(-)

diff --git a/src/components/settings/Settings.h b/src/components/settings/Settings.h
index 83987b77..becd57bc 100644
--- a/src/components/settings/Settings.h
+++ b/src/components/settings/Settings.h
@@ -98,10 +98,6 @@ namespace Pinetime {
         appMenu = menu;
       };
 
-      uint8_t GetAppMenu() const {
-        return appMenu;
-      };
-
       void SetWatchfacesMenu(uint8_t menu) {
         watchFacesMenu = menu;
       };
@@ -110,6 +106,11 @@ namespace Pinetime {
         return watchFacesMenu;
       };
 
+
+      uint8_t GetAppMenu() const {
+        return appMenu;
+      };
+
       void SetSettingsMenu(uint8_t menu) {
         settingsMenu = menu;
       };
diff --git a/src/displayapp/fonts/CMakeLists.txt b/src/displayapp/fonts/CMakeLists.txt
index 84830cc0..7af899ba 100644
--- a/src/displayapp/fonts/CMakeLists.txt
+++ b/src/displayapp/fonts/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(FONTS jetbrains_mono_42 jetbrains_mono_76 jetbrains_mono_bold_20
    jetbrains_mono_extrabold_compressed lv_font_navi_80 lv_font_sys_48
-   open_sans_light)
+   open_sans_light lv_font_dots_40 lv_font_7segment_40 lv_font_7segment_115)
 find_program(LV_FONT_CONV "lv_font_conv" NO_CACHE REQUIRED
    HINTS "${CMAKE_SOURCE_DIR}/node_modules/.bin")
 message(STATUS "Using ${LV_FONT_CONV} to generate font files")
diff --git a/src/displayapp/fonts/fonts.json b/src/displayapp/fonts/fonts.json
index abdb4512..b1593312 100644
--- a/src/displayapp/fonts/fonts.json
+++ b/src/displayapp/fonts/fonts.json
@@ -74,5 +74,35 @@
       "bpp": 2,
       "size": 80,
       "compress": true
+   },
+   "lv_font_dots_40": {
+      "sources": [
+         {
+            "file": "repetitionscrolling.ttf",
+            "symbols": "0123456789-MONTUEWEDTHUFRISATSUN WK"
+         }
+      ],
+      "bpp": 1,
+      "size": 40
+   },
+   "lv_font_7segment_40": {
+      "sources": [
+         {
+            "file": "7segment.woff",
+            "symbols": "0123456789: -"
+         }
+      ],
+      "bpp": 1,
+      "size": 40
+   },
+   "lv_font_7segment_115": {
+      "sources": [
+         {
+            "file": "7segment.woff",
+            "symbols": "0123456789: -"
+         }
+      ],
+      "bpp": 1,
+      "size": 115
    }
-}
+}
\ No newline at end of file
diff --git a/src/displayapp/screens/CheckboxList.cpp b/src/displayapp/screens/CheckboxList.cpp
index 7667946a..4da7826c 100644
--- a/src/displayapp/screens/CheckboxList.cpp
+++ b/src/displayapp/screens/CheckboxList.cpp
@@ -112,4 +112,4 @@ void CheckboxList::UpdateSelected(lv_obj_t* object, lv_event_t event) {
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/displayapp/screens/CheckboxList.h b/src/displayapp/screens/CheckboxList.h
index e90dcd30..6660acde 100644
--- a/src/displayapp/screens/CheckboxList.h
+++ b/src/displayapp/screens/CheckboxList.h
@@ -46,4 +46,4 @@ namespace Pinetime {
       };
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/displayapp/screens/WatchFaceCasioStyleG7710.cpp b/src/displayapp/screens/WatchFaceCasioStyleG7710.cpp
index 8f730d52..eb4cb63e 100644
--- a/src/displayapp/screens/WatchFaceCasioStyleG7710.cpp
+++ b/src/displayapp/screens/WatchFaceCasioStyleG7710.cpp
@@ -15,7 +15,6 @@
 #include "components/settings/Settings.h"
 using namespace Pinetime::Applications::Screens;
 
-
 WatchFaceCasioStyleG7710::WatchFaceCasioStyleG7710(DisplayApp* app,
                                    Controllers::DateTime& dateTimeController,
                                    Controllers::Battery& batteryController,
@@ -34,15 +33,21 @@ WatchFaceCasioStyleG7710::WatchFaceCasioStyleG7710(DisplayApp* app,
     heartRateController {heartRateController},
     motionController {motionController} {
 
-  batteryIcon = lv_label_create(lv_scr_act(), nullptr);
-  lv_label_set_text_static(batteryIcon, Symbols::batteryFull);
-  lv_obj_set_style_local_text_color(batteryIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x98B69A));
-  lv_obj_align(batteryIcon, lv_scr_act(), LV_ALIGN_IN_TOP_RIGHT, -5, 0);
+
+  label_battery_vallue = lv_label_create(lv_scr_act(), nullptr);
+  lv_obj_align(label_battery_vallue, lv_scr_act(), LV_ALIGN_IN_TOP_RIGHT, 0, 0);
+  lv_obj_set_style_local_text_color(label_battery_vallue, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x98B69A));
+  lv_label_set_text_static(label_battery_vallue, "00%");
+
+
+  batteryIcon.Create(lv_scr_act());
+  batteryIcon.SetColor(lv_color_hex(0x98B69A));
+  lv_obj_align(batteryIcon.GetObject(), label_battery_vallue, LV_ALIGN_OUT_LEFT_MID, -5, 0);
 
   batteryPlug = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_color(batteryPlug, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x98B69A));
   lv_label_set_text_static(batteryPlug, Symbols::plug);
-  lv_obj_align(batteryPlug, batteryIcon, LV_ALIGN_OUT_LEFT_MID, -5, 0);
+  lv_obj_align(batteryPlug, batteryIcon.GetObject(), LV_ALIGN_OUT_LEFT_MID, -5, 0);
 
   bleIcon = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_color(bleIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x98B69A));
@@ -52,7 +57,7 @@ WatchFaceCasioStyleG7710::WatchFaceCasioStyleG7710(DisplayApp* app,
   notificationIcon = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_color(notificationIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x98B69A));
   lv_label_set_text_static(notificationIcon, NotificationIcon::GetIcon(false));
-  lv_obj_align(notificationIcon, nullptr, LV_ALIGN_IN_TOP_LEFT, 5, 0);
+  lv_obj_align(notificationIcon, bleIcon, LV_ALIGN_OUT_LEFT_MID, -5, 0);
 
 
   label_day_of_week = lv_label_create(lv_scr_act(), nullptr);
@@ -62,13 +67,13 @@ WatchFaceCasioStyleG7710::WatchFaceCasioStyleG7710(DisplayApp* app,
   lv_label_set_text_static(label_day_of_week, "SUN");
 
   label_week_number = lv_label_create(lv_scr_act(), nullptr);
-  lv_obj_align(label_week_number, lv_scr_act(), LV_ALIGN_IN_TOP_LEFT, 5, 34);
+  lv_obj_align(label_week_number, lv_scr_act(), LV_ALIGN_IN_TOP_LEFT, 5, 22);
   lv_obj_set_style_local_text_color(label_week_number, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x98B69A));
   lv_obj_set_style_local_text_font(label_week_number, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &lv_font_dots_40);
   lv_label_set_text_static(label_week_number, "WK26");
 
   label_day_of_year = lv_label_create(lv_scr_act(), nullptr);
-  lv_obj_align(label_day_of_year, lv_scr_act(), LV_ALIGN_IN_TOP_LEFT, 100, 25);
+  lv_obj_align(label_day_of_year, lv_scr_act(), LV_ALIGN_IN_TOP_LEFT, 100, 30);
   lv_obj_set_style_local_text_color(label_day_of_year, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x98B69A));
   lv_obj_set_style_local_text_font(label_day_of_year, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &lv_font_7segment_40);
   lv_label_set_text_static(label_day_of_year, "181-184");
@@ -85,20 +90,26 @@ WatchFaceCasioStyleG7710::WatchFaceCasioStyleG7710(DisplayApp* app,
   lv_style_set_line_color(&style_border, LV_STATE_DEFAULT, lv_color_hex(0x98B69A));
   lv_style_set_line_rounded(&style_border, LV_STATE_DEFAULT, true);
 
+  line_icons = lv_line_create(lv_scr_act(), nullptr);
+  static lv_point_t line_icons_points[] = {{0, 5}, {117, 5}, {122, 0}};
+  lv_line_set_points(line_icons, line_icons_points, 3);
+  lv_obj_add_style(line_icons, LV_LINE_PART_MAIN, &style_line);
+  lv_obj_align(line_icons, NULL, LV_ALIGN_IN_TOP_RIGHT, -10, 18);
+
   line_day_of_week_number = lv_line_create(lv_scr_act(), nullptr);
-  static lv_point_t line_day_of_week_number_points[] = {{0, 0}, {100, 0}, {94, 70}, {0, 70}};
+  static lv_point_t line_day_of_week_number_points[] = {{0, 0}, {100, 0}, {95, 95}, {0, 95}};
   lv_line_set_points(line_day_of_week_number, line_day_of_week_number_points, 4);
   lv_obj_add_style(line_day_of_week_number, LV_LINE_PART_MAIN, &style_border);
-  lv_obj_align(line_day_of_week_number, NULL, LV_ALIGN_IN_TOP_LEFT, 0, 28);
+  lv_obj_align(line_day_of_week_number, NULL, LV_ALIGN_IN_TOP_LEFT, 0, 8);
 
   line_day_of_year = lv_line_create(lv_scr_act(), nullptr);
   static lv_point_t line_day_of_year_points[] = {{0, 5}, {130, 5}, {135, 0}};
   lv_line_set_points(line_day_of_year, line_day_of_year_points, 3);
   lv_obj_add_style(line_day_of_year, LV_LINE_PART_MAIN, &style_line);
-  lv_obj_align(line_day_of_year, NULL, LV_ALIGN_IN_TOP_RIGHT, 0, 55);
+  lv_obj_align(line_day_of_year, NULL, LV_ALIGN_IN_TOP_RIGHT, 0, 60);
 
   label_date = lv_label_create(lv_scr_act(), nullptr);
-  lv_obj_align(label_date, lv_scr_act(), LV_ALIGN_IN_TOP_LEFT, 100, 65);
+  lv_obj_align(label_date, lv_scr_act(), LV_ALIGN_IN_TOP_LEFT, 100, 70);
   lv_obj_set_style_local_text_color(label_date, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x98B69A));
   lv_obj_set_style_local_text_font(label_date, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &lv_font_7segment_40);
   lv_label_set_text_static(label_date, "6-30");
@@ -107,18 +118,18 @@ WatchFaceCasioStyleG7710::WatchFaceCasioStyleG7710(DisplayApp* app,
   static lv_point_t line_date_points[] = {{0, 5}, {135, 5}, {140, 0}};
   lv_line_set_points(line_date, line_date_points, 3);
   lv_obj_add_style(line_date, LV_LINE_PART_MAIN, &style_line);
-  lv_obj_align(line_date, NULL, LV_ALIGN_IN_TOP_RIGHT, 0, 95);
+  lv_obj_align(line_date, NULL, LV_ALIGN_IN_TOP_RIGHT, 0, 100);
 
   label_time = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_color(label_time, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x98B69A));
   lv_obj_set_style_local_text_font(label_time, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &lv_font_7segment_115);
-  lv_obj_align(label_time, lv_scr_act(), LV_ALIGN_CENTER, 0, 0);
+  lv_obj_align(label_time, lv_scr_act(), LV_ALIGN_CENTER, 0, 40);
 
   line_time = lv_line_create(lv_scr_act(), nullptr);
   static lv_point_t line_time_points[] = {{0, 0}, {230, 0}, {235, 5}};
   lv_line_set_points(line_time, line_time_points, 3);
   lv_obj_add_style(line_time, LV_LINE_PART_MAIN, &style_line);
-  lv_obj_align(line_time, NULL, LV_ALIGN_IN_BOTTOM_RIGHT, 0, -35);
+  lv_obj_align(line_time, NULL, LV_ALIGN_IN_BOTTOM_RIGHT, 0, -25);
 
   label_time_ampm = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_color(label_time_ampm, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x98B69A));
@@ -170,7 +181,8 @@ void WatchFaceCasioStyleG7710::Refresh() {
   batteryPercentRemaining = batteryController.PercentRemaining();
   if (batteryPercentRemaining.IsUpdated()) {
     auto batteryPercent = batteryPercentRemaining.Get();
-    lv_label_set_text_static(batteryIcon, BatteryIcon::GetBatteryIcon(batteryPercent));
+    batteryIcon.SetBatteryPercentage(batteryPercent);
+    lv_label_set_text_fmt(label_battery_vallue, "%d%%", batteryPercent);
   }
 
   bleState = bleController.IsConnected();
@@ -178,8 +190,11 @@ void WatchFaceCasioStyleG7710::Refresh() {
   if (bleState.IsUpdated() || bleRadioEnabled.IsUpdated()) {
     lv_label_set_text_static(bleIcon, BleIcon::GetIcon(bleState.Get()));
   }
+  lv_obj_realign(label_battery_vallue);
+  lv_obj_realign(batteryIcon.GetObject());
   lv_obj_realign(batteryPlug);
   lv_obj_realign(bleIcon);
+  lv_obj_realign(notificationIcon);
 
   notificationState = notificatioManager.AreNewNotificationsAvailable();
   if (notificationState.IsUpdated()) {
@@ -220,10 +235,10 @@ void WatchFaceCasioStyleG7710::Refresh() {
         }
         lv_label_set_text(label_time_ampm, ampmChar);
         lv_label_set_text_fmt(label_time, "%2d:%02d", hour, minute);
-        lv_obj_align(label_time, lv_scr_act(), LV_ALIGN_CENTER, 0, 30);
+        lv_obj_align(label_time, lv_scr_act(), LV_ALIGN_CENTER, 0, 40);
       } else {
         lv_label_set_text_fmt(label_time, "%02d:%02d", hour, minute);
-        lv_obj_align(label_time, lv_scr_act(), LV_ALIGN_CENTER, 0, 30);
+        lv_obj_align(label_time, lv_scr_act(), LV_ALIGN_CENTER, 0, 40);
       }
     }
 
diff --git a/src/displayapp/screens/WatchFaceCasioStyleG7710.h b/src/displayapp/screens/WatchFaceCasioStyleG7710.h
index 0cf7bbbf..d77393e0 100644
--- a/src/displayapp/screens/WatchFaceCasioStyleG7710.h
+++ b/src/displayapp/screens/WatchFaceCasioStyleG7710.h
@@ -69,12 +69,15 @@ namespace Pinetime {
         lv_obj_t* backgroundLabel;
         lv_obj_t* bleIcon;
         lv_obj_t* batteryPlug;
+        lv_obj_t* label_battery_vallue;
         lv_obj_t* heartbeatIcon;
         lv_obj_t* heartbeatValue;
         lv_obj_t* stepIcon;
         lv_obj_t* stepValue;
         lv_obj_t* notificationIcon;
-        lv_obj_t* batteryIcon;
+        lv_obj_t* line_icons;
+
+        BatteryIcon batteryIcon;
 
         Controllers::DateTime& dateTimeController;
         Controllers::Battery& batteryController;
diff --git a/src/displayapp/screens/settings/SettingWatchFace.cpp b/src/displayapp/screens/settings/SettingWatchFace.cpp
index 3cb2a364..3c88b936 100644
--- a/src/displayapp/screens/settings/SettingWatchFace.cpp
+++ b/src/displayapp/screens/settings/SettingWatchFace.cpp
@@ -1,59 +1,31 @@
 #include "displayapp/screens/settings/SettingWatchFace.h"
 #include <lvgl/lvgl.h>
 #include "displayapp/DisplayApp.h"
+#include "displayapp/screens/CheckboxList.h"
 #include "displayapp/screens/Screen.h"
 #include "displayapp/screens/Styles.h"
 #include "displayapp/screens/Symbols.h"
+#include "components/settings/Settings.h"
 
 using namespace Pinetime::Applications::Screens;
 
-namespace {
-  void event_handler(lv_obj_t* obj, lv_event_t event) {
-    auto* screen = static_cast<SettingWatchFace*>(obj->user_data);
-    screen->UpdateSelected(obj, event);
-  }
-}
-
-constexpr std::array<const char*, 4> SettingWatchFace::options;
+constexpr const char* SettingWatchFace::title;
+constexpr const char* SettingWatchFace::symbol;
 
 SettingWatchFace::SettingWatchFace(Pinetime::Applications::DisplayApp* app, Pinetime::Controllers::Settings& settingsController)
-  : Screen(app), settingsController {settingsController} {
-
-  lv_obj_t* container1 = lv_cont_create(lv_scr_act(), nullptr);
-
-  // lv_obj_set_style_local_bg_color(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x111111));
-  lv_obj_set_style_local_bg_opa(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_TRANSP);
-  lv_obj_set_style_local_pad_all(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 10);
-  lv_obj_set_style_local_pad_inner(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 5);
-  lv_obj_set_style_local_border_width(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, 0);
-
-  lv_obj_set_pos(container1, 10, 60);
-  lv_obj_set_width(container1, LV_HOR_RES - 20);
-  lv_obj_set_height(container1, LV_VER_RES - 50);
-  lv_cont_set_layout(container1, LV_LAYOUT_COLUMN_LEFT);
-
-  lv_obj_t* title = lv_label_create(lv_scr_act(), nullptr);
-  lv_label_set_text_static(title, "Watch face");
-  lv_label_set_align(title, LV_LABEL_ALIGN_CENTER);
-  lv_obj_align(title, lv_scr_act(), LV_ALIGN_IN_TOP_MID, 10, 15);
-
-  lv_obj_t* icon = lv_label_create(lv_scr_act(), nullptr);
-  lv_obj_set_style_local_text_color(icon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_ORANGE);
-  lv_label_set_text_static(icon, Symbols::home);
-  lv_label_set_align(icon, LV_LABEL_ALIGN_CENTER);
-  lv_obj_align(icon, title, LV_ALIGN_OUT_LEFT_MID, -10, 0);
-
-  for (unsigned int i = 0; i < options.size(); i++) {
-    cbOption[i] = lv_checkbox_create(container1, nullptr);
-    lv_checkbox_set_text(cbOption[i], options[i]);
-    cbOption[i]->user_data = this;
-    lv_obj_set_event_cb(cbOption[i], event_handler);
-    SetRadioButtonStyle(cbOption[i]);
-
-    if (settingsController.GetClockFace() == i) {
-      lv_checkbox_set_checked(cbOption[i], true);
-    }
-  }
+  : Screen(app),
+    settingsController {settingsController},
+    screens {app,
+             settingsController.GetWatchfacesMenu(),
+             {
+               [this]() -> std::unique_ptr<Screen> {
+                 return CreateScreen1();
+               },
+               [this]() -> std::unique_ptr<Screen> {
+                 return CreateScreen2();
+               }
+             },
+             Screens::ScreenListModes::UpDown} {
 }
 
 SettingWatchFace::~SettingWatchFace() {
@@ -61,15 +33,22 @@ SettingWatchFace::~SettingWatchFace() {
   settingsController.SaveSettings();
 }
 
-void SettingWatchFace::UpdateSelected(lv_obj_t* object, lv_event_t event) {
-  if (event == LV_EVENT_VALUE_CHANGED) {
-    for (unsigned int i = 0; i < options.size(); i++) {
-      if (object == cbOption[i]) {
-        lv_checkbox_set_checked(cbOption[i], true);
-        settingsController.SetClockFace(i);
-      } else {
-        lv_checkbox_set_checked(cbOption[i], false);
-      }
-    }
-  }
+bool SettingWatchFace::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
+  return screens.OnTouchEvent(event);
+}
+
+std::unique_ptr<Screen> SettingWatchFace::CreateScreen1() {
+  std::array<const char*, 4> watchfaces {" Digital face", " Analog face", " PineTimeStyle", " Terminal"};
+  return std::make_unique<Screens::CheckboxList>(0, 2, app, settingsController, title,
+                                                 symbol, &Controllers::Settings::SetClockFace,
+                                                 &Controllers::Settings::GetClockFace,
+                                                 watchfaces);
+}
+
+std::unique_ptr<Screen> SettingWatchFace::CreateScreen2() {
+  std::array<const char*, 4> watchfaces {" Casio G7710", "", "", ""};
+  return std::make_unique<Screens::CheckboxList>(1, 2, app, settingsController, title,
+                                                 symbol, &Controllers::Settings::SetClockFace,
+                                                 &Controllers::Settings::GetClockFace,
+                                                 watchfaces);
 }
diff --git a/src/displayapp/screens/settings/SettingWatchFace.h b/src/displayapp/screens/settings/SettingWatchFace.h
index 801dcd73..7d14554e 100644
--- a/src/displayapp/screens/settings/SettingWatchFace.h
+++ b/src/displayapp/screens/settings/SettingWatchFace.h
@@ -32,4 +32,4 @@ namespace Pinetime {
       };
     }
   }
-}
\ No newline at end of file
+}

From e7c0b2c5c250f9dc43175bb8d73b2961bfae6b93 Mon Sep 17 00:00:00 2001
From: ITCactus <n/a>
Date: Fri, 20 May 2022 14:24:22 +0200
Subject: [PATCH 03/10] fix memory leak + refactoring

---
 .../screens/WatchFaceCasioStyleG7710.cpp      | 49 +++++++++----------
 .../screens/WatchFaceCasioStyleG7710.h        | 11 +++++
 2 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/src/displayapp/screens/WatchFaceCasioStyleG7710.cpp b/src/displayapp/screens/WatchFaceCasioStyleG7710.cpp
index eb4cb63e..7feaaa6a 100644
--- a/src/displayapp/screens/WatchFaceCasioStyleG7710.cpp
+++ b/src/displayapp/screens/WatchFaceCasioStyleG7710.cpp
@@ -36,103 +36,94 @@ WatchFaceCasioStyleG7710::WatchFaceCasioStyleG7710(DisplayApp* app,
 
   label_battery_vallue = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_align(label_battery_vallue, lv_scr_act(), LV_ALIGN_IN_TOP_RIGHT, 0, 0);
-  lv_obj_set_style_local_text_color(label_battery_vallue, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x98B69A));
+  lv_obj_set_style_local_text_color(label_battery_vallue, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, color_text);
   lv_label_set_text_static(label_battery_vallue, "00%");
 
-
   batteryIcon.Create(lv_scr_act());
-  batteryIcon.SetColor(lv_color_hex(0x98B69A));
+  batteryIcon.SetColor(color_text);
   lv_obj_align(batteryIcon.GetObject(), label_battery_vallue, LV_ALIGN_OUT_LEFT_MID, -5, 0);
 
   batteryPlug = lv_label_create(lv_scr_act(), nullptr);
-  lv_obj_set_style_local_text_color(batteryPlug, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x98B69A));
+  lv_obj_set_style_local_text_color(batteryPlug, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, color_text);
   lv_label_set_text_static(batteryPlug, Symbols::plug);
   lv_obj_align(batteryPlug, batteryIcon.GetObject(), LV_ALIGN_OUT_LEFT_MID, -5, 0);
 
   bleIcon = lv_label_create(lv_scr_act(), nullptr);
-  lv_obj_set_style_local_text_color(bleIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x98B69A));
+  lv_obj_set_style_local_text_color(bleIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, color_text);
   lv_label_set_text_static(bleIcon, Symbols::bluetooth);
   lv_obj_align(bleIcon, batteryPlug, LV_ALIGN_OUT_LEFT_MID, -5, 0);
 
   notificationIcon = lv_label_create(lv_scr_act(), nullptr);
-  lv_obj_set_style_local_text_color(notificationIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x98B69A));
+  lv_obj_set_style_local_text_color(notificationIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, color_text);
   lv_label_set_text_static(notificationIcon, NotificationIcon::GetIcon(false));
   lv_obj_align(notificationIcon, bleIcon, LV_ALIGN_OUT_LEFT_MID, -5, 0);
 
-
   label_day_of_week = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_align(label_day_of_week, lv_scr_act(), LV_ALIGN_IN_TOP_LEFT, 10, 64);
-  lv_obj_set_style_local_text_color(label_day_of_week, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x98B69A));
+  lv_obj_set_style_local_text_color(label_day_of_week, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, color_text);
   lv_obj_set_style_local_text_font(label_day_of_week, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &lv_font_dots_40);
   lv_label_set_text_static(label_day_of_week, "SUN");
 
   label_week_number = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_align(label_week_number, lv_scr_act(), LV_ALIGN_IN_TOP_LEFT, 5, 22);
-  lv_obj_set_style_local_text_color(label_week_number, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x98B69A));
+  lv_obj_set_style_local_text_color(label_week_number, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, color_text);
   lv_obj_set_style_local_text_font(label_week_number, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &lv_font_dots_40);
   lv_label_set_text_static(label_week_number, "WK26");
 
   label_day_of_year = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_align(label_day_of_year, lv_scr_act(), LV_ALIGN_IN_TOP_LEFT, 100, 30);
-  lv_obj_set_style_local_text_color(label_day_of_year, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x98B69A));
+  lv_obj_set_style_local_text_color(label_day_of_year, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, color_text);
   lv_obj_set_style_local_text_font(label_day_of_year, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &lv_font_7segment_40);
   lv_label_set_text_static(label_day_of_year, "181-184");
 
-  static lv_style_t style_line;
   lv_style_init(&style_line);
   lv_style_set_line_width(&style_line, LV_STATE_DEFAULT, 2);
-  lv_style_set_line_color(&style_line, LV_STATE_DEFAULT, lv_color_hex(0x98B69A));
+  lv_style_set_line_color(&style_line, LV_STATE_DEFAULT, color_text);
   lv_style_set_line_rounded(&style_line, LV_STATE_DEFAULT, true);
 
-  static lv_style_t style_border;
   lv_style_init(&style_border);
   lv_style_set_line_width(&style_border, LV_STATE_DEFAULT, 6);
-  lv_style_set_line_color(&style_border, LV_STATE_DEFAULT, lv_color_hex(0x98B69A));
+  lv_style_set_line_color(&style_border, LV_STATE_DEFAULT, color_text);
   lv_style_set_line_rounded(&style_border, LV_STATE_DEFAULT, true);
 
   line_icons = lv_line_create(lv_scr_act(), nullptr);
-  static lv_point_t line_icons_points[] = {{0, 5}, {117, 5}, {122, 0}};
   lv_line_set_points(line_icons, line_icons_points, 3);
   lv_obj_add_style(line_icons, LV_LINE_PART_MAIN, &style_line);
   lv_obj_align(line_icons, NULL, LV_ALIGN_IN_TOP_RIGHT, -10, 18);
 
   line_day_of_week_number = lv_line_create(lv_scr_act(), nullptr);
-  static lv_point_t line_day_of_week_number_points[] = {{0, 0}, {100, 0}, {95, 95}, {0, 95}};
   lv_line_set_points(line_day_of_week_number, line_day_of_week_number_points, 4);
   lv_obj_add_style(line_day_of_week_number, LV_LINE_PART_MAIN, &style_border);
   lv_obj_align(line_day_of_week_number, NULL, LV_ALIGN_IN_TOP_LEFT, 0, 8);
 
   line_day_of_year = lv_line_create(lv_scr_act(), nullptr);
-  static lv_point_t line_day_of_year_points[] = {{0, 5}, {130, 5}, {135, 0}};
   lv_line_set_points(line_day_of_year, line_day_of_year_points, 3);
   lv_obj_add_style(line_day_of_year, LV_LINE_PART_MAIN, &style_line);
   lv_obj_align(line_day_of_year, NULL, LV_ALIGN_IN_TOP_RIGHT, 0, 60);
 
   label_date = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_align(label_date, lv_scr_act(), LV_ALIGN_IN_TOP_LEFT, 100, 70);
-  lv_obj_set_style_local_text_color(label_date, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x98B69A));
+  lv_obj_set_style_local_text_color(label_date, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, color_text);
   lv_obj_set_style_local_text_font(label_date, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &lv_font_7segment_40);
   lv_label_set_text_static(label_date, "6-30");
 
   line_date = lv_line_create(lv_scr_act(), nullptr);
-  static lv_point_t line_date_points[] = {{0, 5}, {135, 5}, {140, 0}};
   lv_line_set_points(line_date, line_date_points, 3);
   lv_obj_add_style(line_date, LV_LINE_PART_MAIN, &style_line);
   lv_obj_align(line_date, NULL, LV_ALIGN_IN_TOP_RIGHT, 0, 100);
 
   label_time = lv_label_create(lv_scr_act(), nullptr);
-  lv_obj_set_style_local_text_color(label_time, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x98B69A));
+  lv_obj_set_style_local_text_color(label_time, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, color_text);
   lv_obj_set_style_local_text_font(label_time, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &lv_font_7segment_115);
   lv_obj_align(label_time, lv_scr_act(), LV_ALIGN_CENTER, 0, 40);
 
   line_time = lv_line_create(lv_scr_act(), nullptr);
-  static lv_point_t line_time_points[] = {{0, 0}, {230, 0}, {235, 5}};
   lv_line_set_points(line_time, line_time_points, 3);
   lv_obj_add_style(line_time, LV_LINE_PART_MAIN, &style_line);
   lv_obj_align(line_time, NULL, LV_ALIGN_IN_BOTTOM_RIGHT, 0, -25);
 
   label_time_ampm = lv_label_create(lv_scr_act(), nullptr);
-  lv_obj_set_style_local_text_color(label_time_ampm, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x98B69A));
+  lv_obj_set_style_local_text_color(label_time_ampm, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, color_text);
   lv_label_set_text_static(label_time_ampm, "");
   lv_obj_align(label_time_ampm, lv_scr_act(), LV_ALIGN_IN_LEFT_MID, 5, -5);
 
@@ -145,21 +136,21 @@ WatchFaceCasioStyleG7710::WatchFaceCasioStyleG7710(DisplayApp* app,
 
   heartbeatIcon = lv_label_create(lv_scr_act(), nullptr);
   lv_label_set_text_static(heartbeatIcon, Symbols::heartBeat);
-  lv_obj_set_style_local_text_color(heartbeatIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x98B69A));
+  lv_obj_set_style_local_text_color(heartbeatIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, color_text);
   lv_obj_align(heartbeatIcon, lv_scr_act(), LV_ALIGN_IN_BOTTOM_LEFT, 5, -2);
 
   heartbeatValue = lv_label_create(lv_scr_act(), nullptr);
-  lv_obj_set_style_local_text_color(heartbeatValue, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x98B69A));
+  lv_obj_set_style_local_text_color(heartbeatValue, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, color_text);
   lv_label_set_text_static(heartbeatValue, "");
   lv_obj_align(heartbeatValue, heartbeatIcon, LV_ALIGN_OUT_RIGHT_MID, 5, 0);
 
   stepValue = lv_label_create(lv_scr_act(), nullptr);
-  lv_obj_set_style_local_text_color(stepValue, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x98B69A));
+  lv_obj_set_style_local_text_color(stepValue, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, color_text);
   lv_label_set_text_static(stepValue, "0");
   lv_obj_align(stepValue, lv_scr_act(), LV_ALIGN_IN_BOTTOM_RIGHT, -5, -2);
 
   stepIcon = lv_label_create(lv_scr_act(), nullptr);
-  lv_obj_set_style_local_text_color(stepIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x98B69A));
+  lv_obj_set_style_local_text_color(stepIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, color_text);
   lv_label_set_text_static(stepIcon, Symbols::shoe);
   lv_obj_align(stepIcon, stepValue, LV_ALIGN_OUT_LEFT_MID, -5, 0);
 
@@ -169,6 +160,10 @@ WatchFaceCasioStyleG7710::WatchFaceCasioStyleG7710(DisplayApp* app,
 
 WatchFaceCasioStyleG7710::~WatchFaceCasioStyleG7710() {
   lv_task_del(taskRefresh);
+
+  lv_style_reset(&style_line);
+  lv_style_reset(&style_border);
+  
   lv_obj_clean(lv_scr_act());
 }
 
@@ -291,7 +286,7 @@ void WatchFaceCasioStyleG7710::Refresh() {
   heartbeatRunning = heartRateController.State() != Controllers::HeartRateController::States::Stopped;
   if (heartbeat.IsUpdated() || heartbeatRunning.IsUpdated()) {
     if (heartbeatRunning.Get()) {
-      lv_obj_set_style_local_text_color(heartbeatIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x98B69A));
+      lv_obj_set_style_local_text_color(heartbeatIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, color_text);
       lv_label_set_text_fmt(heartbeatValue, "%d", heartbeat.Get());
     } else {
       lv_obj_set_style_local_text_color(heartbeatIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x1B1B1B));
diff --git a/src/displayapp/screens/WatchFaceCasioStyleG7710.h b/src/displayapp/screens/WatchFaceCasioStyleG7710.h
index d77393e0..a8382ff2 100644
--- a/src/displayapp/screens/WatchFaceCasioStyleG7710.h
+++ b/src/displayapp/screens/WatchFaceCasioStyleG7710.h
@@ -56,6 +56,17 @@ namespace Pinetime {
         DirtyValue<bool> heartbeatRunning {};
         DirtyValue<bool> notificationState {};
 
+        lv_point_t line_icons_points[3] {{0, 5}, {117, 5}, {122, 0}};
+        lv_point_t line_day_of_week_number_points[4] {{0, 0}, {100, 0}, {95, 95}, {0, 95}};
+        lv_point_t line_day_of_year_points[3] {{0, 5}, {130, 5}, {135, 0}};
+        lv_point_t line_date_points[3] {{0, 5}, {135, 5}, {140, 0}};
+        lv_point_t line_time_points[3] {{0, 0}, {230, 0}, {235, 5}};
+
+        lv_color_t color_text =  lv_color_hex(0x98B69A);
+
+        lv_style_t style_line;
+        lv_style_t style_border;
+
         lv_obj_t* label_time;
         lv_obj_t* line_time;
         lv_obj_t* label_time_ampm;

From cfaafc1fe2e31926343c571bc22a9afa54287f47 Mon Sep 17 00:00:00 2001
From: ITCactus <n/a>
Date: Wed, 25 May 2022 13:44:25 +0200
Subject: [PATCH 04/10] fix for week number and days till the end of the year +
 formating (clang)

---
 src/displayapp/screens/CheckboxList.cpp       | 13 +++---
 .../screens/WatchFaceCasioStyleG7710.cpp      | 45 +++++++++----------
 .../screens/WatchFaceCasioStyleG7710.h        | 16 +++----
 .../screens/settings/SettingWatchFace.cpp     | 26 +++++------
 4 files changed, 48 insertions(+), 52 deletions(-)

diff --git a/src/displayapp/screens/CheckboxList.cpp b/src/displayapp/screens/CheckboxList.cpp
index 4da7826c..ee64167d 100644
--- a/src/displayapp/screens/CheckboxList.cpp
+++ b/src/displayapp/screens/CheckboxList.cpp
@@ -20,10 +20,13 @@ CheckboxList::CheckboxList(const uint8_t screenID,
                            const char* optionsTitle,
                            const char* optionsSymbol,
                            void (Controllers::Settings::*SetOptionIndex)(uint8_t),
-                           uint8_t (Controllers::Settings::*GetOptionIndex )() const,
+                           uint8_t (Controllers::Settings::*GetOptionIndex)() const,
                            std::array<const char*, MAXLISTITEMS> options)
-  : Screen(app), screenID {screenID}, settingsController {settingsController},
-    SetOptionIndex {SetOptionIndex}, GetOptionIndex {GetOptionIndex},
+  : Screen(app),
+    screenID {screenID},
+    settingsController {settingsController},
+    SetOptionIndex {SetOptionIndex},
+    GetOptionIndex {GetOptionIndex},
     options {options} {
 
   settingsController.SetWatchfacesMenu(screenID);
@@ -87,7 +90,7 @@ CheckboxList::CheckboxList(const uint8_t screenID,
       lv_obj_set_event_cb(cbOption[i], event_handler);
       SetRadioButtonStyle(cbOption[i]);
 
-      if (static_cast<unsigned int>((settingsController.*GetOptionIndex)() - MAXLISTITEMS*screenID) == i) {
+      if (static_cast<unsigned int>((settingsController.*GetOptionIndex)() - MAXLISTITEMS * screenID) == i) {
         lv_checkbox_set_checked(cbOption[i], true);
       }
     }
@@ -105,7 +108,7 @@ void CheckboxList::UpdateSelected(lv_obj_t* object, lv_event_t event) {
       if (strcmp(options[i], "")) {
         if (object == cbOption[i]) {
           lv_checkbox_set_checked(cbOption[i], true);
-          (settingsController.*SetOptionIndex)(MAXLISTITEMS*screenID + i);
+          (settingsController.*SetOptionIndex)(MAXLISTITEMS * screenID + i);
         } else {
           lv_checkbox_set_checked(cbOption[i], false);
         }
diff --git a/src/displayapp/screens/WatchFaceCasioStyleG7710.cpp b/src/displayapp/screens/WatchFaceCasioStyleG7710.cpp
index 7feaaa6a..f0e6e88e 100644
--- a/src/displayapp/screens/WatchFaceCasioStyleG7710.cpp
+++ b/src/displayapp/screens/WatchFaceCasioStyleG7710.cpp
@@ -16,13 +16,13 @@
 using namespace Pinetime::Applications::Screens;
 
 WatchFaceCasioStyleG7710::WatchFaceCasioStyleG7710(DisplayApp* app,
-                                   Controllers::DateTime& dateTimeController,
-                                   Controllers::Battery& batteryController,
-                                   Controllers::Ble& bleController,
-                                   Controllers::NotificationManager& notificatioManager,
-                                   Controllers::Settings& settingsController,
-                                   Controllers::HeartRateController& heartRateController,
-                                   Controllers::MotionController& motionController)
+                                                   Controllers::DateTime& dateTimeController,
+                                                   Controllers::Battery& batteryController,
+                                                   Controllers::Ble& bleController,
+                                                   Controllers::NotificationManager& notificatioManager,
+                                                   Controllers::Settings& settingsController,
+                                                   Controllers::HeartRateController& heartRateController,
+                                                   Controllers::MotionController& motionController)
   : Screen(app),
     currentDateTime {{}},
     dateTimeController {dateTimeController},
@@ -33,7 +33,6 @@ WatchFaceCasioStyleG7710::WatchFaceCasioStyleG7710(DisplayApp* app,
     heartRateController {heartRateController},
     motionController {motionController} {
 
-
   label_battery_vallue = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_align(label_battery_vallue, lv_scr_act(), LV_ALIGN_IN_TOP_RIGHT, 0, 0);
   lv_obj_set_style_local_text_color(label_battery_vallue, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, color_text);
@@ -163,7 +162,7 @@ WatchFaceCasioStyleG7710::~WatchFaceCasioStyleG7710() {
 
   lv_style_reset(&style_line);
   lv_style_reset(&style_border);
-  
+
   lv_obj_clean(lv_scr_act());
 }
 
@@ -240,30 +239,30 @@ void WatchFaceCasioStyleG7710::Refresh() {
     if ((year != currentYear) || (month != currentMonth) || (dayOfWeek != currentDayOfWeek) || (day != currentDay)) {
       if (settingsController.GetClockType() == Controllers::Settings::ClockType::H24) {
         // 24h mode: ddmmyyyy, first DOW=Monday;
-        lv_label_set_text_fmt(
-          label_date, "%3d-%2d", day, month);
-          weekNumberFormat = "%V"; // Replaced by the week number of the year (Monday as the first day of the week) as a decimal number [01,53]. If the week containing 1 January has four or more days in the new year, then it is considered week 1. Otherwise, it is the last week of the previous year, and the next week is week 1. Both January 4th and the first Thursday of January are always in week 1. [ tm_year, tm_wday, tm_yday]
+        lv_label_set_text_fmt(label_date, "%3d-%2d", day, month);
+        weekNumberFormat = "%V"; // Replaced by the week number of the year (Monday as the first day of the week) as a decimal number
+                                 // [01,53]. If the week containing 1 January has four or more days in the new year, then it is considered
+                                 // week 1. Otherwise, it is the last week of the previous year, and the next week is week 1. Both January
+                                 // 4th and the first Thursday of January are always in week 1. [ tm_year, tm_wday, tm_yday]
       } else {
         // 12h mode: mmddyyyy, first DOW=Sunday;
-        lv_label_set_text_fmt(
-          label_date, "%3d-%2d", month, day);
-          weekNumberFormat = "%U"; // Replaced by the week number of the year as a decimal number [00,53]. The first Sunday of January is the first day of week 1; days in the new year before this are in week 0. [ tm_year, tm_wday, tm_yday]
+        lv_label_set_text_fmt(label_date, "%3d-%2d", month, day);
+        weekNumberFormat = "%U"; // Replaced by the week number of the year as a decimal number [00,53]. The first Sunday of January is the
+                                 // first day of week 1; days in the new year before this are in week 0. [ tm_year, tm_wday, tm_yday]
       }
 
       uint8_t weekNumber;
       uint16_t dayOfYearNumber, daysTillEndOfYearNumber;
 
-      std::tm date = {};
-      date.tm_year = year - 1900;
-      date.tm_mon = static_cast<unsigned>(yearMonthDay.month()) - 1;
-      date.tm_mday = day + 1;
-      std::mktime( &date );
+      time_t ttTime =
+        std::chrono::system_clock::to_time_t(std::chrono::time_point_cast<std::chrono::system_clock::duration>(currentDateTime.Get()));
+      tm* tmTime = std::localtime(&ttTime);
 
-      dayOfYearNumber = date.tm_yday;
-      daysTillEndOfYearNumber = yearMonthDay.year().is_leap() ? 366 : 365 - dayOfYearNumber;
+      dayOfYearNumber = tmTime->tm_yday + 1; //  tm_yday  day of year [0,365] => yday+1
+      daysTillEndOfYearNumber = (yearMonthDay.year().is_leap() ? 366 : 365) - dayOfYearNumber;
 
       char buffer[8];
-      strftime(buffer, 8, weekNumberFormat, &date); 
+      strftime(buffer, 8, weekNumberFormat, tmTime);
       weekNumber = atoi(buffer);
 
       lv_label_set_text_fmt(label_day_of_week, "%s", dateTimeController.DayOfWeekShortToString());
diff --git a/src/displayapp/screens/WatchFaceCasioStyleG7710.h b/src/displayapp/screens/WatchFaceCasioStyleG7710.h
index a8382ff2..9cc909a6 100644
--- a/src/displayapp/screens/WatchFaceCasioStyleG7710.h
+++ b/src/displayapp/screens/WatchFaceCasioStyleG7710.h
@@ -25,13 +25,13 @@ namespace Pinetime {
       class WatchFaceCasioStyleG7710 : public Screen {
       public:
         WatchFaceCasioStyleG7710(DisplayApp* app,
-                         Controllers::DateTime& dateTimeController,
-                         Controllers::Battery& batteryController,
-                         Controllers::Ble& bleController,
-                         Controllers::NotificationManager& notificatioManager,
-                         Controllers::Settings& settingsController,
-                         Controllers::HeartRateController& heartRateController,
-                         Controllers::MotionController& motionController);
+                                 Controllers::DateTime& dateTimeController,
+                                 Controllers::Battery& batteryController,
+                                 Controllers::Ble& bleController,
+                                 Controllers::NotificationManager& notificatioManager,
+                                 Controllers::Settings& settingsController,
+                                 Controllers::HeartRateController& heartRateController,
+                                 Controllers::MotionController& motionController);
         ~WatchFaceCasioStyleG7710() override;
 
         void Refresh() override;
@@ -62,7 +62,7 @@ namespace Pinetime {
         lv_point_t line_date_points[3] {{0, 5}, {135, 5}, {140, 0}};
         lv_point_t line_time_points[3] {{0, 0}, {230, 0}, {235, 5}};
 
-        lv_color_t color_text =  lv_color_hex(0x98B69A);
+        lv_color_t color_text = lv_color_hex(0x98B69A);
 
         lv_style_t style_line;
         lv_style_t style_border;
diff --git a/src/displayapp/screens/settings/SettingWatchFace.cpp b/src/displayapp/screens/settings/SettingWatchFace.cpp
index 3c88b936..52ea5d9e 100644
--- a/src/displayapp/screens/settings/SettingWatchFace.cpp
+++ b/src/displayapp/screens/settings/SettingWatchFace.cpp
@@ -17,14 +17,12 @@ SettingWatchFace::SettingWatchFace(Pinetime::Applications::DisplayApp* app, Pine
     settingsController {settingsController},
     screens {app,
              settingsController.GetWatchfacesMenu(),
-             {
-               [this]() -> std::unique_ptr<Screen> {
-                 return CreateScreen1();
-               },
-               [this]() -> std::unique_ptr<Screen> {
-                 return CreateScreen2();
-               }
-             },
+             {[this]() -> std::unique_ptr<Screen> {
+                return CreateScreen1();
+              },
+              [this]() -> std::unique_ptr<Screen> {
+                return CreateScreen2();
+              }},
              Screens::ScreenListModes::UpDown} {
 }
 
@@ -39,16 +37,12 @@ bool SettingWatchFace::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
 
 std::unique_ptr<Screen> SettingWatchFace::CreateScreen1() {
   std::array<const char*, 4> watchfaces {" Digital face", " Analog face", " PineTimeStyle", " Terminal"};
-  return std::make_unique<Screens::CheckboxList>(0, 2, app, settingsController, title,
-                                                 symbol, &Controllers::Settings::SetClockFace,
-                                                 &Controllers::Settings::GetClockFace,
-                                                 watchfaces);
+  return std::make_unique<Screens::CheckboxList>(
+    0, 2, app, settingsController, title, symbol, &Controllers::Settings::SetClockFace, &Controllers::Settings::GetClockFace, watchfaces);
 }
 
 std::unique_ptr<Screen> SettingWatchFace::CreateScreen2() {
   std::array<const char*, 4> watchfaces {" Casio G7710", "", "", ""};
-  return std::make_unique<Screens::CheckboxList>(1, 2, app, settingsController, title,
-                                                 symbol, &Controllers::Settings::SetClockFace,
-                                                 &Controllers::Settings::GetClockFace,
-                                                 watchfaces);
+  return std::make_unique<Screens::CheckboxList>(
+    1, 2, app, settingsController, title, symbol, &Controllers::Settings::SetClockFace, &Controllers::Settings::GetClockFace, watchfaces);
 }

From b4f4e2f3fed1ce241daaadbcc4b7eb3d4735f14d Mon Sep 17 00:00:00 2001
From: Autoformatter <->
Date: Thu, 2 Jun 2022 06:42:50 +0000
Subject: [PATCH 05/10] Apply clang-format to Clock.cpp

---
 src/displayapp/screens/Clock.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/displayapp/screens/Clock.cpp b/src/displayapp/screens/Clock.cpp
index 4e76af18..cd4288a1 100644
--- a/src/displayapp/screens/Clock.cpp
+++ b/src/displayapp/screens/Clock.cpp
@@ -110,11 +110,11 @@ std::unique_ptr<Screen> Clock::WatchFaceTerminalScreen() {
 
 std::unique_ptr<Screen> Clock::WatchFaceCasioStyleG7710() {
   return std::make_unique<Screens::WatchFaceCasioStyleG7710>(app,
-                                                              dateTimeController,
-                                                              batteryController,
-                                                              bleController,
-                                                              notificatioManager,
-                                                              settingsController,
-                                                              heartRateController,
-                                                              motionController);
+                                                             dateTimeController,
+                                                             batteryController,
+                                                             bleController,
+                                                             notificatioManager,
+                                                             settingsController,
+                                                             heartRateController,
+                                                             motionController);
 }

From 0300a8fa80bf99eea45850d1e09bd572dbd8da52 Mon Sep 17 00:00:00 2001
From: Autoformatter <->
Date: Thu, 2 Jun 2022 06:42:50 +0000
Subject: [PATCH 06/10] Apply clang-format to Settings.h

---
 src/components/settings/Settings.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/settings/Settings.h b/src/components/settings/Settings.h
index becd57bc..f0b86690 100644
--- a/src/components/settings/Settings.h
+++ b/src/components/settings/Settings.h
@@ -106,7 +106,6 @@ namespace Pinetime {
         return watchFacesMenu;
       };
 
-
       uint8_t GetAppMenu() const {
         return appMenu;
       };

From 50b98798b9df370f685e95079f63f7d4e2dbbcde Mon Sep 17 00:00:00 2001
From: ITCactus <n/a>
Date: Thu, 30 Jun 2022 16:19:51 +0200
Subject: [PATCH 07/10] cleanup after migration to the font-generator

---
 src/displayapp/fonts/lv_font_7segment_115.c | 735 --------------------
 src/displayapp/fonts/lv_font_7segment_40.c  | 228 ------
 src/displayapp/fonts/lv_font_dots_40.c      | 410 -----------
 3 files changed, 1373 deletions(-)
 delete mode 100644 src/displayapp/fonts/lv_font_7segment_115.c
 delete mode 100644 src/displayapp/fonts/lv_font_7segment_40.c
 delete mode 100644 src/displayapp/fonts/lv_font_dots_40.c

diff --git a/src/displayapp/fonts/lv_font_7segment_115.c b/src/displayapp/fonts/lv_font_7segment_115.c
deleted file mode 100644
index 1d509403..00000000
--- a/src/displayapp/fonts/lv_font_7segment_115.c
+++ /dev/null
@@ -1,735 +0,0 @@
-/*******************************************************************************
- * Size: 115 px
- * Bpp: 1
- * Opts: 
- ******************************************************************************/
-
-#ifdef LV_LVGL_H_INCLUDE_SIMPLE
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-#ifndef LV_FONT_7SEGMENT_115
-#define LV_FONT_7SEGMENT_115 1
-#endif
-
-#if LV_FONT_7SEGMENT_115
-
-/*-----------------
- *    BITMAPS
- *----------------*/
-
-/*Store the image of the glyphs*/
-static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
-    /* U+0020 " " */
-    0x0,
-
-    /* U+0030 "0" */
-    0x0, 0xf, 0xff, 0xff, 0xff, 0x80, 0x0, 0x1f,
-    0xff, 0xff, 0xff, 0x88, 0x0, 0x1f, 0xff, 0xff,
-    0xff, 0xcf, 0x0, 0x7, 0xff, 0xff, 0xff, 0xc7,
-    0xc0, 0x11, 0xff, 0xff, 0xff, 0xe7, 0xe0, 0x1c,
-    0x7f, 0xff, 0xff, 0xf3, 0xf8, 0x1f, 0x1f, 0xff,
-    0xff, 0xf3, 0xfc, 0xf, 0xc7, 0xff, 0xff, 0xf9,
-    0xff, 0x7, 0xf1, 0xff, 0xff, 0xf9, 0xff, 0x83,
-    0xfc, 0x7f, 0xff, 0xfc, 0xff, 0xc3, 0xff, 0x0,
-    0x0, 0x0, 0x7f, 0xe1, 0xff, 0xc0, 0x0, 0x0,
-    0x7f, 0xf0, 0xff, 0xe0, 0x0, 0x0, 0x3f, 0xf8,
-    0x7f, 0xf0, 0x0, 0x0, 0x1f, 0xfc, 0x3f, 0xf8,
-    0x0, 0x0, 0xf, 0xfe, 0x1f, 0xfc, 0x0, 0x0,
-    0x7, 0xff, 0xf, 0xfe, 0x0, 0x0, 0x3, 0xff,
-    0x87, 0xff, 0x0, 0x0, 0x1, 0xff, 0x83, 0xff,
-    0x80, 0x0, 0x0, 0xff, 0xc1, 0xff, 0xc0, 0x0,
-    0x0, 0xff, 0xe0, 0xff, 0xe0, 0x0, 0x0, 0x7f,
-    0xf0, 0x7f, 0xe0, 0x0, 0x0, 0x3f, 0xf8, 0x3f,
-    0xf0, 0x0, 0x0, 0x1f, 0xfc, 0x1f, 0xf8, 0x0,
-    0x0, 0xf, 0xfe, 0xf, 0xfc, 0x0, 0x0, 0x7,
-    0xff, 0xf, 0xfe, 0x0, 0x0, 0x3, 0xff, 0x87,
-    0xff, 0x0, 0x0, 0x1, 0xff, 0xc3, 0xff, 0x80,
-    0x0, 0x0, 0xff, 0xe1, 0xff, 0xc0, 0x0, 0x0,
-    0x7f, 0xf0, 0xff, 0xe0, 0x0, 0x0, 0x3f, 0xf8,
-    0x7f, 0xf0, 0x0, 0x0, 0x1f, 0xfc, 0x3f, 0xf8,
-    0x0, 0x0, 0xf, 0xfe, 0x1f, 0xfc, 0x0, 0x0,
-    0x7, 0xff, 0xf, 0xfe, 0x0, 0x0, 0x3, 0xff,
-    0x7, 0xff, 0x0, 0x0, 0x1, 0xff, 0x83, 0xff,
-    0x80, 0x0, 0x1, 0xff, 0xc1, 0xff, 0x80, 0x0,
-    0x0, 0x7f, 0xe0, 0xff, 0x80, 0x0, 0x0, 0x1f,
-    0xf0, 0x7f, 0x0, 0x0, 0x0, 0x3, 0xf8, 0x1f,
-    0x0, 0x0, 0x0, 0x0, 0xf8, 0x7, 0x0, 0x0,
-    0x0, 0x0, 0x38, 0x0, 0x0, 0x0, 0x0, 0x0,
-    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-    0x0, 0x0, 0x0, 0x0, 0x30, 0x0, 0x0, 0x0,
-    0x1, 0x80, 0x7c, 0x0, 0x0, 0x0, 0x1, 0xe0,
-    0x7f, 0x0, 0x0, 0x0, 0x3, 0xfc, 0x3f, 0xe0,
-    0x0, 0x0, 0x3, 0xfe, 0x1f, 0xf8, 0x0, 0x0,
-    0x7, 0xfe, 0xf, 0xfe, 0x0, 0x0, 0x3, 0xff,
-    0x7, 0xff, 0x0, 0x0, 0x1, 0xff, 0x83, 0xff,
-    0x80, 0x0, 0x1, 0xff, 0xc1, 0xff, 0xc0, 0x0,
-    0x0, 0xff, 0xe0, 0xff, 0xc0, 0x0, 0x0, 0x7f,
-    0xf0, 0x7f, 0xe0, 0x0, 0x0, 0x3f, 0xf8, 0x3f,
-    0xf0, 0x0, 0x0, 0x1f, 0xfc, 0x3f, 0xf8, 0x0,
-    0x0, 0xf, 0xfe, 0x1f, 0xfc, 0x0, 0x0, 0x7,
-    0xff, 0xf, 0xfe, 0x0, 0x0, 0x3, 0xff, 0x87,
-    0xff, 0x0, 0x0, 0x1, 0xff, 0xc3, 0xff, 0x80,
-    0x0, 0x0, 0xff, 0xe1, 0xff, 0xc0, 0x0, 0x0,
-    0x7f, 0xf0, 0xff, 0xe0, 0x0, 0x0, 0x3f, 0xf8,
-    0x7f, 0xf0, 0x0, 0x0, 0x1f, 0xfc, 0x3f, 0xf8,
-    0x0, 0x0, 0xf, 0xfc, 0x1f, 0xfc, 0x0, 0x0,
-    0x7, 0xfe, 0xf, 0xfe, 0x0, 0x0, 0x3, 0xff,
-    0x7, 0xff, 0x0, 0x0, 0x3, 0xff, 0x83, 0xff,
-    0x80, 0x0, 0x1, 0xff, 0xc1, 0xff, 0x80, 0x0,
-    0x0, 0xff, 0xe0, 0xff, 0xc0, 0x0, 0x0, 0x7f,
-    0xf0, 0x7f, 0xe0, 0x0, 0x0, 0x3f, 0xf8, 0x3f,
-    0xf0, 0x0, 0x0, 0x1f, 0xfc, 0x3f, 0xf8, 0x0,
-    0x0, 0xf, 0xfe, 0x1f, 0xf8, 0x0, 0x0, 0x7,
-    0xff, 0xf, 0xf8, 0xff, 0xff, 0xf9, 0xff, 0x87,
-    0xf8, 0xff, 0xff, 0xfc, 0xff, 0xc3, 0xf8, 0xff,
-    0xff, 0xfe, 0x7f, 0xc0, 0xf8, 0xff, 0xff, 0xff,
-    0x9f, 0xe0, 0x70, 0xff, 0xff, 0xff, 0xcf, 0xe0,
-    0x11, 0xff, 0xff, 0xff, 0xe7, 0xf0, 0x1, 0xff,
-    0xff, 0xff, 0xf1, 0xf0, 0x1, 0xff, 0xff, 0xff,
-    0xfc, 0xf0, 0x0, 0x7f, 0xff, 0xff, 0xfe, 0x60,
-    0x0, 0xf, 0xff, 0xff, 0xff, 0x0, 0x0,
-
-    /* U+0031 "1" */
-    0x0, 0x40, 0x1, 0xc0, 0x3, 0xe0, 0xf, 0xc0,
-    0x1f, 0xc0, 0x3f, 0x80, 0xff, 0x81, 0xff, 0x7,
-    0xfe, 0xf, 0xfc, 0x3f, 0xf8, 0x7f, 0xf0, 0xff,
-    0xe1, 0xff, 0xc3, 0xff, 0x87, 0xff, 0xf, 0xfc,
-    0x1f, 0xf8, 0x3f, 0xf0, 0xff, 0xe1, 0xff, 0xc3,
-    0xff, 0x87, 0xff, 0xf, 0xfe, 0x1f, 0xfc, 0x3f,
-    0xf8, 0x7f, 0xf0, 0xff, 0xe1, 0xff, 0xc3, 0xff,
-    0x87, 0xff, 0xf, 0xfe, 0x1f, 0xf8, 0x3f, 0xf0,
-    0xff, 0xe0, 0xff, 0xc0, 0xff, 0x80, 0xff, 0x0,
-    0x7c, 0x0, 0x70, 0x0, 0x0, 0x0, 0x0, 0x0,
-    0x0, 0x0, 0x0, 0xc, 0x0, 0x7c, 0x1, 0xfe,
-    0x7, 0xfc, 0x3f, 0xf0, 0x7f, 0xe0, 0xff, 0xc3,
-    0xff, 0x87, 0xff, 0xf, 0xfe, 0x1f, 0xfc, 0x3f,
-    0xf8, 0x7f, 0xf0, 0xff, 0xe1, 0xff, 0xc3, 0xff,
-    0x87, 0xff, 0xf, 0xfe, 0x1f, 0xfc, 0x3f, 0xf8,
-    0x7f, 0xe0, 0xff, 0xc3, 0xff, 0x87, 0xff, 0xf,
-    0xfe, 0x1f, 0xfc, 0x3f, 0xf8, 0x7f, 0xf0, 0xff,
-    0xe1, 0xff, 0xc1, 0xff, 0x83, 0xff, 0x7, 0xfe,
-    0x7, 0xf8, 0xf, 0xf0, 0x1f, 0xc0, 0x1f, 0x80,
-    0x3e, 0x0, 0x78, 0x0, 0xc0, 0x0,
-
-    /* U+0032 "2" */
-    0x0, 0xf, 0xff, 0xff, 0xff, 0x80, 0x0, 0x1f,
-    0xff, 0xff, 0xff, 0x88, 0x0, 0x1f, 0xff, 0xff,
-    0xff, 0xcf, 0x0, 0x7, 0xff, 0xff, 0xff, 0xc7,
-    0xc0, 0x1, 0xff, 0xff, 0xff, 0xe7, 0xe0, 0x0,
-    0x7f, 0xff, 0xff, 0xf3, 0xf8, 0x0, 0x1f, 0xff,
-    0xff, 0xf3, 0xfc, 0x0, 0x7, 0xff, 0xff, 0xf9,
-    0xff, 0x0, 0x1, 0xff, 0xff, 0xf9, 0xff, 0x80,
-    0x0, 0x7f, 0xff, 0xfc, 0xff, 0xc0, 0x0, 0x0,
-    0x0, 0x0, 0x7f, 0xe0, 0x0, 0x0, 0x0, 0x0,
-    0x7f, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xf8,
-    0x0, 0x0, 0x0, 0x0, 0x1f, 0xfc, 0x0, 0x0,
-    0x0, 0x0, 0xf, 0xfe, 0x0, 0x0, 0x0, 0x0,
-    0x7, 0xff, 0x0, 0x0, 0x0, 0x0, 0x3, 0xff,
-    0x80, 0x0, 0x0, 0x0, 0x1, 0xff, 0x80, 0x0,
-    0x0, 0x0, 0x0, 0xff, 0xc0, 0x0, 0x0, 0x0,
-    0x0, 0x7f, 0xe0, 0x0, 0x0, 0x0, 0x0, 0x7f,
-    0xf0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xf8, 0x0,
-    0x0, 0x0, 0x0, 0x1f, 0xfc, 0x0, 0x0, 0x0,
-    0x0, 0xf, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x7,
-    0xff, 0x0, 0x0, 0x0, 0x0, 0x3, 0xff, 0x80,
-    0x0, 0x0, 0x0, 0x1, 0xff, 0xc0, 0x0, 0x0,
-    0x0, 0x0, 0xff, 0xe0, 0x0, 0x0, 0x0, 0x0,
-    0x7f, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xf8,
-    0x0, 0x0, 0x0, 0x0, 0x1f, 0xfc, 0x0, 0x0,
-    0x0, 0x0, 0xf, 0xfe, 0x0, 0x0, 0x0, 0x0,
-    0x7, 0xff, 0x0, 0x0, 0x0, 0x0, 0x3, 0xff,
-    0x0, 0x0, 0x0, 0x0, 0x1, 0xff, 0x80, 0x0,
-    0x0, 0x0, 0x1, 0xff, 0xc0, 0x0, 0x0, 0x0,
-    0x0, 0xff, 0xe0, 0x0, 0x0, 0x0, 0x0, 0x1f,
-    0xf0, 0x0, 0xf, 0xff, 0xff, 0xc7, 0xf8, 0x0,
-    0xf, 0xff, 0xff, 0xf1, 0xf8, 0x0, 0x1f, 0xff,
-    0xff, 0xfc, 0x38, 0x0, 0x1f, 0xff, 0xff, 0xff,
-    0x88, 0x0, 0x3f, 0xff, 0xff, 0xff, 0xe0, 0x0,
-    0x1f, 0xff, 0xff, 0xff, 0xf0, 0x0, 0x3, 0xff,
-    0xff, 0xff, 0xe0, 0x0, 0x70, 0xff, 0xff, 0xff,
-    0xe0, 0x0, 0x7e, 0x3f, 0xff, 0xff, 0xc0, 0x0,
-    0x7f, 0x87, 0xff, 0xff, 0xc0, 0x0, 0x3f, 0xe0,
-    0x0, 0x0, 0x0, 0x0, 0x1f, 0xfc, 0x0, 0x0,
-    0x0, 0x0, 0xf, 0xfe, 0x0, 0x0, 0x0, 0x0,
-    0x7, 0xff, 0x0, 0x0, 0x0, 0x0, 0x3, 0xff,
-    0x80, 0x0, 0x0, 0x0, 0x1, 0xff, 0xc0, 0x0,
-    0x0, 0x0, 0x0, 0xff, 0xc0, 0x0, 0x0, 0x0,
-    0x0, 0x7f, 0xe0, 0x0, 0x0, 0x0, 0x0, 0x3f,
-    0xf0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xf8, 0x0,
-    0x0, 0x0, 0x0, 0x1f, 0xfc, 0x0, 0x0, 0x0,
-    0x0, 0xf, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x7,
-    0xff, 0x0, 0x0, 0x0, 0x0, 0x3, 0xff, 0x80,
-    0x0, 0x0, 0x0, 0x1, 0xff, 0xc0, 0x0, 0x0,
-    0x0, 0x0, 0xff, 0xe0, 0x0, 0x0, 0x0, 0x0,
-    0x7f, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xf8,
-    0x0, 0x0, 0x0, 0x0, 0x1f, 0xfc, 0x0, 0x0,
-    0x0, 0x0, 0xf, 0xfe, 0x0, 0x0, 0x0, 0x0,
-    0x7, 0xff, 0x0, 0x0, 0x0, 0x0, 0x3, 0xff,
-    0x80, 0x0, 0x0, 0x0, 0x1, 0xff, 0x80, 0x0,
-    0x0, 0x0, 0x0, 0xff, 0xc0, 0x0, 0x0, 0x0,
-    0x0, 0x7f, 0xe0, 0x0, 0x0, 0x0, 0x0, 0x3f,
-    0xf0, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xf8, 0x0,
-    0x0, 0x0, 0x0, 0x1f, 0xf8, 0x0, 0x0, 0x0,
-    0x0, 0xf, 0xf8, 0xff, 0xff, 0xf8, 0x0, 0x7,
-    0xf8, 0xff, 0xff, 0xfc, 0x0, 0x3, 0xf8, 0xff,
-    0xff, 0xfe, 0x0, 0x0, 0xf8, 0xff, 0xff, 0xff,
-    0x80, 0x0, 0x70, 0xff, 0xff, 0xff, 0xc0, 0x0,
-    0x11, 0xff, 0xff, 0xff, 0xe0, 0x0, 0x1, 0xff,
-    0xff, 0xff, 0xf0, 0x0, 0x1, 0xff, 0xff, 0xff,
-    0xfc, 0x0, 0x0, 0x7f, 0xff, 0xff, 0xfe, 0x0,
-    0x0, 0xf, 0xff, 0xff, 0xff, 0x0, 0x0,
-
-    /* U+0033 "3" */
-    0x0, 0xff, 0xff, 0xff, 0xf8, 0x0, 0x1f, 0xff,
-    0xff, 0xff, 0x88, 0x1, 0xff, 0xff, 0xff, 0xfc,
-    0xf0, 0x7, 0xff, 0xff, 0xff, 0xc7, 0xc0, 0x1f,
-    0xff, 0xff, 0xfe, 0x7e, 0x0, 0x7f, 0xff, 0xff,
-    0xf3, 0xf8, 0x1, 0xff, 0xff, 0xff, 0x3f, 0xc0,
-    0x7, 0xff, 0xff, 0xf9, 0xff, 0x0, 0x1f, 0xff,
-    0xff, 0x9f, 0xf8, 0x0, 0x7f, 0xff, 0xfc, 0xff,
-    0xc0, 0x0, 0x0, 0x0, 0x7, 0xfe, 0x0, 0x0,
-    0x0, 0x0, 0x7f, 0xf0, 0x0, 0x0, 0x0, 0x3,
-    0xff, 0x80, 0x0, 0x0, 0x0, 0x1f, 0xfc, 0x0,
-    0x0, 0x0, 0x0, 0xff, 0xe0, 0x0, 0x0, 0x0,
-    0x7, 0xff, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xf8,
-    0x0, 0x0, 0x0, 0x1, 0xff, 0x80, 0x0, 0x0,
-    0x0, 0xf, 0xfc, 0x0, 0x0, 0x0, 0x0, 0x7f,
-    0xe0, 0x0, 0x0, 0x0, 0x7, 0xff, 0x0, 0x0,
-    0x0, 0x0, 0x3f, 0xf8, 0x0, 0x0, 0x0, 0x1,
-    0xff, 0xc0, 0x0, 0x0, 0x0, 0xf, 0xfe, 0x0,
-    0x0, 0x0, 0x0, 0x7f, 0xf0, 0x0, 0x0, 0x0,
-    0x3, 0xff, 0x80, 0x0, 0x0, 0x0, 0x1f, 0xfc,
-    0x0, 0x0, 0x0, 0x0, 0xff, 0xe0, 0x0, 0x0,
-    0x0, 0x7, 0xff, 0x0, 0x0, 0x0, 0x0, 0x3f,
-    0xf8, 0x0, 0x0, 0x0, 0x1, 0xff, 0xc0, 0x0,
-    0x0, 0x0, 0xf, 0xfe, 0x0, 0x0, 0x0, 0x0,
-    0x7f, 0xf0, 0x0, 0x0, 0x0, 0x3, 0xff, 0x0,
-    0x0, 0x0, 0x0, 0x1f, 0xf8, 0x0, 0x0, 0x0,
-    0x1, 0xff, 0xc0, 0x0, 0x0, 0x0, 0xf, 0xfe,
-    0x0, 0x0, 0x0, 0x0, 0x1f, 0xf0, 0x0, 0xff,
-    0xff, 0xfc, 0x7f, 0x80, 0xf, 0xff, 0xff, 0xf1,
-    0xf8, 0x1, 0xff, 0xff, 0xff, 0xc3, 0x80, 0x1f,
-    0xff, 0xff, 0xff, 0x88, 0x3, 0xff, 0xff, 0xff,
-    0xfe, 0x0, 0x1f, 0xff, 0xff, 0xff, 0xf0, 0x0,
-    0x3f, 0xff, 0xff, 0xfe, 0x0, 0x0, 0xff, 0xff,
-    0xff, 0xe1, 0x80, 0x3, 0xff, 0xff, 0xfc, 0x3f,
-    0x0, 0x7, 0xff, 0xff, 0xc3, 0xfc, 0x0, 0x0,
-    0x0, 0x0, 0x7f, 0xc0, 0x0, 0x0, 0x0, 0x7,
-    0xfe, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xf0, 0x0,
-    0x0, 0x0, 0x1, 0xff, 0x80, 0x0, 0x0, 0x0,
-    0x1f, 0xfc, 0x0, 0x0, 0x0, 0x0, 0xff, 0xe0,
-    0x0, 0x0, 0x0, 0x7, 0xff, 0x0, 0x0, 0x0,
-    0x0, 0x3f, 0xf8, 0x0, 0x0, 0x0, 0x1, 0xff,
-    0xc0, 0x0, 0x0, 0x0, 0xf, 0xfe, 0x0, 0x0,
-    0x0, 0x0, 0x7f, 0xf0, 0x0, 0x0, 0x0, 0x3,
-    0xff, 0x80, 0x0, 0x0, 0x0, 0x1f, 0xfc, 0x0,
-    0x0, 0x0, 0x0, 0xff, 0xe0, 0x0, 0x0, 0x0,
-    0x7, 0xff, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xf8,
-    0x0, 0x0, 0x0, 0x1, 0xff, 0xc0, 0x0, 0x0,
-    0x0, 0xf, 0xfc, 0x0, 0x0, 0x0, 0x0, 0x7f,
-    0xe0, 0x0, 0x0, 0x0, 0x3, 0xff, 0x0, 0x0,
-    0x0, 0x0, 0x3f, 0xf8, 0x0, 0x0, 0x0, 0x1,
-    0xff, 0xc0, 0x0, 0x0, 0x0, 0xf, 0xfe, 0x0,
-    0x0, 0x0, 0x0, 0x7f, 0xf0, 0x0, 0x0, 0x0,
-    0x3, 0xff, 0x80, 0x0, 0x0, 0x0, 0x1f, 0xfc,
-    0x0, 0x0, 0x0, 0x0, 0xff, 0xe0, 0x0, 0x0,
-    0x0, 0x7, 0xff, 0x0, 0xf, 0xff, 0xff, 0x9f,
-    0xf8, 0x0, 0xff, 0xff, 0xfc, 0xff, 0xc0, 0xf,
-    0xff, 0xff, 0xe7, 0xfc, 0x0, 0xff, 0xff, 0xff,
-    0x9f, 0xe0, 0xf, 0xff, 0xff, 0xfc, 0xfe, 0x1,
-    0xff, 0xff, 0xff, 0xe7, 0xf0, 0x1f, 0xff, 0xff,
-    0xff, 0x1f, 0x1, 0xff, 0xff, 0xff, 0xfc, 0xf0,
-    0x7, 0xff, 0xff, 0xff, 0xe6, 0x0, 0xf, 0xff,
-    0xff, 0xff, 0x0, 0x0,
-
-    /* U+0034 "4" */
-    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-    0x0, 0x0, 0x7, 0x0, 0x0, 0x0, 0x0, 0x0,
-    0x1e, 0x0, 0x0, 0x0, 0x0, 0x0, 0x7c, 0x18,
-    0x0, 0x0, 0x0, 0x3, 0xf8, 0x70, 0x0, 0x0,
-    0x0, 0xf, 0xe3, 0xe0, 0x0, 0x0, 0x0, 0x7f,
-    0xcf, 0xc0, 0x0, 0x0, 0x1, 0xff, 0x3f, 0x80,
-    0x0, 0x0, 0xf, 0xfd, 0xff, 0x0, 0x0, 0x0,
-    0x3f, 0xf7, 0xfe, 0x0, 0x0, 0x0, 0xff, 0xdf,
-    0xfc, 0x0, 0x0, 0x7, 0xff, 0x7f, 0xf0, 0x0,
-    0x0, 0x1f, 0xfd, 0xff, 0xc0, 0x0, 0x0, 0x7f,
-    0xf7, 0xff, 0x0, 0x0, 0x1, 0xff, 0xdf, 0xfc,
-    0x0, 0x0, 0x7, 0xff, 0x7f, 0xf0, 0x0, 0x0,
-    0x1f, 0xfd, 0xff, 0xc0, 0x0, 0x0, 0x7f, 0xe7,
-    0xff, 0x0, 0x0, 0x1, 0xff, 0x9f, 0xfc, 0x0,
-    0x0, 0xf, 0xfe, 0x7f, 0xf0, 0x0, 0x0, 0x3f,
-    0xf9, 0xff, 0x80, 0x0, 0x0, 0xff, 0xe7, 0xfe,
-    0x0, 0x0, 0x3, 0xff, 0x9f, 0xf8, 0x0, 0x0,
-    0xf, 0xfe, 0xff, 0xe0, 0x0, 0x0, 0x3f, 0xfb,
-    0xff, 0x80, 0x0, 0x0, 0xff, 0xef, 0xfe, 0x0,
-    0x0, 0x3, 0xff, 0xbf, 0xf8, 0x0, 0x0, 0xf,
-    0xfe, 0xff, 0xe0, 0x0, 0x0, 0x3f, 0xfb, 0xff,
-    0x80, 0x0, 0x0, 0xff, 0xef, 0xfe, 0x0, 0x0,
-    0x3, 0xff, 0xbf, 0xf8, 0x0, 0x0, 0xf, 0xfe,
-    0xff, 0xe0, 0x0, 0x0, 0x3f, 0xf3, 0xff, 0x80,
-    0x0, 0x0, 0xff, 0xcf, 0xfe, 0x0, 0x0, 0x7,
-    0xff, 0x3f, 0xf8, 0x0, 0x0, 0x1f, 0xfc, 0xff,
-    0x80, 0x0, 0x0, 0x1f, 0xf3, 0xfc, 0x7f, 0xff,
-    0xfe, 0x3f, 0xcf, 0xc3, 0xff, 0xff, 0xfc, 0x7e,
-    0xe, 0x3f, 0xff, 0xff, 0xf8, 0x70, 0x1, 0xff,
-    0xff, 0xff, 0xf8, 0x80, 0x1f, 0xff, 0xff, 0xff,
-    0xf0, 0x0, 0x7f, 0xff, 0xff, 0xff, 0xc0, 0x0,
-    0x7f, 0xff, 0xff, 0xfc, 0x0, 0x0, 0xff, 0xff,
-    0xff, 0xe1, 0x80, 0x1, 0xff, 0xff, 0xfe, 0x1f,
-    0x80, 0x1, 0xff, 0xff, 0xf0, 0xff, 0x0, 0x0,
-    0x0, 0x0, 0xf, 0xf8, 0x0, 0x0, 0x0, 0x0,
-    0x7f, 0xe0, 0x0, 0x0, 0x0, 0x1, 0xff, 0x80,
-    0x0, 0x0, 0x0, 0x7, 0xfe, 0x0, 0x0, 0x0,
-    0x0, 0x3f, 0xf8, 0x0, 0x0, 0x0, 0x0, 0xff,
-    0xe0, 0x0, 0x0, 0x0, 0x3, 0xff, 0x80, 0x0,
-    0x0, 0x0, 0xf, 0xfe, 0x0, 0x0, 0x0, 0x0,
-    0x3f, 0xf8, 0x0, 0x0, 0x0, 0x0, 0xff, 0xe0,
-    0x0, 0x0, 0x0, 0x3, 0xff, 0x80, 0x0, 0x0,
-    0x0, 0xf, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x3f,
-    0xf8, 0x0, 0x0, 0x0, 0x0, 0xff, 0xe0, 0x0,
-    0x0, 0x0, 0x3, 0xff, 0x80, 0x0, 0x0, 0x0,
-    0xf, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xf0,
-    0x0, 0x0, 0x0, 0x0, 0xff, 0xc0, 0x0, 0x0,
-    0x0, 0x3, 0xff, 0x0, 0x0, 0x0, 0x0, 0x1f,
-    0xfc, 0x0, 0x0, 0x0, 0x0, 0x7f, 0xf0, 0x0,
-    0x0, 0x0, 0x1, 0xff, 0xc0, 0x0, 0x0, 0x0,
-    0x7, 0xff, 0x0, 0x0, 0x0, 0x0, 0x1f, 0xfc,
-    0x0, 0x0, 0x0, 0x0, 0x7f, 0xf0, 0x0, 0x0,
-    0x0, 0x1, 0xff, 0xc0, 0x0, 0x0, 0x0, 0x7,
-    0xff, 0x0, 0x0, 0x0, 0x0, 0xf, 0xfc, 0x0,
-    0x0, 0x0, 0x0, 0x3f, 0xf0, 0x0, 0x0, 0x0,
-    0x0, 0xff, 0x80, 0x0, 0x0, 0x0, 0x1, 0xfe,
-    0x0, 0x0, 0x0, 0x0, 0x7, 0xf8, 0x0, 0x0,
-    0x0, 0x0, 0x1f, 0xc0, 0x0, 0x0, 0x0, 0x0,
-    0x3e, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf0, 0x0,
-    0x0, 0x0, 0x0, 0x3, 0x80, 0x0, 0x0, 0x0,
-    0x0, 0x0, 0x0,
-
-    /* U+0035 "5" */
-    0x0, 0x7f, 0xff, 0xff, 0xfc, 0x0, 0x1f, 0xff,
-    0xff, 0xff, 0x80, 0x3, 0xff, 0xff, 0xff, 0xf8,
-    0x0, 0x1f, 0xff, 0xff, 0xff, 0x0, 0x8, 0xff,
-    0xff, 0xff, 0xf0, 0x1, 0xc7, 0xff, 0xff, 0xff,
-    0x0, 0x3e, 0x3f, 0xff, 0xff, 0xe0, 0x3, 0xf1,
-    0xff, 0xff, 0xfe, 0x0, 0x3f, 0x8f, 0xff, 0xff,
-    0xc0, 0x3, 0xfc, 0x7f, 0xff, 0xfc, 0x0, 0x7f,
-    0xe0, 0x0, 0x0, 0x0, 0x7, 0xff, 0x0, 0x0,
-    0x0, 0x0, 0x7f, 0xf0, 0x0, 0x0, 0x0, 0x7,
-    0xff, 0x0, 0x0, 0x0, 0x0, 0x7f, 0xf0, 0x0,
-    0x0, 0x0, 0x7, 0xff, 0x0, 0x0, 0x0, 0x0,
-    0x7f, 0xf0, 0x0, 0x0, 0x0, 0x7, 0xff, 0x0,
-    0x0, 0x0, 0x0, 0x7f, 0xf0, 0x0, 0x0, 0x0,
-    0x7, 0xff, 0x0, 0x0, 0x0, 0x0, 0x7f, 0xf0,
-    0x0, 0x0, 0x0, 0x7, 0xff, 0x0, 0x0, 0x0,
-    0x0, 0x7f, 0xe0, 0x0, 0x0, 0x0, 0x7, 0xfe,
-    0x0, 0x0, 0x0, 0x0, 0x7f, 0xe0, 0x0, 0x0,
-    0x0, 0xf, 0xfe, 0x0, 0x0, 0x0, 0x0, 0xff,
-    0xe0, 0x0, 0x0, 0x0, 0xf, 0xfe, 0x0, 0x0,
-    0x0, 0x0, 0xff, 0xe0, 0x0, 0x0, 0x0, 0xf,
-    0xfe, 0x0, 0x0, 0x0, 0x0, 0xff, 0xe0, 0x0,
-    0x0, 0x0, 0xf, 0xfe, 0x0, 0x0, 0x0, 0x0,
-    0xff, 0xe0, 0x0, 0x0, 0x0, 0xf, 0xfe, 0x0,
-    0x0, 0x0, 0x0, 0xff, 0xe0, 0x0, 0x0, 0x0,
-    0xf, 0xfe, 0x0, 0x0, 0x0, 0x0, 0xff, 0xe0,
-    0x0, 0x0, 0x0, 0xf, 0xf8, 0x0, 0x0, 0x0,
-    0x0, 0xff, 0x1f, 0xff, 0xff, 0x80, 0xf, 0xc3,
-    0xff, 0xff, 0xfc, 0x0, 0x38, 0xff, 0xff, 0xff,
-    0xe0, 0x0, 0x1f, 0xff, 0xff, 0xff, 0x80, 0x7,
-    0xff, 0xff, 0xff, 0xfc, 0x0, 0x7f, 0xff, 0xff,
-    0xff, 0xc0, 0x1, 0xff, 0xff, 0xff, 0xf0, 0x0,
-    0xf, 0xff, 0xff, 0xfe, 0x18, 0x0, 0x7f, 0xff,
-    0xff, 0x87, 0xe0, 0x1, 0xff, 0xff, 0xf0, 0xff,
-    0x0, 0x0, 0x0, 0x0, 0x3f, 0xe0, 0x0, 0x0,
-    0x0, 0x7, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x7f,
-    0xe0, 0x0, 0x0, 0x0, 0x7, 0xfe, 0x0, 0x0,
-    0x0, 0x0, 0xff, 0xe0, 0x0, 0x0, 0x0, 0xf,
-    0xfe, 0x0, 0x0, 0x0, 0x0, 0xff, 0xe0, 0x0,
-    0x0, 0x0, 0xf, 0xfe, 0x0, 0x0, 0x0, 0x0,
-    0xff, 0xe0, 0x0, 0x0, 0x0, 0xf, 0xfe, 0x0,
-    0x0, 0x0, 0x0, 0xff, 0xe0, 0x0, 0x0, 0x0,
-    0xf, 0xfe, 0x0, 0x0, 0x0, 0x0, 0xff, 0xe0,
-    0x0, 0x0, 0x0, 0xf, 0xfe, 0x0, 0x0, 0x0,
-    0x0, 0xff, 0xe0, 0x0, 0x0, 0x0, 0xf, 0xfe,
-    0x0, 0x0, 0x0, 0x0, 0xff, 0xe0, 0x0, 0x0,
-    0x0, 0xf, 0xfc, 0x0, 0x0, 0x0, 0x0, 0xff,
-    0xc0, 0x0, 0x0, 0x0, 0xf, 0xfc, 0x0, 0x0,
-    0x0, 0x1, 0xff, 0xc0, 0x0, 0x0, 0x0, 0x1f,
-    0xfc, 0x0, 0x0, 0x0, 0x1, 0xff, 0xc0, 0x0,
-    0x0, 0x0, 0x1f, 0xfc, 0x0, 0x0, 0x0, 0x1,
-    0xff, 0xc0, 0x0, 0x0, 0x0, 0x1f, 0xfc, 0x0,
-    0x0, 0x0, 0x1, 0xff, 0xc0, 0x0, 0x0, 0x0,
-    0x1f, 0xfc, 0x0, 0x7f, 0xff, 0xfc, 0xff, 0xc0,
-    0xf, 0xff, 0xff, 0xcf, 0xfc, 0x1, 0xff, 0xff,
-    0xfc, 0xff, 0x80, 0x3f, 0xff, 0xff, 0xe7, 0xf8,
-    0x7, 0xff, 0xff, 0xfe, 0x7f, 0x1, 0xff, 0xff,
-    0xff, 0xe7, 0xf0, 0x3f, 0xff, 0xff, 0xfe, 0x3e,
-    0x7, 0xff, 0xff, 0xff, 0xf3, 0xc0, 0x3f, 0xff,
-    0xff, 0xff, 0x30, 0x0, 0xff, 0xff, 0xff, 0xf0,
-    0x0,
-
-    /* U+0036 "6" */
-    0x0, 0xf, 0xff, 0xff, 0xff, 0x80, 0x0, 0x7f,
-    0xff, 0xff, 0xfe, 0x0, 0x1, 0xff, 0xff, 0xff,
-    0xfc, 0x0, 0x1, 0xff, 0xff, 0xff, 0xf0, 0x0,
-    0x11, 0xff, 0xff, 0xff, 0xe0, 0x0, 0x71, 0xff,
-    0xff, 0xff, 0xc0, 0x1, 0xf1, 0xff, 0xff, 0xff,
-    0x0, 0x3, 0xf1, 0xff, 0xff, 0xfe, 0x0, 0x7,
-    0xf1, 0xff, 0xff, 0xf8, 0x0, 0xf, 0xf1, 0xff,
-    0xff, 0xf0, 0x0, 0x3f, 0xf0, 0x0, 0x0, 0x0,
-    0x0, 0x7f, 0xf0, 0x0, 0x0, 0x0, 0x0, 0xff,
-    0xe0, 0x0, 0x0, 0x0, 0x1, 0xff, 0xc0, 0x0,
-    0x0, 0x0, 0x3, 0xff, 0x80, 0x0, 0x0, 0x0,
-    0x7, 0xff, 0x0, 0x0, 0x0, 0x0, 0xf, 0xfe,
-    0x0, 0x0, 0x0, 0x0, 0x1f, 0xfc, 0x0, 0x0,
-    0x0, 0x0, 0x3f, 0xf8, 0x0, 0x0, 0x0, 0x0,
-    0x7f, 0xf0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xe0,
-    0x0, 0x0, 0x0, 0x1, 0xff, 0xc0, 0x0, 0x0,
-    0x0, 0x3, 0xff, 0x0, 0x0, 0x0, 0x0, 0x7,
-    0xfe, 0x0, 0x0, 0x0, 0x0, 0xf, 0xfc, 0x0,
-    0x0, 0x0, 0x0, 0x3f, 0xf8, 0x0, 0x0, 0x0,
-    0x0, 0x7f, 0xf0, 0x0, 0x0, 0x0, 0x0, 0xff,
-    0xe0, 0x0, 0x0, 0x0, 0x1, 0xff, 0xc0, 0x0,
-    0x0, 0x0, 0x3, 0xff, 0x80, 0x0, 0x0, 0x0,
-    0x7, 0xff, 0x0, 0x0, 0x0, 0x0, 0xf, 0xfe,
-    0x0, 0x0, 0x0, 0x0, 0x1f, 0xfc, 0x0, 0x0,
-    0x0, 0x0, 0x3f, 0xf8, 0x0, 0x0, 0x0, 0x0,
-    0x7f, 0xf0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xe0,
-    0x0, 0x0, 0x0, 0x1, 0xff, 0xc0, 0x0, 0x0,
-    0x0, 0x3, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x7,
-    0xf8, 0xff, 0xff, 0xfc, 0x0, 0xf, 0xc3, 0xff,
-    0xff, 0xfc, 0x0, 0x7, 0x1f, 0xff, 0xff, 0xfc,
-    0x0, 0x0, 0x7f, 0xff, 0xff, 0xfe, 0x0, 0x3,
-    0xff, 0xff, 0xff, 0xfe, 0x0, 0x7, 0xff, 0xff,
-    0xff, 0xfc, 0x0, 0x3, 0xff, 0xff, 0xff, 0xe0,
-    0x1, 0xc3, 0xff, 0xff, 0xff, 0x86, 0x7, 0xe3,
-    0xff, 0xff, 0xfc, 0x3f, 0x1f, 0xe1, 0xff, 0xff,
-    0xf0, 0xff, 0x3f, 0xe0, 0x0, 0x0, 0x7, 0xfc,
-    0x7f, 0xf0, 0x0, 0x0, 0x1f, 0xf8, 0xff, 0xe0,
-    0x0, 0x0, 0x3f, 0xf1, 0xff, 0xc0, 0x0, 0x0,
-    0x7f, 0xe3, 0xff, 0x80, 0x0, 0x1, 0xff, 0xc7,
-    0xff, 0x0, 0x0, 0x3, 0xff, 0x8f, 0xfc, 0x0,
-    0x0, 0x7, 0xff, 0x1f, 0xf8, 0x0, 0x0, 0xf,
-    0xfe, 0x3f, 0xf0, 0x0, 0x0, 0x1f, 0xfc, 0xff,
-    0xe0, 0x0, 0x0, 0x3f, 0xf9, 0xff, 0xc0, 0x0,
-    0x0, 0x7f, 0xf3, 0xff, 0x80, 0x0, 0x0, 0xff,
-    0xe7, 0xff, 0x0, 0x0, 0x1, 0xff, 0xcf, 0xfe,
-    0x0, 0x0, 0x3, 0xff, 0x9f, 0xfc, 0x0, 0x0,
-    0x7, 0xff, 0x3f, 0xf8, 0x0, 0x0, 0xf, 0xfe,
-    0x7f, 0xf0, 0x0, 0x0, 0x1f, 0xfc, 0xff, 0xe0,
-    0x0, 0x0, 0x3f, 0xf1, 0xff, 0xc0, 0x0, 0x0,
-    0x7f, 0xe3, 0xff, 0x80, 0x0, 0x0, 0xff, 0xc7,
-    0xff, 0x0, 0x0, 0x3, 0xff, 0x8f, 0xfe, 0x0,
-    0x0, 0x7, 0xff, 0x1f, 0xf8, 0x0, 0x0, 0xf,
-    0xfe, 0x3f, 0xf0, 0x0, 0x0, 0x1f, 0xfc, 0x7f,
-    0xe0, 0x0, 0x0, 0x3f, 0xf8, 0xff, 0xc0, 0x0,
-    0x0, 0x7f, 0xf3, 0xff, 0x80, 0x0, 0x0, 0xff,
-    0xe7, 0xfe, 0x0, 0x0, 0x1, 0xff, 0xcf, 0xf8,
-    0xff, 0xff, 0xf9, 0xff, 0x9f, 0xe3, 0xff, 0xff,
-    0xf3, 0xff, 0x3f, 0x8f, 0xff, 0xff, 0xe7, 0xfc,
-    0x3e, 0x3f, 0xff, 0xff, 0xe7, 0xf8, 0x70, 0xff,
-    0xff, 0xff, 0xcf, 0xe0, 0x47, 0xff, 0xff, 0xff,
-    0x9f, 0xc0, 0x1f, 0xff, 0xff, 0xff, 0x1f, 0x0,
-    0x7f, 0xff, 0xff, 0xff, 0x3c, 0x0, 0x7f, 0xff,
-    0xff, 0xfe, 0x60, 0x0, 0x3f, 0xff, 0xff, 0xfc,
-    0x0, 0x0,
-
-    /* U+0037 "7" */
-    0x1f, 0xff, 0xff, 0xff, 0x0, 0x7f, 0xff, 0xff,
-    0xfe, 0x20, 0xff, 0xff, 0xff, 0xfe, 0x78, 0x7f,
-    0xff, 0xff, 0xfc, 0x7c, 0x3f, 0xff, 0xff, 0xfc,
-    0xfe, 0x1f, 0xff, 0xff, 0xfc, 0xfe, 0xf, 0xff,
-    0xff, 0xf9, 0xfe, 0x7, 0xff, 0xff, 0xf9, 0xff,
-    0x3, 0xff, 0xff, 0xf3, 0xff, 0x1, 0xff, 0xff,
-    0xf3, 0xff, 0x0, 0x0, 0x0, 0x3, 0xff, 0x0,
-    0x0, 0x0, 0x7, 0xff, 0x0, 0x0, 0x0, 0x7,
-    0xff, 0x0, 0x0, 0x0, 0x7, 0xff, 0x0, 0x0,
-    0x0, 0x7, 0xff, 0x0, 0x0, 0x0, 0x7, 0xff,
-    0x0, 0x0, 0x0, 0x7, 0xff, 0x0, 0x0, 0x0,
-    0x7, 0xfe, 0x0, 0x0, 0x0, 0x7, 0xfe, 0x0,
-    0x0, 0x0, 0xf, 0xfe, 0x0, 0x0, 0x0, 0xf,
-    0xfe, 0x0, 0x0, 0x0, 0xf, 0xfe, 0x0, 0x0,
-    0x0, 0xf, 0xfe, 0x0, 0x0, 0x0, 0xf, 0xfe,
-    0x0, 0x0, 0x0, 0xf, 0xfe, 0x0, 0x0, 0x0,
-    0xf, 0xfe, 0x0, 0x0, 0x0, 0xf, 0xfe, 0x0,
-    0x0, 0x0, 0xf, 0xfe, 0x0, 0x0, 0x0, 0xf,
-    0xfe, 0x0, 0x0, 0x0, 0xf, 0xfe, 0x0, 0x0,
-    0x0, 0xf, 0xfe, 0x0, 0x0, 0x0, 0xf, 0xfe,
-    0x0, 0x0, 0x0, 0xf, 0xfc, 0x0, 0x0, 0x0,
-    0xf, 0xfc, 0x0, 0x0, 0x0, 0x1f, 0xfc, 0x0,
-    0x0, 0x0, 0xf, 0xfc, 0x0, 0x0, 0x0, 0x7,
-    0xfc, 0x0, 0x0, 0x0, 0x3, 0xfc, 0x0, 0x0,
-    0x0, 0x1, 0xf8, 0x0, 0x0, 0x0, 0x0, 0x70,
-    0x0, 0x0, 0x0, 0x0, 0x20, 0x0, 0x0, 0x0,
-    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-    0x60, 0x0, 0x0, 0x0, 0x0, 0xf0, 0x0, 0x0,
-    0x0, 0x3, 0xf8, 0x0, 0x0, 0x0, 0x7, 0xf8,
-    0x0, 0x0, 0x0, 0xf, 0xf8, 0x0, 0x0, 0x0,
-    0x1f, 0xf8, 0x0, 0x0, 0x0, 0x1f, 0xf8, 0x0,
-    0x0, 0x0, 0x3f, 0xf8, 0x0, 0x0, 0x0, 0x3f,
-    0xf8, 0x0, 0x0, 0x0, 0x3f, 0xf8, 0x0, 0x0,
-    0x0, 0x3f, 0xf8, 0x0, 0x0, 0x0, 0x3f, 0xf8,
-    0x0, 0x0, 0x0, 0x3f, 0xf8, 0x0, 0x0, 0x0,
-    0x3f, 0xf8, 0x0, 0x0, 0x0, 0x3f, 0xf8, 0x0,
-    0x0, 0x0, 0x3f, 0xf8, 0x0, 0x0, 0x0, 0x3f,
-    0xf8, 0x0, 0x0, 0x0, 0x3f, 0xf8, 0x0, 0x0,
-    0x0, 0x3f, 0xf8, 0x0, 0x0, 0x0, 0x3f, 0xf8,
-    0x0, 0x0, 0x0, 0x3f, 0xf0, 0x0, 0x0, 0x0,
-    0x3f, 0xf0, 0x0, 0x0, 0x0, 0x7f, 0xf0, 0x0,
-    0x0, 0x0, 0x7f, 0xf0, 0x0, 0x0, 0x0, 0x7f,
-    0xf0, 0x0, 0x0, 0x0, 0x7f, 0xf0, 0x0, 0x0,
-    0x0, 0x7f, 0xf0, 0x0, 0x0, 0x0, 0x7f, 0xf0,
-    0x0, 0x0, 0x0, 0x7f, 0xf0, 0x0, 0x0, 0x0,
-    0x7f, 0xf0, 0x0, 0x0, 0x0, 0x3f, 0xf0, 0x0,
-    0x0, 0x0, 0x3f, 0xf0, 0x0, 0x0, 0x0, 0x3f,
-    0xf0, 0x0, 0x0, 0x0, 0x1f, 0xe0, 0x0, 0x0,
-    0x0, 0x1f, 0xe0, 0x0, 0x0, 0x0, 0x1f, 0xc0,
-    0x0, 0x0, 0x0, 0x1f, 0xc0, 0x0, 0x0, 0x0,
-    0xf, 0x80, 0x0, 0x0, 0x0, 0xf, 0x0, 0x0,
-    0x0, 0x0, 0xc, 0x0,
-
-    /* U+0038 "8" */
-    0x0, 0xf, 0xff, 0xff, 0xff, 0x80, 0x0, 0x1f,
-    0xff, 0xff, 0xff, 0x88, 0x0, 0x1f, 0xff, 0xff,
-    0xff, 0xcf, 0x0, 0x7, 0xff, 0xff, 0xff, 0xc7,
-    0xc0, 0x11, 0xff, 0xff, 0xff, 0xe7, 0xe0, 0x1c,
-    0x7f, 0xff, 0xff, 0xf3, 0xf8, 0x1f, 0x1f, 0xff,
-    0xff, 0xf3, 0xfc, 0xf, 0xc7, 0xff, 0xff, 0xf9,
-    0xff, 0x7, 0xf1, 0xff, 0xff, 0xf9, 0xff, 0x83,
-    0xfc, 0x7f, 0xff, 0xfc, 0xff, 0xc3, 0xff, 0x0,
-    0x0, 0x0, 0x7f, 0xe1, 0xff, 0xc0, 0x0, 0x0,
-    0x7f, 0xf0, 0xff, 0xe0, 0x0, 0x0, 0x3f, 0xf8,
-    0x7f, 0xf0, 0x0, 0x0, 0x1f, 0xfc, 0x3f, 0xf8,
-    0x0, 0x0, 0xf, 0xfe, 0x1f, 0xfc, 0x0, 0x0,
-    0x7, 0xff, 0xf, 0xfe, 0x0, 0x0, 0x3, 0xff,
-    0x87, 0xff, 0x0, 0x0, 0x1, 0xff, 0x83, 0xff,
-    0x80, 0x0, 0x0, 0xff, 0xc1, 0xff, 0xc0, 0x0,
-    0x0, 0x7f, 0xe0, 0xff, 0xe0, 0x0, 0x0, 0x7f,
-    0xf0, 0x7f, 0xf0, 0x0, 0x0, 0x3f, 0xf8, 0x3f,
-    0xf0, 0x0, 0x0, 0x1f, 0xfc, 0x1f, 0xf8, 0x0,
-    0x0, 0xf, 0xfe, 0xf, 0xfc, 0x0, 0x0, 0x7,
-    0xff, 0xf, 0xfe, 0x0, 0x0, 0x3, 0xff, 0x87,
-    0xff, 0x0, 0x0, 0x1, 0xff, 0xc3, 0xff, 0x80,
-    0x0, 0x0, 0xff, 0xe1, 0xff, 0xc0, 0x0, 0x0,
-    0x7f, 0xf0, 0xff, 0xe0, 0x0, 0x0, 0x3f, 0xf8,
-    0x7f, 0xf0, 0x0, 0x0, 0x1f, 0xfc, 0x3f, 0xf8,
-    0x0, 0x0, 0xf, 0xfe, 0x1f, 0xfc, 0x0, 0x0,
-    0x7, 0xff, 0xf, 0xfe, 0x0, 0x0, 0x3, 0xff,
-    0x7, 0xff, 0x0, 0x0, 0x1, 0xff, 0x83, 0xff,
-    0x80, 0x0, 0x1, 0xff, 0xc1, 0xff, 0xc0, 0x0,
-    0x0, 0xff, 0xe0, 0xff, 0x80, 0x0, 0x0, 0x1f,
-    0xf0, 0x7f, 0x8f, 0xff, 0xff, 0xc7, 0xf8, 0x3f,
-    0xf, 0xff, 0xff, 0xf1, 0xf8, 0x7, 0x1f, 0xff,
-    0xff, 0xfc, 0x38, 0x0, 0x1f, 0xff, 0xff, 0xff,
-    0x88, 0x0, 0x3f, 0xff, 0xff, 0xff, 0xe0, 0x0,
-    0x1f, 0xff, 0xff, 0xff, 0xf0, 0x0, 0x3, 0xff,
-    0xff, 0xff, 0xe0, 0x0, 0x70, 0xff, 0xff, 0xff,
-    0xe1, 0x80, 0x7e, 0x3f, 0xff, 0xff, 0xc3, 0xf0,
-    0x7f, 0x87, 0xff, 0xff, 0xc3, 0xfc, 0x3f, 0xe0,
-    0x0, 0x0, 0x7, 0xfc, 0x1f, 0xfc, 0x0, 0x0,
-    0x7, 0xfe, 0xf, 0xfe, 0x0, 0x0, 0x3, 0xff,
-    0x7, 0xff, 0x0, 0x0, 0x1, 0xff, 0x83, 0xff,
-    0x80, 0x0, 0x1, 0xff, 0xc1, 0xff, 0xc0, 0x0,
-    0x0, 0xff, 0xe0, 0xff, 0xc0, 0x0, 0x0, 0x7f,
-    0xf0, 0x7f, 0xe0, 0x0, 0x0, 0x3f, 0xf8, 0x3f,
-    0xf0, 0x0, 0x0, 0x1f, 0xfc, 0x3f, 0xf8, 0x0,
-    0x0, 0xf, 0xfe, 0x1f, 0xfc, 0x0, 0x0, 0x7,
-    0xff, 0xf, 0xfe, 0x0, 0x0, 0x3, 0xff, 0x87,
-    0xff, 0x0, 0x0, 0x1, 0xff, 0xc3, 0xff, 0x80,
-    0x0, 0x0, 0xff, 0xe1, 0xff, 0xc0, 0x0, 0x0,
-    0x7f, 0xf0, 0xff, 0xe0, 0x0, 0x0, 0x3f, 0xf8,
-    0x7f, 0xf0, 0x0, 0x0, 0x1f, 0xfc, 0x3f, 0xf8,
-    0x0, 0x0, 0xf, 0xfc, 0x1f, 0xfc, 0x0, 0x0,
-    0x7, 0xfe, 0xf, 0xfe, 0x0, 0x0, 0x3, 0xff,
-    0x7, 0xff, 0x0, 0x0, 0x3, 0xff, 0x83, 0xff,
-    0x80, 0x0, 0x1, 0xff, 0xc1, 0xff, 0x80, 0x0,
-    0x0, 0xff, 0xe0, 0xff, 0xc0, 0x0, 0x0, 0x7f,
-    0xf0, 0x7f, 0xe0, 0x0, 0x0, 0x3f, 0xf8, 0x3f,
-    0xf0, 0x0, 0x0, 0x1f, 0xfc, 0x3f, 0xf8, 0x0,
-    0x0, 0xf, 0xfe, 0x1f, 0xf8, 0x0, 0x0, 0x7,
-    0xff, 0xf, 0xf8, 0xff, 0xff, 0xf9, 0xff, 0x87,
-    0xf8, 0xff, 0xff, 0xfc, 0xff, 0xc3, 0xf8, 0xff,
-    0xff, 0xfe, 0x7f, 0xc0, 0xf8, 0xff, 0xff, 0xff,
-    0x9f, 0xe0, 0x70, 0xff, 0xff, 0xff, 0xcf, 0xe0,
-    0x11, 0xff, 0xff, 0xff, 0xe7, 0xf0, 0x1, 0xff,
-    0xff, 0xff, 0xf1, 0xf0, 0x1, 0xff, 0xff, 0xff,
-    0xfc, 0xf0, 0x0, 0x7f, 0xff, 0xff, 0xfe, 0x60,
-    0x0, 0xf, 0xff, 0xff, 0xff, 0x0, 0x0,
-
-    /* U+0039 "9" */
-    0x0, 0x7f, 0xff, 0xff, 0xfc, 0x0, 0x7, 0xff,
-    0xff, 0xff, 0xe2, 0x0, 0x3f, 0xff, 0xff, 0xff,
-    0x9e, 0x0, 0x7f, 0xff, 0xff, 0xfc, 0x7c, 0x8,
-    0xff, 0xff, 0xff, 0xf3, 0xf0, 0x71, 0xff, 0xff,
-    0xff, 0xcf, 0xe3, 0xe3, 0xff, 0xff, 0xfe, 0x7f,
-    0x8f, 0xc7, 0xff, 0xff, 0xf9, 0xff, 0x3f, 0x8f,
-    0xff, 0xff, 0xcf, 0xfc, 0xff, 0x1f, 0xff, 0xff,
-    0x3f, 0xf7, 0xfe, 0x0, 0x0, 0x0, 0xff, 0xdf,
-    0xfc, 0x0, 0x0, 0x7, 0xff, 0x7f, 0xf0, 0x0,
-    0x0, 0x1f, 0xfd, 0xff, 0xc0, 0x0, 0x0, 0x7f,
-    0xf7, 0xff, 0x0, 0x0, 0x1, 0xff, 0xdf, 0xfc,
-    0x0, 0x0, 0x7, 0xff, 0x7f, 0xf0, 0x0, 0x0,
-    0x1f, 0xfd, 0xff, 0xc0, 0x0, 0x0, 0x7f, 0xe7,
-    0xff, 0x0, 0x0, 0x1, 0xff, 0x9f, 0xfc, 0x0,
-    0x0, 0x7, 0xfe, 0x7f, 0xf0, 0x0, 0x0, 0x3f,
-    0xf9, 0xff, 0xc0, 0x0, 0x0, 0xff, 0xe7, 0xfe,
-    0x0, 0x0, 0x3, 0xff, 0x9f, 0xf8, 0x0, 0x0,
-    0xf, 0xfe, 0x7f, 0xe0, 0x0, 0x0, 0x3f, 0xfb,
-    0xff, 0x80, 0x0, 0x0, 0xff, 0xef, 0xfe, 0x0,
-    0x0, 0x3, 0xff, 0xbf, 0xf8, 0x0, 0x0, 0xf,
-    0xfe, 0xff, 0xe0, 0x0, 0x0, 0x3f, 0xfb, 0xff,
-    0x80, 0x0, 0x0, 0xff, 0xef, 0xfe, 0x0, 0x0,
-    0x3, 0xff, 0xbf, 0xf8, 0x0, 0x0, 0xf, 0xfe,
-    0xff, 0xe0, 0x0, 0x0, 0x3f, 0xfb, 0xff, 0x80,
-    0x0, 0x0, 0xff, 0xcf, 0xfe, 0x0, 0x0, 0x3,
-    0xff, 0x3f, 0xf8, 0x0, 0x0, 0x1f, 0xfc, 0xff,
-    0xe0, 0x0, 0x0, 0x7f, 0xf3, 0xfe, 0x0, 0x0,
-    0x0, 0x7f, 0xcf, 0xf1, 0xff, 0xff, 0xf8, 0xff,
-    0x3f, 0xf, 0xff, 0xff, 0xf1, 0xf8, 0x38, 0xff,
-    0xff, 0xff, 0xe1, 0xc0, 0x7, 0xff, 0xff, 0xff,
-    0xe2, 0x0, 0x7f, 0xff, 0xff, 0xff, 0xc0, 0x1,
-    0xff, 0xff, 0xff, 0xff, 0x0, 0x1, 0xff, 0xff,
-    0xff, 0xf0, 0x0, 0x3, 0xff, 0xff, 0xff, 0x86,
-    0x0, 0x7, 0xff, 0xff, 0xf8, 0x7e, 0x0, 0x7,
-    0xff, 0xff, 0xc3, 0xfc, 0x0, 0x0, 0x0, 0x0,
-    0x3f, 0xe0, 0x0, 0x0, 0x0, 0x1, 0xff, 0x80,
-    0x0, 0x0, 0x0, 0x7, 0xfe, 0x0, 0x0, 0x0,
-    0x0, 0x1f, 0xf8, 0x0, 0x0, 0x0, 0x0, 0xff,
-    0xe0, 0x0, 0x0, 0x0, 0x3, 0xff, 0x80, 0x0,
-    0x0, 0x0, 0xf, 0xfe, 0x0, 0x0, 0x0, 0x0,
-    0x3f, 0xf8, 0x0, 0x0, 0x0, 0x0, 0xff, 0xe0,
-    0x0, 0x0, 0x0, 0x3, 0xff, 0x80, 0x0, 0x0,
-    0x0, 0xf, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x3f,
-    0xf8, 0x0, 0x0, 0x0, 0x0, 0xff, 0xe0, 0x0,
-    0x0, 0x0, 0x3, 0xff, 0x80, 0x0, 0x0, 0x0,
-    0xf, 0xfe, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xf8,
-    0x0, 0x0, 0x0, 0x0, 0xff, 0xe0, 0x0, 0x0,
-    0x0, 0x3, 0xff, 0x0, 0x0, 0x0, 0x0, 0xf,
-    0xfc, 0x0, 0x0, 0x0, 0x0, 0x3f, 0xf0, 0x0,
-    0x0, 0x0, 0x1, 0xff, 0xc0, 0x0, 0x0, 0x0,
-    0x7, 0xff, 0x0, 0x0, 0x0, 0x0, 0x1f, 0xfc,
-    0x0, 0x0, 0x0, 0x0, 0x7f, 0xf0, 0x0, 0x0,
-    0x0, 0x1, 0xff, 0xc0, 0x0, 0x0, 0x0, 0x7,
-    0xff, 0x0, 0x0, 0x0, 0x0, 0x1f, 0xfc, 0x0,
-    0x0, 0x0, 0x0, 0x7f, 0xf0, 0x0, 0x7f, 0xff,
-    0xfc, 0xff, 0xc0, 0x3, 0xff, 0xff, 0xf3, 0xff,
-    0x0, 0x1f, 0xff, 0xff, 0xcf, 0xf8, 0x0, 0xff,
-    0xff, 0xff, 0x9f, 0xe0, 0x7, 0xff, 0xff, 0xfe,
-    0x7f, 0x0, 0x7f, 0xff, 0xff, 0xf9, 0xfc, 0x3,
-    0xff, 0xff, 0xff, 0xe3, 0xe0, 0x1f, 0xff, 0xff,
-    0xff, 0xcf, 0x0, 0x3f, 0xff, 0xff, 0xff, 0x30,
-    0x0, 0x3f, 0xff, 0xff, 0xfc, 0x0, 0x0,
-
-    /* U+003A ":" */
-    0x3f, 0xf9, 0xff, 0xcf, 0xfe, 0x7f, 0xf3, 0xff,
-    0x9f, 0xfc, 0xff, 0xe7, 0xff, 0x3f, 0xf9, 0xff,
-    0xc0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-    0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0xff, 0x9f,
-    0xfc, 0xff, 0xe7, 0xff, 0x3f, 0xf9, 0xff, 0xcf,
-    0xfe, 0x7f, 0xf3, 0xff, 0x9f, 0xfc
-};
-
-
-/*---------------------
- *  GLYPH DESCRIPTION
- *--------------------*/
-
-static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
-    {.bitmap_index = 0, .adv_w = 0, .box_w = 0, .box_h = 0, .ofs_x = 0, .ofs_y = 0} /* id = 0 reserved */,
-    {.bitmap_index = 0, .adv_w = 863, .box_w = 1, .box_h = 1, .ofs_x = 0, .ofs_y = 0},
-    {.bitmap_index = 1, .adv_w = 863, .box_w = 49, .box_h = 86, .ofs_x = 5, .ofs_y = 0},
-    {.bitmap_index = 528, .adv_w = 863, .box_w = 15, .box_h = 84, .ofs_x = 39, .ofs_y = 1},
-    {.bitmap_index = 686, .adv_w = 863, .box_w = 49, .box_h = 86, .ofs_x = 5, .ofs_y = 0},
-    {.bitmap_index = 1213, .adv_w = 863, .box_w = 45, .box_h = 86, .ofs_x = 9, .ofs_y = 0},
-    {.bitmap_index = 1697, .adv_w = 863, .box_w = 46, .box_h = 84, .ofs_x = 8, .ofs_y = 1},
-    {.bitmap_index = 2180, .adv_w = 863, .box_w = 44, .box_h = 86, .ofs_x = 8, .ofs_y = 0},
-    {.bitmap_index = 2653, .adv_w = 863, .box_w = 47, .box_h = 86, .ofs_x = 5, .ofs_y = 0},
-    {.bitmap_index = 3159, .adv_w = 863, .box_w = 40, .box_h = 84, .ofs_x = 14, .ofs_y = 2},
-    {.bitmap_index = 3579, .adv_w = 863, .box_w = 49, .box_h = 86, .ofs_x = 5, .ofs_y = 0},
-    {.bitmap_index = 4106, .adv_w = 863, .box_w = 46, .box_h = 86, .ofs_x = 8, .ofs_y = 0},
-    {.bitmap_index = 4601, .adv_w = 323, .box_w = 13, .box_h = 48, .ofs_x = 6, .ofs_y = 19}
-};
-
-/*---------------------
- *  CHARACTER MAPPING
- *--------------------*/
-
-
-
-/*Collect the unicode lists and glyph_id offsets*/
-static const lv_font_fmt_txt_cmap_t cmaps[] =
-{
-    {
-        .range_start = 32, .range_length = 1, .glyph_id_start = 1,
-        .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
-    },
-    {
-        .range_start = 48, .range_length = 11, .glyph_id_start = 2,
-        .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
-    }
-};
-
-
-
-/*--------------------
- *  ALL CUSTOM DATA
- *--------------------*/
-
-#if LV_VERSION_CHECK(8, 0, 0)
-/*Store all the custom data of the font*/
-static  lv_font_fmt_txt_glyph_cache_t cache;
-static const lv_font_fmt_txt_dsc_t font_dsc = {
-#else
-static lv_font_fmt_txt_dsc_t font_dsc = {
-#endif
-    .glyph_bitmap = glyph_bitmap,
-    .glyph_dsc = glyph_dsc,
-    .cmaps = cmaps,
-    .kern_dsc = NULL,
-    .kern_scale = 0,
-    .cmap_num = 2,
-    .bpp = 1,
-    .kern_classes = 0,
-    .bitmap_format = 0,
-#if LV_VERSION_CHECK(8, 0, 0)
-    .cache = &cache
-#endif
-};
-
-
-/*-----------------
- *  PUBLIC FONT
- *----------------*/
-
-/*Initialize a public general font descriptor*/
-#if LV_VERSION_CHECK(8, 0, 0)
-const lv_font_t lv_font_7segment_115 = {
-#else
-lv_font_t lv_font_7segment_115 = {
-#endif
-    .get_glyph_dsc = lv_font_get_glyph_dsc_fmt_txt,    /*Function pointer to get glyph's data*/
-    .get_glyph_bitmap = lv_font_get_bitmap_fmt_txt,    /*Function pointer to get glyph's bitmap*/
-    .line_height = 86,          /*The maximum line height required by the font*/
-    .base_line = 0,             /*Baseline measured from the bottom of the line*/
-#if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0)
-    .subpx = LV_FONT_SUBPX_NONE,
-#endif
-#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8
-    .underline_position = -7,
-    .underline_thickness = 4,
-#endif
-    .dsc = &font_dsc           /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */
-};
-
-
-
-#endif /*#if LV_FONT_7SEGMENT_115*/
-
diff --git a/src/displayapp/fonts/lv_font_7segment_40.c b/src/displayapp/fonts/lv_font_7segment_40.c
deleted file mode 100644
index ebcb1424..00000000
--- a/src/displayapp/fonts/lv_font_7segment_40.c
+++ /dev/null
@@ -1,228 +0,0 @@
-/*******************************************************************************
- * Size: 40 px
- * Bpp: 1
- * Opts: 
- ******************************************************************************/
-
-#ifdef LV_LVGL_H_INCLUDE_SIMPLE
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-#ifndef LV_FONT_7SEGMENT_40
-#define LV_FONT_7SEGMENT_40 1
-#endif
-
-#if LV_FONT_7SEGMENT_40
-
-/*-----------------
- *    BITMAPS
- *----------------*/
-
-/*Store the image of the glyphs*/
-static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
-    /* U+0020 " " */
-    0x0,
-
-    /* U+002D "-" */
-    0x3f, 0xc7, 0xff, 0x7f, 0xf3, 0xfc,
-
-    /* U+0030 "0" */
-    0x1f, 0xfc, 0x1f, 0xfb, 0x6f, 0xff, 0x77, 0xf7,
-    0x78, 0xf, 0x78, 0xf, 0x78, 0xf, 0x78, 0xf,
-    0x78, 0xf, 0x78, 0xf, 0x78, 0xf, 0x78, 0xf,
-    0x78, 0xf, 0x70, 0x7, 0x0, 0x0, 0x0, 0x0,
-    0xe0, 0x7, 0xf0, 0xf, 0xf0, 0xf, 0xf0, 0xf,
-    0xf0, 0xf, 0xf0, 0xf, 0xf0, 0xf, 0xf0, 0xf,
-    0xf0, 0xf, 0xf0, 0xf, 0xef, 0xef, 0xdf, 0xef,
-    0xbf, 0xfe, 0x3f, 0xf8,
-
-    /* U+0031 "1" */
-    0x11, 0xce, 0xf7, 0xbd, 0xef, 0x7b, 0xde, 0xf7,
-    0x9c, 0x0, 0x77, 0xbd, 0xef, 0x7b, 0xde, 0xf7,
-    0xbc, 0xe6, 0x20,
-
-    /* U+0032 "2" */
-    0x1f, 0xf8, 0x1f, 0xfa, 0xf, 0xf7, 0x7, 0xf7,
-    0x0, 0xf, 0x0, 0xf, 0x0, 0xf, 0x0, 0xf,
-    0x0, 0xf, 0x0, 0xf, 0x0, 0xf, 0x0, 0xf,
-    0x0, 0xf, 0xf, 0xf7, 0x1f, 0xf8, 0x1f, 0xf8,
-    0xef, 0xf0, 0xf0, 0x0, 0xf0, 0x0, 0xf0, 0x0,
-    0xf0, 0x0, 0xf0, 0x0, 0xf0, 0x0, 0xf0, 0x0,
-    0xf0, 0x0, 0xf0, 0x0, 0xef, 0xe0, 0xdf, 0xe0,
-    0x3f, 0xe0, 0x7f, 0xe0,
-
-    /* U+0033 "3" */
-    0x1f, 0xf8, 0x3f, 0xfe, 0x1f, 0xf7, 0xf, 0xf7,
-    0x0, 0xf, 0x0, 0xf, 0x0, 0xf, 0x0, 0xf,
-    0x0, 0xf, 0x0, 0xf, 0x0, 0xf, 0x0, 0xf,
-    0x0, 0xf, 0x1f, 0xf7, 0x3f, 0xf8, 0x3f, 0xf8,
-    0x1f, 0xe6, 0x0, 0x1e, 0x0, 0x1e, 0x0, 0x1e,
-    0x0, 0x1e, 0x0, 0x1e, 0x0, 0x1e, 0x0, 0x1e,
-    0x0, 0x1e, 0x0, 0x1e, 0x1f, 0xde, 0x3f, 0xee,
-    0x7f, 0xec, 0x7f, 0xe8,
-
-    /* U+0034 "4" */
-    0x0, 0x2, 0x40, 0x7, 0xe0, 0x7, 0xe0, 0xf,
-    0xf0, 0xf, 0xf0, 0xf, 0xf0, 0xf, 0xf0, 0xf,
-    0xf0, 0xf, 0xf0, 0xf, 0xf0, 0xf, 0xf0, 0xf,
-    0xf0, 0xf, 0xcf, 0xf7, 0x3f, 0xf8, 0x3f, 0xf8,
-    0x1f, 0xe6, 0x0, 0x1e, 0x0, 0x1e, 0x0, 0x1e,
-    0x0, 0x1e, 0x0, 0x1e, 0x0, 0x1e, 0x0, 0x1e,
-    0x0, 0x1e, 0x0, 0x1e, 0x0, 0x1e, 0x0, 0x1e,
-    0x0, 0xc, 0x0, 0x8,
-
-    /* U+0035 "5" */
-    0x1f, 0xf8, 0x7f, 0xf3, 0x7f, 0xc7, 0x7f, 0x8f,
-    0x0, 0x1e, 0x0, 0x3c, 0x0, 0x78, 0x0, 0xf0,
-    0x1, 0xe0, 0x3, 0xc0, 0x7, 0x80, 0xf, 0x0,
-    0x19, 0xfe, 0xf, 0xfe, 0x1f, 0xfc, 0x1f, 0xe6,
-    0x0, 0x3c, 0x0, 0x78, 0x0, 0xf0, 0x1, 0xe0,
-    0x3, 0xc0, 0x7, 0x80, 0xf, 0x0, 0x1e, 0x0,
-    0x3c, 0x7f, 0x79, 0xff, 0x77, 0xfe, 0xcf, 0xfd,
-    0x0,
-
-    /* U+0036 "6" */
-    0x1f, 0xfc, 0x1f, 0xfc, 0x6f, 0xf8, 0x77, 0xf8,
-    0x78, 0x0, 0x78, 0x0, 0x78, 0x0, 0x78, 0x0,
-    0x78, 0x0, 0x78, 0x0, 0x78, 0x0, 0x78, 0x0,
-    0x78, 0x0, 0x67, 0xf8, 0x1f, 0xfc, 0x1f, 0xfc,
-    0xef, 0xf3, 0xf0, 0xf, 0xf0, 0xf, 0xf0, 0xf,
-    0xf0, 0xf, 0xf0, 0xf, 0xf0, 0xf, 0xf0, 0xf,
-    0xf0, 0xf, 0xf0, 0xf, 0xef, 0xef, 0xdf, 0xf7,
-    0xbf, 0xf6, 0x3f, 0xf4,
-
-    /* U+0037 "7" */
-    0x7f, 0xe3, 0xff, 0xa7, 0xfd, 0xcf, 0xf7, 0x0,
-    0x3c, 0x0, 0xf0, 0x3, 0xc0, 0xf, 0x0, 0x3c,
-    0x0, 0xf0, 0x3, 0xc0, 0xf, 0x0, 0x3c, 0x0,
-    0x70, 0x0, 0x80, 0x0, 0x0, 0x18, 0x0, 0xe0,
-    0x7, 0x80, 0x1e, 0x0, 0x78, 0x1, 0xe0, 0x7,
-    0x80, 0x1e, 0x0, 0x78, 0x1, 0xe0, 0x7, 0x80,
-    0x1e, 0x0, 0x38, 0x0, 0xc0,
-
-    /* U+0038 "8" */
-    0x1f, 0xfc, 0x1f, 0xfb, 0x6f, 0xff, 0x77, 0xf7,
-    0x78, 0xf, 0x78, 0xf, 0x78, 0xf, 0x78, 0xf,
-    0x78, 0xf, 0x78, 0xf, 0x78, 0xf, 0x78, 0xf,
-    0x78, 0xf, 0x67, 0xff, 0x1f, 0xfc, 0x1f, 0xfc,
-    0xef, 0xf7, 0xf0, 0xf, 0xf0, 0xf, 0xf0, 0xf,
-    0xf0, 0xf, 0xf0, 0xf, 0xf0, 0xf, 0xf0, 0xf,
-    0xf0, 0xf, 0xf0, 0xf, 0xef, 0xef, 0xdf, 0xef,
-    0xbf, 0xfe, 0x3f, 0xf8,
-
-    /* U+0039 "9" */
-    0x1f, 0xf8, 0x3f, 0xfe, 0xdf, 0xf7, 0xef, 0xf7,
-    0xf0, 0xf, 0xf0, 0xf, 0xf0, 0xf, 0xf0, 0xf,
-    0xf0, 0xf, 0xf0, 0xf, 0xf0, 0xf, 0xf0, 0xf,
-    0xf0, 0xf, 0xcf, 0xf7, 0x3f, 0xf8, 0x3f, 0xf8,
-    0x1f, 0xe6, 0x0, 0x1e, 0x0, 0x1e, 0x0, 0x1e,
-    0x0, 0x1e, 0x0, 0x1e, 0x0, 0x1e, 0x0, 0x1e,
-    0x0, 0x1e, 0x0, 0x1e, 0x1f, 0xde, 0x3f, 0xee,
-    0x7f, 0xec, 0x7f, 0xe8,
-
-    /* U+003A ":" */
-    0x7b, 0xde, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0,
-    0x7b, 0xde, 0xf0
-};
-
-
-/*---------------------
- *  GLYPH DESCRIPTION
- *--------------------*/
-
-static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
-    {.bitmap_index = 0, .adv_w = 0, .box_w = 0, .box_h = 0, .ofs_x = 0, .ofs_y = 0} /* id = 0 reserved */,
-    {.bitmap_index = 0, .adv_w = 300, .box_w = 1, .box_h = 1, .ofs_x = 0, .ofs_y = 0},
-    {.bitmap_index = 1, .adv_w = 300, .box_w = 12, .box_h = 4, .ofs_x = 4, .ofs_y = 13},
-    {.bitmap_index = 7, .adv_w = 300, .box_w = 16, .box_h = 30, .ofs_x = 2, .ofs_y = 0},
-    {.bitmap_index = 67, .adv_w = 300, .box_w = 5, .box_h = 30, .ofs_x = 14, .ofs_y = 0},
-    {.bitmap_index = 86, .adv_w = 300, .box_w = 16, .box_h = 30, .ofs_x = 2, .ofs_y = 0},
-    {.bitmap_index = 146, .adv_w = 300, .box_w = 16, .box_h = 30, .ofs_x = 3, .ofs_y = 0},
-    {.bitmap_index = 206, .adv_w = 300, .box_w = 16, .box_h = 30, .ofs_x = 3, .ofs_y = 0},
-    {.bitmap_index = 266, .adv_w = 300, .box_w = 15, .box_h = 30, .ofs_x = 3, .ofs_y = 0},
-    {.bitmap_index = 323, .adv_w = 300, .box_w = 16, .box_h = 30, .ofs_x = 2, .ofs_y = 0},
-    {.bitmap_index = 383, .adv_w = 300, .box_w = 14, .box_h = 30, .ofs_x = 5, .ofs_y = 0},
-    {.bitmap_index = 436, .adv_w = 300, .box_w = 16, .box_h = 30, .ofs_x = 2, .ofs_y = 0},
-    {.bitmap_index = 496, .adv_w = 300, .box_w = 16, .box_h = 30, .ofs_x = 3, .ofs_y = 0},
-    {.bitmap_index = 556, .adv_w = 113, .box_w = 5, .box_h = 17, .ofs_x = 2, .ofs_y = 7}
-};
-
-/*---------------------
- *  CHARACTER MAPPING
- *--------------------*/
-
-static const uint16_t unicode_list_0[] = {
-    0x0, 0xd
-};
-
-/*Collect the unicode lists and glyph_id offsets*/
-static const lv_font_fmt_txt_cmap_t cmaps[] =
-{
-    {
-        .range_start = 32, .range_length = 14, .glyph_id_start = 1,
-        .unicode_list = unicode_list_0, .glyph_id_ofs_list = NULL, .list_length = 2, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY
-    },
-    {
-        .range_start = 48, .range_length = 11, .glyph_id_start = 3,
-        .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY
-    }
-};
-
-
-
-/*--------------------
- *  ALL CUSTOM DATA
- *--------------------*/
-
-#if LV_VERSION_CHECK(8, 0, 0)
-/*Store all the custom data of the font*/
-static  lv_font_fmt_txt_glyph_cache_t cache;
-static const lv_font_fmt_txt_dsc_t font_dsc = {
-#else
-static lv_font_fmt_txt_dsc_t font_dsc = {
-#endif
-    .glyph_bitmap = glyph_bitmap,
-    .glyph_dsc = glyph_dsc,
-    .cmaps = cmaps,
-    .kern_dsc = NULL,
-    .kern_scale = 0,
-    .cmap_num = 2,
-    .bpp = 1,
-    .kern_classes = 0,
-    .bitmap_format = 0,
-#if LV_VERSION_CHECK(8, 0, 0)
-    .cache = &cache
-#endif
-};
-
-
-/*-----------------
- *  PUBLIC FONT
- *----------------*/
-
-/*Initialize a public general font descriptor*/
-#if LV_VERSION_CHECK(8, 0, 0)
-const lv_font_t lv_font_7segment_40 = {
-#else
-lv_font_t lv_font_7segment_40 = {
-#endif
-    .get_glyph_dsc = lv_font_get_glyph_dsc_fmt_txt,    /*Function pointer to get glyph's data*/
-    .get_glyph_bitmap = lv_font_get_bitmap_fmt_txt,    /*Function pointer to get glyph's bitmap*/
-    .line_height = 30,          /*The maximum line height required by the font*/
-    .base_line = 0,             /*Baseline measured from the bottom of the line*/
-#if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0)
-    .subpx = LV_FONT_SUBPX_NONE,
-#endif
-#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8
-    .underline_position = -2,
-    .underline_thickness = 1,
-#endif
-    .dsc = &font_dsc           /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */
-};
-
-
-
-#endif /*#if LV_FONT_7SEGMENT_40*/
-
diff --git a/src/displayapp/fonts/lv_font_dots_40.c b/src/displayapp/fonts/lv_font_dots_40.c
deleted file mode 100644
index 921ff085..00000000
--- a/src/displayapp/fonts/lv_font_dots_40.c
+++ /dev/null
@@ -1,410 +0,0 @@
-/*******************************************************************************
- * Size: 40 px
- * Bpp: 1
- * Opts: 
- ******************************************************************************/
-
-#ifdef LV_LVGL_H_INCLUDE_SIMPLE
-#include "lvgl.h"
-#else
-#include "lvgl/lvgl.h"
-#endif
-
-#ifndef LV_FONT_DOTS_40
-#define LV_FONT_DOTS_40 1
-#endif
-
-#if LV_FONT_DOTS_40
-
-/*-----------------
- *    BITMAPS
- *----------------*/
-
-/*Store the image of the glyphs*/
-static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
-    /* U+0020 " " */
-    0x0,
-
-    /* U+002D "-" */
-    0xee, 0xfd, 0xdf, 0xbb, 0x80,
-
-    /* U+0030 "0" */
-    0xe, 0xee, 0x1, 0xdd, 0xc0, 0x3b, 0xb8, 0x0,
-    0x0, 0xe, 0x0, 0xf, 0xc0, 0x1, 0xf8, 0x0,
-    0x38, 0x0, 0x0, 0xe0, 0x0, 0xfc, 0x0, 0x1f,
-    0x80, 0x3, 0x80, 0x0, 0xe, 0x0, 0xf, 0xc0,
-    0x1, 0xf8, 0x0, 0x38, 0x0, 0x0, 0xe0, 0x0,
-    0xfc, 0x0, 0x1f, 0x80, 0x3, 0x80, 0x0, 0xe,
-    0x0, 0xf, 0xc0, 0x1, 0xf8, 0x0, 0x38, 0x0,
-    0x0, 0xe, 0xee, 0x1, 0xdd, 0xc0, 0x3b, 0xb8,
-    0x0,
-
-    /* U+0031 "1" */
-    0xe, 0x1, 0xc0, 0x38, 0x0, 0xe, 0xe1, 0xdc,
-    0x3b, 0x80, 0x0, 0xe, 0x1, 0xc0, 0x38, 0x0,
-    0x0, 0xe0, 0x1c, 0x3, 0x80, 0x0, 0xe, 0x1,
-    0xc0, 0x38, 0x0, 0x0, 0xe0, 0x1c, 0x3, 0x80,
-    0x0, 0xee, 0xfd, 0xdf, 0xbb, 0x80,
-
-    /* U+0032 "2" */
-    0xe, 0xee, 0x1, 0xdd, 0xc0, 0x3b, 0xb8, 0x0,
-    0x0, 0xe, 0x0, 0xf, 0xc0, 0x1, 0xf8, 0x0,
-    0x38, 0x0, 0x0, 0x0, 0x0, 0xe0, 0x0, 0x1c,
-    0x0, 0x3, 0x80, 0x0, 0x0, 0x0, 0xe0, 0x0,
-    0x1c, 0x0, 0x3, 0x80, 0x0, 0x0, 0x0, 0xe0,
-    0x0, 0x1c, 0x0, 0x3, 0x80, 0x0, 0x0, 0x0,
-    0xe0, 0x0, 0x1c, 0x0, 0x3, 0x80, 0x0, 0x0,
-    0x0, 0xee, 0xee, 0xfd, 0xdd, 0xdf, 0xbb, 0xbb,
-    0x80,
-
-    /* U+0033 "3" */
-    0xe, 0xee, 0x1, 0xdd, 0xc0, 0x3b, 0xb8, 0x0,
-    0x0, 0xe, 0x0, 0xf, 0xc0, 0x1, 0xf8, 0x0,
-    0x38, 0x0, 0x0, 0x0, 0x0, 0xe0, 0x0, 0x1c,
-    0x0, 0x3, 0x80, 0x0, 0x0, 0xee, 0xe0, 0x1d,
-    0xdc, 0x3, 0xbb, 0x80, 0x0, 0x0, 0x0, 0x0,
-    0xe0, 0x0, 0x1c, 0x0, 0x3, 0x80, 0x0, 0xe,
-    0x0, 0xf, 0xc0, 0x1, 0xf8, 0x0, 0x38, 0x0,
-    0x0, 0xe, 0xee, 0x1, 0xdd, 0xc0, 0x3b, 0xb8,
-    0x0,
-
-    /* U+0034 "4" */
-    0x0, 0xe, 0x0, 0x1, 0xc0, 0x0, 0x38, 0x0,
-    0x0, 0x0, 0xe, 0xe0, 0x1, 0xdc, 0x0, 0x3b,
-    0x80, 0x0, 0x0, 0xe, 0xe, 0x1, 0xc1, 0xc0,
-    0x38, 0x38, 0x0, 0x0, 0xe, 0x0, 0xe1, 0xc0,
-    0x1c, 0x38, 0x3, 0x80, 0x0, 0x0, 0xee, 0xee,
-    0xfd, 0xdd, 0xdf, 0xbb, 0xbb, 0x80, 0x0, 0x0,
-    0x0, 0xe0, 0x0, 0x1c, 0x0, 0x3, 0x80, 0x0,
-    0x0, 0x0, 0xe, 0x0, 0x1, 0xc0, 0x0, 0x38,
-    0x0,
-
-    /* U+0035 "5" */
-    0xee, 0xee, 0xfd, 0xdd, 0xdf, 0xbb, 0xbb, 0x80,
-    0x0, 0xe, 0x0, 0x1, 0xc0, 0x0, 0x38, 0x0,
-    0x0, 0x0, 0x0, 0xee, 0xee, 0x1d, 0xdd, 0xc3,
-    0xbb, 0xb8, 0x0, 0x0, 0x0, 0x0, 0xe, 0x0,
-    0x1, 0xc0, 0x0, 0x38, 0x0, 0x0, 0x0, 0x0,
-    0xe0, 0x0, 0x1c, 0x0, 0x3, 0x80, 0x0, 0xe,
-    0x0, 0xf, 0xc0, 0x1, 0xf8, 0x0, 0x38, 0x0,
-    0x0, 0xe, 0xee, 0x1, 0xdd, 0xc0, 0x3b, 0xb8,
-    0x0,
-
-    /* U+0036 "6" */
-    0x0, 0xee, 0x0, 0x1d, 0xc0, 0x3, 0xb8, 0x0,
-    0x0, 0x0, 0xe0, 0x0, 0x1c, 0x0, 0x3, 0x80,
-    0x0, 0x0, 0x0, 0xe0, 0x0, 0x1c, 0x0, 0x3,
-    0x80, 0x0, 0x0, 0x0, 0xe, 0xee, 0xe1, 0xdd,
-    0xdc, 0x3b, 0xbb, 0x80, 0x0, 0x0, 0xe0, 0x0,
-    0xfc, 0x0, 0x1f, 0x80, 0x3, 0x80, 0x0, 0xe,
-    0x0, 0xf, 0xc0, 0x1, 0xf8, 0x0, 0x38, 0x0,
-    0x0, 0xe, 0xee, 0x1, 0xdd, 0xc0, 0x3b, 0xb8,
-    0x0,
-
-    /* U+0037 "7" */
-    0xee, 0xee, 0xfd, 0xdd, 0xdf, 0xbb, 0xbb, 0x80,
-    0x0, 0x0, 0x0, 0xe, 0x0, 0x1, 0xc0, 0x0,
-    0x38, 0x0, 0x0, 0x0, 0xe, 0x0, 0x1, 0xc0,
-    0x0, 0x38, 0x0, 0x0, 0x0, 0xe, 0x0, 0x1,
-    0xc0, 0x0, 0x38, 0x0, 0x0, 0x0, 0xe, 0x0,
-    0x1, 0xc0, 0x0, 0x38, 0x0, 0x0, 0x0, 0xe,
-    0x0, 0x1, 0xc0, 0x0, 0x38, 0x0, 0x0, 0x0,
-    0x0, 0xe0, 0x0, 0x1c, 0x0, 0x3, 0x80, 0x0,
-    0x0,
-
-    /* U+0038 "8" */
-    0xe, 0xee, 0x1, 0xdd, 0xc0, 0x3b, 0xb8, 0x0,
-    0x0, 0xe, 0x0, 0xf, 0xc0, 0x1, 0xf8, 0x0,
-    0x38, 0x0, 0x0, 0xe0, 0x0, 0xfc, 0x0, 0x1f,
-    0x80, 0x3, 0x80, 0x0, 0x0, 0xee, 0xe0, 0x1d,
-    0xdc, 0x3, 0xbb, 0x80, 0x0, 0x0, 0xe0, 0x0,
-    0xfc, 0x0, 0x1f, 0x80, 0x3, 0x80, 0x0, 0xe,
-    0x0, 0xf, 0xc0, 0x1, 0xf8, 0x0, 0x38, 0x0,
-    0x0, 0xe, 0xee, 0x1, 0xdd, 0xc0, 0x3b, 0xb8,
-    0x0,
-
-    /* U+0039 "9" */
-    0xe, 0xee, 0x1, 0xdd, 0xc0, 0x3b, 0xb8, 0x0,
-    0x0, 0xe, 0x0, 0xf, 0xc0, 0x1, 0xf8, 0x0,
-    0x38, 0x0, 0x0, 0xe0, 0x0, 0xfc, 0x0, 0x1f,
-    0x80, 0x3, 0x80, 0x0, 0x0, 0xee, 0xee, 0x1d,
-    0xdd, 0xc3, 0xbb, 0xb8, 0x0, 0x0, 0x0, 0x0,
-    0xe0, 0x0, 0x1c, 0x0, 0x3, 0x80, 0x0, 0x0,
-    0x0, 0xe0, 0x0, 0x1c, 0x0, 0x3, 0x80, 0x0,
-    0x0, 0xe, 0xe0, 0x1, 0xdc, 0x0, 0x3b, 0x80,
-    0x0,
-
-    /* U+0041 "A" */
-    0xe, 0xee, 0x1, 0xdd, 0xc0, 0x3b, 0xb8, 0x0,
-    0x0, 0xe, 0x0, 0xf, 0xc0, 0x1, 0xf8, 0x0,
-    0x38, 0x0, 0x0, 0xe0, 0x0, 0xfc, 0x0, 0x1f,
-    0x80, 0x3, 0x80, 0x0, 0xe, 0xee, 0xef, 0xdd,
-    0xdd, 0xfb, 0xbb, 0xb8, 0x0, 0x0, 0xe0, 0x0,
-    0xfc, 0x0, 0x1f, 0x80, 0x3, 0x80, 0x0, 0xe,
-    0x0, 0xf, 0xc0, 0x1, 0xf8, 0x0, 0x38, 0x0,
-    0x0, 0xe0, 0x0, 0xfc, 0x0, 0x1f, 0x80, 0x3,
-    0x80,
-
-    /* U+0044 "D" */
-    0xee, 0xee, 0x1d, 0xdd, 0xc3, 0xbb, 0xb8, 0x0,
-    0x0, 0xe, 0x0, 0xf, 0xc0, 0x1, 0xf8, 0x0,
-    0x38, 0x0, 0x0, 0xe0, 0x0, 0xfc, 0x0, 0x1f,
-    0x80, 0x3, 0x80, 0x0, 0xe, 0x0, 0xf, 0xc0,
-    0x1, 0xf8, 0x0, 0x38, 0x0, 0x0, 0xe0, 0x0,
-    0xfc, 0x0, 0x1f, 0x80, 0x3, 0x80, 0x0, 0xe,
-    0x0, 0xf, 0xc0, 0x1, 0xf8, 0x0, 0x38, 0x0,
-    0x0, 0xee, 0xee, 0x1d, 0xdd, 0xc3, 0xbb, 0xb8,
-    0x0,
-
-    /* U+0045 "E" */
-    0xee, 0xee, 0xfd, 0xdd, 0xdf, 0xbb, 0xbb, 0x80,
-    0x0, 0xe, 0x0, 0x1, 0xc0, 0x0, 0x38, 0x0,
-    0x0, 0x0, 0x0, 0xe0, 0x0, 0x1c, 0x0, 0x3,
-    0x80, 0x0, 0x0, 0x0, 0xe, 0xee, 0xef, 0xdd,
-    0xdd, 0xfb, 0xbb, 0xb8, 0x0, 0x0, 0xe0, 0x0,
-    0x1c, 0x0, 0x3, 0x80, 0x0, 0x0, 0x0, 0xe,
-    0x0, 0x1, 0xc0, 0x0, 0x38, 0x0, 0x0, 0x0,
-    0x0, 0xee, 0xee, 0xfd, 0xdd, 0xdf, 0xbb, 0xbb,
-    0x80,
-
-    /* U+0046 "F" */
-    0xee, 0xee, 0xfd, 0xdd, 0xdf, 0xbb, 0xbb, 0x80,
-    0x0, 0xe, 0x0, 0x1, 0xc0, 0x0, 0x38, 0x0,
-    0x0, 0x0, 0x0, 0xe0, 0x0, 0x1c, 0x0, 0x3,
-    0x80, 0x0, 0x0, 0x0, 0xe, 0xee, 0xef, 0xdd,
-    0xdd, 0xfb, 0xbb, 0xb8, 0x0, 0x0, 0xe0, 0x0,
-    0x1c, 0x0, 0x3, 0x80, 0x0, 0x0, 0x0, 0xe,
-    0x0, 0x1, 0xc0, 0x0, 0x38, 0x0, 0x0, 0x0,
-    0x0, 0xe0, 0x0, 0x1c, 0x0, 0x3, 0x80, 0x0,
-    0x0,
-
-    /* U+0048 "H" */
-    0xe0, 0x0, 0xfc, 0x0, 0x1f, 0x80, 0x3, 0x80,
-    0x0, 0xe, 0x0, 0xf, 0xc0, 0x1, 0xf8, 0x0,
-    0x38, 0x0, 0x0, 0xe0, 0x0, 0xfc, 0x0, 0x1f,
-    0x80, 0x3, 0x80, 0x0, 0xe, 0xee, 0xef, 0xdd,
-    0xdd, 0xfb, 0xbb, 0xb8, 0x0, 0x0, 0xe0, 0x0,
-    0xfc, 0x0, 0x1f, 0x80, 0x3, 0x80, 0x0, 0xe,
-    0x0, 0xf, 0xc0, 0x1, 0xf8, 0x0, 0x38, 0x0,
-    0x0, 0xe0, 0x0, 0xfc, 0x0, 0x1f, 0x80, 0x3,
-    0x80,
-
-    /* U+0049 "I" */
-    0xee, 0xfd, 0xdf, 0xbb, 0x80, 0x0, 0xe0, 0x1c,
-    0x3, 0x80, 0x0, 0xe, 0x1, 0xc0, 0x38, 0x0,
-    0x0, 0xe0, 0x1c, 0x3, 0x80, 0x0, 0xe, 0x1,
-    0xc0, 0x38, 0x0, 0x0, 0xe0, 0x1c, 0x3, 0x80,
-    0x0, 0xee, 0xfd, 0xdf, 0xbb, 0x80,
-
-    /* U+004B "K" */
-    0xe0, 0x0, 0xfc, 0x0, 0x1f, 0x80, 0x3, 0x80,
-    0x0, 0xe, 0x0, 0xe1, 0xc0, 0x1c, 0x38, 0x3,
-    0x80, 0x0, 0x0, 0xe0, 0xe0, 0x1c, 0x1c, 0x3,
-    0x83, 0x80, 0x0, 0x0, 0xe, 0xe0, 0x1, 0xdc,
-    0x0, 0x3b, 0x80, 0x0, 0x0, 0x0, 0xe0, 0xe0,
-    0x1c, 0x1c, 0x3, 0x83, 0x80, 0x0, 0x0, 0xe,
-    0x0, 0xe1, 0xc0, 0x1c, 0x38, 0x3, 0x80, 0x0,
-    0x0, 0xe0, 0x0, 0xfc, 0x0, 0x1f, 0x80, 0x3,
-    0x80,
-
-    /* U+004D "M" */
-    0xe0, 0x0, 0xfc, 0x0, 0x1f, 0x80, 0x3, 0x80,
-    0x0, 0xe, 0xe0, 0xef, 0xdc, 0x1d, 0xfb, 0x83,
-    0xb8, 0x0, 0x0, 0xe0, 0xe0, 0xfc, 0x1c, 0x1f,
-    0x83, 0x83, 0x80, 0x0, 0xe, 0xe, 0xf, 0xc1,
-    0xc1, 0xf8, 0x38, 0x38, 0x0, 0x0, 0xe0, 0x0,
-    0xfc, 0x0, 0x1f, 0x80, 0x3, 0x80, 0x0, 0xe,
-    0x0, 0xf, 0xc0, 0x1, 0xf8, 0x0, 0x38, 0x0,
-    0x0, 0xe0, 0x0, 0xfc, 0x0, 0x1f, 0x80, 0x3,
-    0x80,
-
-    /* U+004E "N" */
-    0xe0, 0x0, 0xfc, 0x0, 0x1f, 0x80, 0x3, 0x80,
-    0x0, 0xe, 0xe0, 0xf, 0xdc, 0x1, 0xfb, 0x80,
-    0x38, 0x0, 0x0, 0xe0, 0xe0, 0xfc, 0x1c, 0x1f,
-    0x83, 0x83, 0x80, 0x0, 0xe, 0x0, 0xef, 0xc0,
-    0x1d, 0xf8, 0x3, 0xb8, 0x0, 0x0, 0xe0, 0x0,
-    0xfc, 0x0, 0x1f, 0x80, 0x3, 0x80, 0x0, 0xe,
-    0x0, 0xf, 0xc0, 0x1, 0xf8, 0x0, 0x38, 0x0,
-    0x0, 0xe0, 0x0, 0xfc, 0x0, 0x1f, 0x80, 0x3,
-    0x80,
-
-    /* U+004F "O" */
-    0xe, 0xee, 0x1, 0xdd, 0xc0, 0x3b, 0xb8, 0x0,
-    0x0, 0xe, 0x0, 0xf, 0xc0, 0x1, 0xf8, 0x0,
-    0x38, 0x0, 0x0, 0xe0, 0x0, 0xfc, 0x0, 0x1f,
-    0x80, 0x3, 0x80, 0x0, 0xe, 0x0, 0xf, 0xc0,
-    0x1, 0xf8, 0x0, 0x38, 0x0, 0x0, 0xe0, 0x0,
-    0xfc, 0x0, 0x1f, 0x80, 0x3, 0x80, 0x0, 0xe,
-    0x0, 0xf, 0xc0, 0x1, 0xf8, 0x0, 0x38, 0x0,
-    0x0, 0xe, 0xee, 0x1, 0xdd, 0xc0, 0x3b, 0xb8,
-    0x0,
-
-    /* U+0052 "R" */
-    0xee, 0xee, 0x1d, 0xdd, 0xc3, 0xbb, 0xb8, 0x0,
-    0x0, 0xe, 0x0, 0xf, 0xc0, 0x1, 0xf8, 0x0,
-    0x38, 0x0, 0x0, 0xe0, 0x0, 0xfc, 0x0, 0x1f,
-    0x80, 0x3, 0x80, 0x0, 0xe, 0xee, 0xe1, 0xdd,
-    0xdc, 0x3b, 0xbb, 0x80, 0x0, 0x0, 0xe0, 0x0,
-    0xfc, 0x0, 0x1f, 0x80, 0x3, 0x80, 0x0, 0xe,
-    0x0, 0xf, 0xc0, 0x1, 0xf8, 0x0, 0x38, 0x0,
-    0x0, 0xe0, 0x0, 0xfc, 0x0, 0x1f, 0x80, 0x3,
-    0x80,
-
-    /* U+0053 "S" */
-    0xe, 0xee, 0x1, 0xdd, 0xc0, 0x3b, 0xb8, 0x0,
-    0x0, 0xe, 0x0, 0xf, 0xc0, 0x1, 0xf8, 0x0,
-    0x38, 0x0, 0x0, 0xe0, 0x0, 0x1c, 0x0, 0x3,
-    0x80, 0x0, 0x0, 0x0, 0x0, 0xee, 0xe0, 0x1d,
-    0xdc, 0x3, 0xbb, 0x80, 0x0, 0x0, 0x0, 0x0,
-    0xe0, 0x0, 0x1c, 0x0, 0x3, 0x80, 0x0, 0xe,
-    0x0, 0xf, 0xc0, 0x1, 0xf8, 0x0, 0x38, 0x0,
-    0x0, 0xe, 0xee, 0x1, 0xdd, 0xc0, 0x3b, 0xb8,
-    0x0,
-
-    /* U+0054 "T" */
-    0xee, 0xee, 0xfd, 0xdd, 0xdf, 0xbb, 0xbb, 0x80,
-    0x0, 0x0, 0xe, 0x0, 0x1, 0xc0, 0x0, 0x38,
-    0x0, 0x0, 0x0, 0x0, 0xe0, 0x0, 0x1c, 0x0,
-    0x3, 0x80, 0x0, 0x0, 0x0, 0xe, 0x0, 0x1,
-    0xc0, 0x0, 0x38, 0x0, 0x0, 0x0, 0x0, 0xe0,
-    0x0, 0x1c, 0x0, 0x3, 0x80, 0x0, 0x0, 0x0,
-    0xe, 0x0, 0x1, 0xc0, 0x0, 0x38, 0x0, 0x0,
-    0x0, 0x0, 0xe0, 0x0, 0x1c, 0x0, 0x3, 0x80,
-    0x0,
-
-    /* U+0055 "U" */
-    0xe0, 0x0, 0xfc, 0x0, 0x1f, 0x80, 0x3, 0x80,
-    0x0, 0xe, 0x0, 0xf, 0xc0, 0x1, 0xf8, 0x0,
-    0x38, 0x0, 0x0, 0xe0, 0x0, 0xfc, 0x0, 0x1f,
-    0x80, 0x3, 0x80, 0x0, 0xe, 0x0, 0xf, 0xc0,
-    0x1, 0xf8, 0x0, 0x38, 0x0, 0x0, 0xe0, 0x0,
-    0xfc, 0x0, 0x1f, 0x80, 0x3, 0x80, 0x0, 0xe,
-    0x0, 0xf, 0xc0, 0x1, 0xf8, 0x0, 0x38, 0x0,
-    0x0, 0xe, 0xee, 0x1, 0xdd, 0xc0, 0x3b, 0xb8,
-    0x0,
-
-    /* U+0057 "W" */
-    0xe0, 0x0, 0xfc, 0x0, 0x1f, 0x80, 0x3, 0x80,
-    0x0, 0xe, 0x0, 0xf, 0xc0, 0x1, 0xf8, 0x0,
-    0x38, 0x0, 0x0, 0xe0, 0x0, 0xfc, 0x0, 0x1f,
-    0x80, 0x3, 0x80, 0x0, 0xe, 0xe, 0xf, 0xc1,
-    0xc1, 0xf8, 0x38, 0x38, 0x0, 0x0, 0xe0, 0xe0,
-    0xfc, 0x1c, 0x1f, 0x83, 0x83, 0x80, 0x0, 0xe,
-    0xe0, 0xef, 0xdc, 0x1d, 0xfb, 0x83, 0xb8, 0x0,
-    0x0, 0xe0, 0x0, 0xfc, 0x0, 0x1f, 0x80, 0x3,
-    0x80
-};
-
-
-/*---------------------
- *  GLYPH DESCRIPTION
- *--------------------*/
-
-static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
-    {.bitmap_index = 0, .adv_w = 0, .box_w = 0, .box_h = 0, .ofs_x = 0, .ofs_y = 0} /* id = 0 reserved */,
-    {.bitmap_index = 0, .adv_w = 353, .box_w = 1, .box_h = 1, .ofs_x = 0, .ofs_y = 0},
-    {.bitmap_index = 1, .adv_w = 353, .box_w = 11, .box_h = 3, .ofs_x = 5, .ofs_y = 8},
-    {.bitmap_index = 6, .adv_w = 353, .box_w = 19, .box_h = 27, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 71, .adv_w = 353, .box_w = 11, .box_h = 27, .ofs_x = 5, .ofs_y = 0},
-    {.bitmap_index = 109, .adv_w = 353, .box_w = 19, .box_h = 27, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 174, .adv_w = 353, .box_w = 19, .box_h = 27, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 239, .adv_w = 353, .box_w = 19, .box_h = 27, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 304, .adv_w = 353, .box_w = 19, .box_h = 27, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 369, .adv_w = 353, .box_w = 19, .box_h = 27, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 434, .adv_w = 353, .box_w = 19, .box_h = 27, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 499, .adv_w = 353, .box_w = 19, .box_h = 27, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 564, .adv_w = 353, .box_w = 19, .box_h = 27, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 629, .adv_w = 353, .box_w = 19, .box_h = 27, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 694, .adv_w = 353, .box_w = 19, .box_h = 27, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 759, .adv_w = 353, .box_w = 19, .box_h = 27, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 824, .adv_w = 353, .box_w = 19, .box_h = 27, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 889, .adv_w = 353, .box_w = 19, .box_h = 27, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 954, .adv_w = 353, .box_w = 11, .box_h = 27, .ofs_x = 5, .ofs_y = 0},
-    {.bitmap_index = 992, .adv_w = 353, .box_w = 19, .box_h = 27, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 1057, .adv_w = 353, .box_w = 19, .box_h = 27, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 1122, .adv_w = 353, .box_w = 19, .box_h = 27, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 1187, .adv_w = 353, .box_w = 19, .box_h = 27, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 1252, .adv_w = 353, .box_w = 19, .box_h = 27, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 1317, .adv_w = 353, .box_w = 19, .box_h = 27, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 1382, .adv_w = 353, .box_w = 19, .box_h = 27, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 1447, .adv_w = 353, .box_w = 19, .box_h = 27, .ofs_x = 1, .ofs_y = 0},
-    {.bitmap_index = 1512, .adv_w = 353, .box_w = 19, .box_h = 27, .ofs_x = 1, .ofs_y = 0}
-};
-
-/*---------------------
- *  CHARACTER MAPPING
- *--------------------*/
-
-static const uint16_t unicode_list_0[] = {
-    0x0, 0xd, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15,
-    0x16, 0x17, 0x18, 0x19, 0x21, 0x24, 0x25, 0x26,
-    0x28, 0x29, 0x2b, 0x2d, 0x2e, 0x2f, 0x32, 0x33,
-    0x34, 0x35, 0x37
-};
-
-/*Collect the unicode lists and glyph_id offsets*/
-static const lv_font_fmt_txt_cmap_t cmaps[] =
-{
-    {
-        .range_start = 32, .range_length = 56, .glyph_id_start = 1,
-        .unicode_list = unicode_list_0, .glyph_id_ofs_list = NULL, .list_length = 27, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY
-    }
-};
-
-
-
-/*--------------------
- *  ALL CUSTOM DATA
- *--------------------*/
-
-#if LV_VERSION_CHECK(8, 0, 0)
-/*Store all the custom data of the font*/
-static  lv_font_fmt_txt_glyph_cache_t cache;
-static const lv_font_fmt_txt_dsc_t font_dsc = {
-#else
-static lv_font_fmt_txt_dsc_t font_dsc = {
-#endif
-    .glyph_bitmap = glyph_bitmap,
-    .glyph_dsc = glyph_dsc,
-    .cmaps = cmaps,
-    .kern_dsc = NULL,
-    .kern_scale = 0,
-    .cmap_num = 1,
-    .bpp = 1,
-    .kern_classes = 0,
-    .bitmap_format = 0,
-#if LV_VERSION_CHECK(8, 0, 0)
-    .cache = &cache
-#endif
-};
-
-
-/*-----------------
- *  PUBLIC FONT
- *----------------*/
-
-/*Initialize a public general font descriptor*/
-#if LV_VERSION_CHECK(8, 0, 0)
-const lv_font_t lv_font_dots_40 = {
-#else
-lv_font_t lv_font_dots_40 = {
-#endif
-    .get_glyph_dsc = lv_font_get_glyph_dsc_fmt_txt,    /*Function pointer to get glyph's data*/
-    .get_glyph_bitmap = lv_font_get_bitmap_fmt_txt,    /*Function pointer to get glyph's bitmap*/
-    .line_height = 27,          /*The maximum line height required by the font*/
-    .base_line = 0,             /*Baseline measured from the bottom of the line*/
-#if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0)
-    .subpx = LV_FONT_SUBPX_NONE,
-#endif
-#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8
-    .underline_position = -5,
-    .underline_thickness = 1,
-#endif
-    .dsc = &font_dsc           /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */
-};
-
-
-
-#endif /*#if LV_FONT_DOTS_40*/
-

From 26af507e165dc6eab54260570437a8d411aca880 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Milants?= <jf@codingfield.com>
Date: Wed, 28 Sep 2022 21:09:00 +0200
Subject: [PATCH 08/10] G7710 : free fonts in dtor().

---
 .../screens/WatchFaceCasioStyleG7710.cpp      | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/displayapp/screens/WatchFaceCasioStyleG7710.cpp b/src/displayapp/screens/WatchFaceCasioStyleG7710.cpp
index ad124ea1..4ef2839c 100644
--- a/src/displayapp/screens/WatchFaceCasioStyleG7710.cpp
+++ b/src/displayapp/screens/WatchFaceCasioStyleG7710.cpp
@@ -102,17 +102,17 @@ WatchFaceCasioStyleG7710::WatchFaceCasioStyleG7710(DisplayApp* app,
   line_icons = lv_line_create(lv_scr_act(), nullptr);
   lv_line_set_points(line_icons, line_icons_points, 3);
   lv_obj_add_style(line_icons, LV_LINE_PART_MAIN, &style_line);
-  lv_obj_align(line_icons, NULL, LV_ALIGN_IN_TOP_RIGHT, -10, 18);
+  lv_obj_align(line_icons, nullptr, LV_ALIGN_IN_TOP_RIGHT, -10, 18);
 
   line_day_of_week_number = lv_line_create(lv_scr_act(), nullptr);
   lv_line_set_points(line_day_of_week_number, line_day_of_week_number_points, 4);
   lv_obj_add_style(line_day_of_week_number, LV_LINE_PART_MAIN, &style_border);
-  lv_obj_align(line_day_of_week_number, NULL, LV_ALIGN_IN_TOP_LEFT, 0, 8);
+  lv_obj_align(line_day_of_week_number, nullptr, LV_ALIGN_IN_TOP_LEFT, 0, 8);
 
   line_day_of_year = lv_line_create(lv_scr_act(), nullptr);
   lv_line_set_points(line_day_of_year, line_day_of_year_points, 3);
   lv_obj_add_style(line_day_of_year, LV_LINE_PART_MAIN, &style_line);
-  lv_obj_align(line_day_of_year, NULL, LV_ALIGN_IN_TOP_RIGHT, 0, 60);
+  lv_obj_align(line_day_of_year, nullptr, LV_ALIGN_IN_TOP_RIGHT, 0, 60);
 
   label_date = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_align(label_date, lv_scr_act(), LV_ALIGN_IN_TOP_LEFT, 100, 70);
@@ -123,7 +123,7 @@ WatchFaceCasioStyleG7710::WatchFaceCasioStyleG7710(DisplayApp* app,
   line_date = lv_line_create(lv_scr_act(), nullptr);
   lv_line_set_points(line_date, line_date_points, 3);
   lv_obj_add_style(line_date, LV_LINE_PART_MAIN, &style_line);
-  lv_obj_align(line_date, NULL, LV_ALIGN_IN_TOP_RIGHT, 0, 100);
+  lv_obj_align(line_date, nullptr, LV_ALIGN_IN_TOP_RIGHT, 0, 100);
 
   label_time = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_color(label_time, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, color_text);
@@ -133,7 +133,7 @@ WatchFaceCasioStyleG7710::WatchFaceCasioStyleG7710(DisplayApp* app,
   line_time = lv_line_create(lv_scr_act(), nullptr);
   lv_line_set_points(line_time, line_time_points, 3);
   lv_obj_add_style(line_time, LV_LINE_PART_MAIN, &style_line);
-  lv_obj_align(line_time, NULL, LV_ALIGN_IN_BOTTOM_RIGHT, 0, -25);
+  lv_obj_align(line_time, nullptr, LV_ALIGN_IN_BOTTOM_RIGHT, 0, -25);
 
   label_time_ampm = lv_label_create(lv_scr_act(), nullptr);
   lv_obj_set_style_local_text_color(label_time_ampm, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, color_text);
@@ -177,6 +177,18 @@ WatchFaceCasioStyleG7710::~WatchFaceCasioStyleG7710() {
   lv_style_reset(&style_line);
   lv_style_reset(&style_border);
 
+  if (font_dot40 != nullptr) {
+    lv_font_free(font_dot40);
+  }
+
+  if (font_segment40 != nullptr) {
+    lv_font_free(font_segment40);
+  }
+
+  if (font_segment115 != nullptr) {
+    lv_font_free(font_segment115);
+  }
+
   lv_obj_clean(lv_scr_act());
 }
 

From d3363baf696968b0ed17478f620774c66bac55f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Milants?= <jf@codingfield.com>
Date: Wed, 28 Sep 2022 21:45:52 +0200
Subject: [PATCH 09/10] Do not save settings in CheckboxList. This will be done
 by the caller.

---
 src/displayapp/screens/CheckboxList.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/displayapp/screens/CheckboxList.cpp b/src/displayapp/screens/CheckboxList.cpp
index b89add43..952d86da 100644
--- a/src/displayapp/screens/CheckboxList.cpp
+++ b/src/displayapp/screens/CheckboxList.cpp
@@ -98,7 +98,6 @@ CheckboxList::CheckboxList(const uint8_t screenID,
 
 CheckboxList::~CheckboxList() {
   lv_obj_clean(lv_scr_act());
-  settingsController.SaveSettings();
 }
 
 void CheckboxList::UpdateSelected(lv_obj_t* object, lv_event_t event) {

From d6b4ef38f6c070dc27577ae371d3b0b86d5aec3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Milants?= <jf@codingfield.com>
Date: Sat, 1 Oct 2022 21:03:28 +0200
Subject: [PATCH 10/10] Infineat & G7710 : always close files when they are not
 needed anymore.

---
 src/displayapp/screens/WatchFaceCasioStyleG7710.cpp | 3 +++
 src/displayapp/screens/WatchFaceInfineat.cpp        | 8 +++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/displayapp/screens/WatchFaceCasioStyleG7710.cpp b/src/displayapp/screens/WatchFaceCasioStyleG7710.cpp
index 4ef2839c..f9a01abd 100644
--- a/src/displayapp/screens/WatchFaceCasioStyleG7710.cpp
+++ b/src/displayapp/screens/WatchFaceCasioStyleG7710.cpp
@@ -36,14 +36,17 @@ WatchFaceCasioStyleG7710::WatchFaceCasioStyleG7710(DisplayApp* app,
 
   lfs_file f = {};
   if (filesystem.FileOpen(&f, "/fonts/lv_font_dots_40.bin", LFS_O_RDONLY) >= 0) {
+    filesystem.FileClose(&f);
     font_dot40 = lv_font_load("F:/fonts/lv_font_dots_40.bin");
   }
 
   if (filesystem.FileOpen(&f, "/fonts/7segments_40.bin", LFS_O_RDONLY) >= 0) {
+    filesystem.FileClose(&f);
     font_segment40 = lv_font_load("F:/fonts/7segments_40.bin");
   }
 
   if (filesystem.FileOpen(&f, "/fonts/7segments_115.bin", LFS_O_RDONLY) >= 0) {
+    filesystem.FileClose(&f);
     font_segment115 = lv_font_load("F:/fonts/7segments_115.bin");
   }
 
diff --git a/src/displayapp/screens/WatchFaceInfineat.cpp b/src/displayapp/screens/WatchFaceInfineat.cpp
index e3ed1bf7..ae3f3dbb 100644
--- a/src/displayapp/screens/WatchFaceInfineat.cpp
+++ b/src/displayapp/screens/WatchFaceInfineat.cpp
@@ -27,7 +27,7 @@ WatchFaceInfineat::WatchFaceInfineat(DisplayApp* app,
                                      Controllers::NotificationManager& notificationManager,
                                      Controllers::Settings& settingsController,
                                      Controllers::MotionController& motionController,
-                                     Controllers::FS& fs)
+                                     Controllers::FS& filesystem)
   : Screen(app),
     currentDateTime {{}},
     dateTimeController {dateTimeController},
@@ -37,11 +37,13 @@ WatchFaceInfineat::WatchFaceInfineat(DisplayApp* app,
     settingsController {settingsController},
     motionController {motionController} {
   lfs_file f = {};
-  if (fs.FileOpen(&f, "/fonts/teko.bin", LFS_O_RDONLY) >= 0) {
+  if (filesystem.FileOpen(&f, "/fonts/teko.bin", LFS_O_RDONLY) >= 0) {
+    filesystem.FileClose(&f);
     font_teko = lv_font_load("F:/fonts/teko.bin");
   }
 
-  if (fs.FileOpen(&f, "/fonts/bebas.bin", LFS_O_RDONLY) >= 0) {
+  if (filesystem.FileOpen(&f, "/fonts/bebas.bin", LFS_O_RDONLY) >= 0) {
+    filesystem.FileClose(&f);
     font_bebas = lv_font_load("F:/fonts/bebas.bin");
   }