diff --git a/src/displayapp/fonts/JetBrainsMono-Bold.ttf b/src/displayapp/fonts/JetBrainsMono-Bold.ttf
new file mode 100644
index 00000000..0cd1cb66
Binary files /dev/null and b/src/displayapp/fonts/JetBrainsMono-Bold.ttf differ
diff --git a/src/displayapp/fonts/README.md b/src/displayapp/fonts/README.md
index 183ad7e4..08427d51 100644
--- a/src/displayapp/fonts/README.md
+++ b/src/displayapp/fonts/README.md
@@ -10,7 +10,7 @@
 * Size : 20
 * Bpp : 1 bit-per-pixel
 * Do not enable font compression and horizontal subpixel hinting
-* Load the file `JetBrainsMono-Bold.tff` and specify the following range : `0x20-0x7f, 0x410-0x44f`
+* Load the file `JetBrainsMono-Bold.tff` (use the file in this repo to ensure the version matches) and specify the following range : `0x20-0x7f, 0x410-0x44f`
 * Add a 2nd font, load the file `FontAwesome5-Solid+Brands+Regular.woff` and specify the following
   range : `0xf293, 0xf294, 0xf244, 0xf240, 0xf242, 0xf243, 0xf241, 0xf54b, 0xf21e, 0xf1e6, 0xf54b, 0xf017, 0xf129, 0xf03a, 0xf185, 0xf560, 0xf001, 0xf3fd, 0xf069, 0xf1fc, 0xf45d, 0xf59f, 0xf5a0, 0xf029, 0xf027, 0xf028, 0xf6a9, 0xf04b, 0xf04c, 0xf048, 0xf051, 0xf095, 0xf3dd, 0xf04d, 0xf2f2, 0xf024, 0xf252`
 * Click on Convert, and download the file `jetbrains_mono_bold_20.c` and copy it in `src/DisplayApp/Fonts`
diff --git a/src/displayapp/fonts/jetbrains_mono_bold_20.c b/src/displayapp/fonts/jetbrains_mono_bold_20.c
index 9174ff48..b001bb7e 100644
--- a/src/displayapp/fonts/jetbrains_mono_bold_20.c
+++ b/src/displayapp/fonts/jetbrains_mono_bold_20.c
@@ -1,11 +1,15 @@
-#include "lvgl/lvgl.h"
-
 /*******************************************************************************
  * Size: 20 px
  * Bpp: 1
  * Opts: 
  ******************************************************************************/
 
+#ifdef LV_LVGL_H_INCLUDE_SIMPLE
+#include "lvgl.h"
+#else
+#include "lvgl/lvgl.h"
+#endif
+
 #ifndef JETBRAINS_MONO_BOLD_20
 #define JETBRAINS_MONO_BOLD_20 1
 #endif
@@ -17,707 +21,707 @@
  *----------------*/
 
 /*Store the image of the glyphs*/
-static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = {
-    /* U+20 " " */
+static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
+    /* U+0020 " " */
     0x0,
 
-    /* U+21 "!" */
+    /* U+0021 "!" */
     0xff, 0xff, 0xff, 0xfc, 0xf, 0xc0,
 
-    /* U+22 "\"" */
+    /* U+0022 "\"" */
     0xef, 0xdf, 0xbf, 0x7e, 0xfd, 0xc0,
 
-    /* U+23 "#" */
+    /* U+0023 "#" */
     0x8, 0xc3, 0x10, 0x66, 0x3f, 0xf7, 0xfe, 0x23,
     0x4, 0x61, 0x88, 0x31, 0x1f, 0xfb, 0xff, 0x19,
     0x82, 0x30, 0xc4, 0x0,
 
-    /* U+24 "$" */
-    0x8, 0x2, 0x0, 0x80, 0xfc, 0x7f, 0xba, 0x7e,
+    /* U+0024 "$" */
+    0x8, 0x2, 0x0, 0x81, 0xfc, 0x7f, 0xba, 0x7e,
     0x9f, 0xa0, 0xf8, 0x1f, 0x83, 0xf8, 0x3f, 0x9,
     0xfa, 0x7e, 0x9d, 0xfe, 0x7f, 0x2, 0x0, 0x80,
     0x20,
 
-    /* U+25 "%" */
+    /* U+0025 "%" */
     0x78, 0x3f, 0xc6, 0xcc, 0xcc, 0xcc, 0xfd, 0x87,
     0xb0, 0x6, 0x0, 0x7e, 0xf, 0xf1, 0xb3, 0x33,
     0x33, 0x33, 0x63, 0xfc, 0x1e,
 
-    /* U+26 "&" */
+    /* U+0026 "&" */
     0x1e, 0xf, 0xe1, 0x8e, 0x30, 0x6, 0x0, 0x60,
     0x1e, 0x7, 0xe6, 0xed, 0xdc, 0xf3, 0x9e, 0x73,
-    0xcf, 0xfc, 0x79, 0x80,
+    0xcf, 0xfc, 0xf9, 0x80,
 
-    /* U+27 "'" */
+    /* U+0027 "'" */
     0xff, 0xff, 0xc0,
 
-    /* U+28 "(" */
+    /* U+0028 "(" */
     0x2, 0x1c, 0x79, 0xc7, 0x1e, 0x38, 0x70, 0xe1,
     0xc3, 0x87, 0xe, 0x1c, 0x3c, 0x38, 0x3c, 0x3c,
     0x38,
 
-    /* U+29 ")" */
+    /* U+0029 ")" */
     0x1, 0xc3, 0xc3, 0xc1, 0xc3, 0xc3, 0x87, 0xe,
     0x1c, 0x38, 0x70, 0xe1, 0xc7, 0xe, 0x79, 0xe3,
     0x0,
 
-    /* U+2A "*" */
+    /* U+002A "*" */
     0xc, 0x3, 0x8, 0xc7, 0xb7, 0x7f, 0x83, 0x1,
     0xe0, 0xcc, 0x73, 0x80, 0x0,
 
-    /* U+2B "+" */
+    /* U+002B "+" */
     0x1c, 0x7, 0x1, 0xc3, 0xff, 0xff, 0xc7, 0x1,
     0xc0, 0x70, 0x1c, 0x0,
 
-    /* U+2C "," */
+    /* U+002C "," */
     0x7b, 0x9c, 0xce, 0x60,
 
-    /* U+2D "-" */
+    /* U+002D "-" */
     0xff, 0xf0,
 
-    /* U+2E "." */
+    /* U+002E "." */
     0xff, 0xf0,
 
-    /* U+2F "/" */
+    /* U+002F "/" */
     0x1, 0xc0, 0x60, 0x38, 0xe, 0x3, 0x1, 0xc0,
     0x70, 0x18, 0xe, 0x3, 0x1, 0xc0, 0x70, 0x18,
     0xe, 0x3, 0x80, 0xc0, 0x70, 0x18, 0xe, 0x0,
 
-    /* U+30 "0" */
+    /* U+0030 "0" */
     0x3f, 0x1f, 0xef, 0x3f, 0x87, 0xe1, 0xf8, 0x7f,
     0xdf, 0xf7, 0xe1, 0xf8, 0x7e, 0x1f, 0xcf, 0x7f,
     0x8f, 0xc0,
 
-    /* U+31 "1" */
+    /* U+0031 "1" */
     0x1e, 0x3f, 0x3b, 0x99, 0xc8, 0xe0, 0x70, 0x38,
     0x1c, 0xe, 0x7, 0x3, 0x81, 0xcf, 0xff, 0xfc,
 
-    /* U+32 "2" */
+    /* U+0032 "2" */
     0x3e, 0x3f, 0xbc, 0xfc, 0x70, 0x38, 0x1c, 0x1c,
     0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0xf, 0xff, 0xfc,
 
-    /* U+33 "3" */
+    /* U+0033 "3" */
     0x7f, 0x9f, 0xe0, 0x30, 0x18, 0xc, 0x7, 0xc1,
     0xf8, 0xf, 0x1, 0xc0, 0x7e, 0x1f, 0xcf, 0x7f,
     0x8f, 0xc0,
 
-    /* U+34 "4" */
+    /* U+0034 "4" */
     0x7, 0x7, 0x3, 0x83, 0x83, 0x83, 0xc1, 0xcf,
     0xe7, 0xe3, 0xff, 0xff, 0xe0, 0x70, 0x38, 0x1c,
 
-    /* U+35 "5" */
+    /* U+0035 "5" */
     0x7f, 0x9f, 0xe7, 0x1, 0xc0, 0x77, 0x1f, 0xe7,
     0x3c, 0x7, 0x1, 0xc0, 0x77, 0x1d, 0xcf, 0x7f,
     0x87, 0xc0,
 
-    /* U+36 "6" */
+    /* U+0036 "6" */
     0xe, 0x3, 0x1, 0xc0, 0x60, 0x38, 0x1d, 0xc7,
     0xfb, 0xcf, 0xe1, 0xf8, 0x7e, 0x1f, 0xcf, 0x7f,
-    0x87, 0x80,
+    0x8f, 0x80,
 
-    /* U+37 "7" */
+    /* U+0037 "7" */
     0xff, 0xff, 0xfe, 0x1f, 0x86, 0x3, 0x80, 0xe0,
     0x30, 0x1c, 0x6, 0x3, 0x80, 0xc0, 0x70, 0x1c,
     0x6, 0x0,
 
-    /* U+38 "8" */
+    /* U+0038 "8" */
     0x3f, 0x1f, 0xef, 0x3f, 0x87, 0xe1, 0xdc, 0xe3,
     0xf0, 0xfc, 0x73, 0xb8, 0x7e, 0x1f, 0xcf, 0x7f,
     0x8f, 0xc0,
 
-    /* U+39 "9" */
+    /* U+0039 "9" */
     0x1e, 0x1f, 0xef, 0x3f, 0x87, 0xe1, 0xf8, 0x7f,
     0x3d, 0xfe, 0x3b, 0x81, 0xc0, 0x60, 0x38, 0xc,
     0x7, 0x0,
 
-    /* U+3A ":" */
+    /* U+003A ":" */
     0xff, 0x80, 0x0, 0xff, 0x80,
 
-    /* U+3B ";" */
+    /* U+003B ";" */
     0x7b, 0xde, 0x0, 0x0, 0x0, 0x3, 0xdc, 0xe6,
     0x73, 0x0,
 
-    /* U+3C "<" */
+    /* U+003C "<" */
     0x0, 0x81, 0xc3, 0xe7, 0xcf, 0x6, 0x3, 0xc0,
     0x7c, 0xf, 0x81, 0xc0, 0x20,
 
-    /* U+3D "=" */
+    /* U+003D "=" */
     0xff, 0xff, 0xc0, 0x0, 0x0, 0x7, 0xff, 0xfe,
 
-    /* U+3E ">" */
+    /* U+003E ">" */
     0x80, 0x70, 0x3e, 0x7, 0xc0, 0xf8, 0xc, 0x1e,
     0x3c, 0xf8, 0x70, 0x20, 0x0,
 
-    /* U+3F "?" */
+    /* U+003F "?" */
     0xfc, 0xfe, 0xf, 0x7, 0x7, 0xf, 0x3e, 0x3c,
     0x30, 0x30, 0x0, 0x0, 0x70, 0x70,
 
-    /* U+40 "@" */
+    /* U+0040 "@" */
     0x1f, 0x7, 0xf9, 0xc3, 0x70, 0x3c, 0x7, 0x8f,
     0xf3, 0xfe, 0x63, 0xcc, 0x79, 0x8f, 0x31, 0xe6,
     0x3c, 0xff, 0x8e, 0xf8, 0x3, 0x80, 0x3e, 0x3,
     0xc0,
 
-    /* U+41 "A" */
+    /* U+0041 "A" */
     0x1e, 0x7, 0x81, 0xe0, 0xfc, 0x3f, 0xc, 0xc3,
     0x31, 0xce, 0x73, 0x9f, 0xe7, 0xfb, 0x87, 0xe1,
     0xf0, 0x30,
 
-    /* U+42 "B" */
+    /* U+0042 "B" */
     0xfe, 0x3f, 0xce, 0x3b, 0x8e, 0xe3, 0xb8, 0xcf,
     0xe3, 0xfc, 0xe3, 0xb8, 0x7e, 0x1f, 0x8f, 0xff,
     0xbf, 0xc0,
 
-    /* U+43 "C" */
+    /* U+0043 "C" */
     0x3f, 0x1f, 0xef, 0x3f, 0x87, 0xe0, 0x38, 0xe,
     0x3, 0x80, 0xe0, 0x38, 0xe, 0x1f, 0xcf, 0x7f,
     0x8f, 0xc0,
 
-    /* U+44 "D" */
+    /* U+0044 "D" */
     0xfe, 0x7f, 0xb9, 0xfc, 0x7e, 0x3f, 0x1f, 0x8f,
     0xc7, 0xe3, 0xf1, 0xf8, 0xfc, 0xff, 0xf7, 0xf0,
 
-    /* U+45 "E" */
+    /* U+0045 "E" */
     0xff, 0xff, 0xf8, 0x1c, 0xe, 0x7, 0x3, 0xfd,
     0xfe, 0xe0, 0x70, 0x38, 0x1c, 0xf, 0xff, 0xfc,
 
-    /* U+46 "F" */
+    /* U+0046 "F" */
     0xff, 0xff, 0xf8, 0x1c, 0xe, 0x7, 0x3, 0xff,
     0xff, 0xe0, 0x70, 0x38, 0x1c, 0xe, 0x7, 0x0,
 
-    /* U+47 "G" */
-    0x3f, 0x1f, 0xef, 0x1f, 0x87, 0xe0, 0x38, 0xe,
+    /* U+0047 "G" */
+    0x3f, 0x1f, 0xef, 0x3f, 0x87, 0xe0, 0x38, 0xe,
     0x7f, 0x9f, 0xe1, 0xf8, 0x7e, 0x1f, 0xcf, 0x7f,
     0x8f, 0xc0,
 
-    /* U+48 "H" */
+    /* U+0048 "H" */
     0xe3, 0xf1, 0xf8, 0xfc, 0x7e, 0x3f, 0x1f, 0xff,
     0xff, 0xe3, 0xf1, 0xf8, 0xfc, 0x7e, 0x3f, 0x1c,
 
-    /* U+49 "I" */
+    /* U+0049 "I" */
     0xff, 0xff, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c, 0x1c,
     0x1c, 0x1c, 0x1c, 0x1c, 0xff, 0xff,
 
-    /* U+4A "J" */
+    /* U+004A "J" */
     0x1f, 0xc7, 0xf0, 0x1c, 0x7, 0x1, 0xc0, 0x70,
     0x1c, 0x7, 0x1, 0xc0, 0x7e, 0x1f, 0xcf, 0x7f,
     0x8f, 0xc0,
 
-    /* U+4B "K" */
+    /* U+004B "K" */
     0xe1, 0xf8, 0x7e, 0x3b, 0x8e, 0xe7, 0x39, 0xcf,
     0xe3, 0xf8, 0xe7, 0x39, 0xce, 0x3b, 0x8e, 0xe1,
     0xf8, 0x70,
 
-    /* U+4C "L" */
+    /* U+004C "L" */
     0xe0, 0x70, 0x38, 0x1c, 0xe, 0x7, 0x3, 0x81,
     0xc0, 0xe0, 0x70, 0x38, 0x1c, 0xf, 0xff, 0xfc,
 
-    /* U+4D "M" */
+    /* U+004D "M" */
     0xe1, 0xf8, 0x7f, 0x3f, 0xcf, 0xd2, 0xf7, 0xbd,
     0xef, 0x33, 0xc0, 0xf0, 0x3c, 0xf, 0x3, 0xc0,
     0xf0, 0x30,
 
-    /* U+4E "N" */
-    0xe1, 0xf0, 0xfc, 0x7e, 0x3d, 0x9e, 0xcf, 0x67,
-    0x9b, 0xcd, 0xe6, 0xf1, 0xf8, 0xfc, 0x3e, 0x1c,
+    /* U+004E "N" */
+    0xe1, 0xf0, 0xfc, 0x7e, 0x3f, 0x9e, 0xcf, 0x67,
+    0x9b, 0xcd, 0xe6, 0xf1, 0xf8, 0xfc, 0x7e, 0x1c,
 
-    /* U+4F "O" */
+    /* U+004F "O" */
     0x3e, 0x3f, 0xb8, 0xfc, 0x7e, 0x3f, 0x1f, 0x8f,
     0xc7, 0xe3, 0xf1, 0xf8, 0xfc, 0x77, 0xf1, 0xf0,
 
-    /* U+50 "P" */
+    /* U+0050 "P" */
     0xff, 0x3f, 0xee, 0x3f, 0x87, 0xe1, 0xf8, 0xff,
     0xfb, 0xfc, 0xe0, 0x38, 0xe, 0x3, 0x80, 0xe0,
     0x38, 0x0,
 
-    /* U+51 "Q" */
+    /* U+0051 "Q" */
     0x3f, 0x1f, 0xef, 0x3f, 0x87, 0xe1, 0xf8, 0x7e,
     0x1f, 0x87, 0xe1, 0xf8, 0x7e, 0x1f, 0xcf, 0x7f,
     0x8f, 0x80, 0x70, 0xe, 0x3, 0x80, 0x70,
 
-    /* U+52 "R" */
+    /* U+0052 "R" */
     0xff, 0x3f, 0xee, 0x3f, 0x87, 0xe1, 0xf8, 0xff,
     0xfb, 0xf8, 0xe6, 0x39, 0xce, 0x33, 0x8e, 0xe3,
     0xb8, 0x70,
 
-    /* U+53 "S" */
+    /* U+0053 "S" */
     0x3f, 0x1f, 0xee, 0x3f, 0x87, 0xe0, 0x3c, 0x7,
     0xf0, 0xfe, 0x3, 0xc0, 0x7e, 0x1f, 0xcf, 0x7f,
     0x8f, 0xc0,
 
-    /* U+54 "T" */
+    /* U+0054 "T" */
     0xff, 0xff, 0xf0, 0xe0, 0x38, 0xe, 0x3, 0x80,
     0xe0, 0x38, 0xe, 0x3, 0x80, 0xe0, 0x38, 0xe,
     0x3, 0x80,
 
-    /* U+55 "U" */
+    /* U+0055 "U" */
     0xe3, 0xf1, 0xf8, 0xfc, 0x7e, 0x3f, 0x1f, 0x8f,
     0xc7, 0xe3, 0xf1, 0xf8, 0xfc, 0x77, 0xf1, 0xf0,
 
-    /* U+56 "V" */
+    /* U+0056 "V" */
     0xc0, 0xf8, 0x7e, 0x1d, 0x86, 0x61, 0x9c, 0xe7,
     0x38, 0xcc, 0x33, 0xf, 0xc3, 0xf0, 0x78, 0x1e,
     0x7, 0x80,
 
-    /* U+57 "W" */
+    /* U+0057 "W" */
     0xce, 0x79, 0xcf, 0x29, 0xe5, 0x3c, 0xa7, 0xd5,
     0xda, 0xb3, 0x56, 0x7b, 0xcf, 0x79, 0xef, 0x38,
     0xe7, 0x1c, 0xe3, 0x80,
 
-    /* U+58 "X" */
+    /* U+0058 "X" */
     0xe1, 0xd8, 0x67, 0x38, 0xcc, 0x3f, 0x7, 0x81,
     0xe0, 0x78, 0x1e, 0xf, 0xc3, 0x31, 0xce, 0xe1,
     0xf8, 0x70,
 
-    /* U+59 "Y" */
+    /* U+0059 "Y" */
     0xe0, 0xfc, 0x1d, 0xc7, 0x38, 0xe3, 0xb8, 0x77,
     0x6, 0xc0, 0xf8, 0xe, 0x1, 0xc0, 0x38, 0x7,
     0x0, 0xe0, 0x1c, 0x0,
 
-    /* U+5A "Z" */
+    /* U+005A "Z" */
     0xff, 0xff, 0xc0, 0xe0, 0xe0, 0x70, 0x70, 0x70,
     0x38, 0x38, 0x38, 0x1c, 0x1c, 0xf, 0xff, 0xfc,
 
-    /* U+5B "[" */
+    /* U+005B "[" */
     0xff, 0xfe, 0x38, 0xe3, 0x8e, 0x38, 0xe3, 0x8e,
     0x38, 0xe3, 0x8e, 0x38, 0xff, 0xf0,
 
-    /* U+5C "\\" */
+    /* U+005C "\\" */
     0xe0, 0x18, 0x7, 0x1, 0xc0, 0x30, 0xe, 0x3,
     0x80, 0x60, 0x1c, 0x3, 0x0, 0xe0, 0x38, 0x6,
     0x1, 0xc0, 0x70, 0xc, 0x3, 0x80, 0x60, 0x1c,
 
-    /* U+5D "]" */
+    /* U+005D "]" */
     0xff, 0xf1, 0xc7, 0x1c, 0x71, 0xc7, 0x1c, 0x71,
     0xc7, 0x1c, 0x71, 0xc7, 0xff, 0xf0,
 
-    /* U+5E "^" */
+    /* U+005E "^" */
     0xc, 0x7, 0x81, 0xe0, 0xfc, 0x33, 0x1c, 0xe6,
     0x19, 0x86,
 
-    /* U+5F "_" */
+    /* U+005F "_" */
     0xff, 0xff, 0xf0,
 
-    /* U+60 "`" */
+    /* U+0060 "`" */
     0xe3, 0x8c,
 
-    /* U+61 "a" */
+    /* U+0061 "a" */
     0x1f, 0x1f, 0xe7, 0x1c, 0x7, 0x3f, 0xdf, 0xfe,
     0x1f, 0x87, 0xe3, 0xff, 0xf3, 0xdc,
 
-    /* U+62 "b" */
+    /* U+0062 "b" */
     0xe0, 0x70, 0x38, 0x1d, 0xcf, 0xf7, 0x1f, 0x8f,
     0xc7, 0xe3, 0xf1, 0xf8, 0xfc, 0x7f, 0xf7, 0x70,
 
-    /* U+63 "c" */
+    /* U+0063 "c" */
     0x3e, 0x3f, 0xb8, 0xfc, 0x7e, 0x7, 0x3, 0x81,
     0xc7, 0xe3, 0xbf, 0x8f, 0x80,
 
-    /* U+64 "d" */
+    /* U+0064 "d" */
     0x3, 0x81, 0xc0, 0xe7, 0x77, 0xff, 0x1f, 0x8f,
     0xc7, 0xe3, 0xf1, 0xf8, 0xfc, 0x77, 0xf9, 0xdc,
 
-    /* U+65 "e" */
+    /* U+0065 "e" */
     0x3e, 0x3f, 0xb8, 0xfc, 0x7f, 0xff, 0xff, 0x81,
     0xc0, 0xe3, 0xbf, 0x8f, 0x80,
 
-    /* U+66 "f" */
+    /* U+0066 "f" */
     0xf, 0xc7, 0xf1, 0xc0, 0x70, 0xff, 0xff, 0xf1,
     0xc0, 0x70, 0x1c, 0x7, 0x1, 0xc0, 0x70, 0x1c,
     0x7, 0x0,
 
-    /* U+67 "g" */
+    /* U+0067 "g" */
     0x3b, 0xbf, 0xfd, 0xfc, 0x7e, 0x3f, 0x1f, 0x8f,
     0xc7, 0xf7, 0xbf, 0xce, 0xe0, 0x70, 0x39, 0xf8,
     0xf8,
 
-    /* U+68 "h" */
+    /* U+0068 "h" */
     0xe0, 0x70, 0x38, 0x1d, 0xcf, 0xf7, 0x1f, 0x8f,
     0xc7, 0xe3, 0xf1, 0xf8, 0xfc, 0x7e, 0x3f, 0x1c,
 
-    /* U+69 "i" */
+    /* U+0069 "i" */
     0x1c, 0x7, 0x1, 0xc0, 0x0, 0x0, 0x3f, 0xf,
     0xc0, 0x70, 0x1c, 0x7, 0x1, 0xc0, 0x70, 0x1c,
     0x7, 0xf, 0xff, 0xff,
 
-    /* U+6A "j" */
+    /* U+006A "j" */
     0x7, 0x7, 0x7, 0x0, 0xff, 0xff, 0x7, 0x7,
     0x7, 0x7, 0x7, 0x7, 0x7, 0x7, 0x7, 0x7,
     0xf, 0xfe, 0xfc,
 
-    /* U+6B "k" */
+    /* U+006B "k" */
     0xe0, 0x38, 0xe, 0x3, 0x87, 0xe3, 0xb8, 0xee,
     0x73, 0xf8, 0xfe, 0x39, 0xce, 0x33, 0x8e, 0xe1,
     0xb8, 0x70,
 
-    /* U+6C "l" */
+    /* U+006C "l" */
     0xfe, 0x1f, 0xc0, 0x38, 0x7, 0x0, 0xe0, 0x1c,
     0x3, 0x80, 0x70, 0xe, 0x1, 0xc0, 0x38, 0x7,
     0x0, 0x7e, 0x7, 0xc0,
 
-    /* U+6D "m" */
+    /* U+006D "m" */
     0xd9, 0xbf, 0xfc, 0xcf, 0x33, 0xcc, 0xf3, 0x3c,
     0xcf, 0x33, 0xcc, 0xf3, 0x3c, 0xcc,
 
-    /* U+6E "n" */
+    /* U+006E "n" */
     0xee, 0x7f, 0xb8, 0xfc, 0x7e, 0x3f, 0x1f, 0x8f,
     0xc7, 0xe3, 0xf1, 0xf8, 0xe0,
 
-    /* U+6F "o" */
+    /* U+006F "o" */
     0x3e, 0x3f, 0xb8, 0xfc, 0x7e, 0x3f, 0x1f, 0x8f,
     0xc7, 0xe3, 0xbf, 0x8f, 0x80,
 
-    /* U+70 "p" */
+    /* U+0070 "p" */
     0xee, 0x7f, 0xb8, 0xfc, 0x7e, 0x3f, 0x1f, 0x8f,
     0xc7, 0xe3, 0xff, 0xbb, 0x9c, 0xe, 0x7, 0x3,
     0x80,
 
-    /* U+71 "q" */
+    /* U+0071 "q" */
     0x3b, 0xbf, 0xf8, 0xfc, 0x7e, 0x3f, 0x1f, 0x8f,
     0xc7, 0xe3, 0xbf, 0xce, 0xe0, 0x70, 0x38, 0x1c,
     0xe,
 
-    /* U+72 "r" */
-    0xee, 0x7f, 0xb8, 0xfc, 0x7e, 0x3f, 0x3, 0x81,
+    /* U+0072 "r" */
+    0xee, 0x7f, 0xb9, 0xfc, 0x7e, 0x3f, 0x3, 0x81,
     0xc0, 0xe0, 0x70, 0x38, 0x0,
 
-    /* U+73 "s" */
+    /* U+0073 "s" */
     0x1f, 0x1f, 0xf7, 0x1d, 0xc0, 0x7c, 0xf, 0xe0,
     0x3c, 0x7, 0x71, 0xdf, 0xe3, 0xf0,
 
-    /* U+74 "t" */
+    /* U+0074 "t" */
     0x1c, 0x7, 0x1, 0xc3, 0xff, 0xff, 0xc7, 0x1,
     0xc0, 0x70, 0x1c, 0x7, 0x1, 0xc0, 0x70, 0x1f,
     0xc3, 0xf0,
 
-    /* U+75 "u" */
+    /* U+0075 "u" */
     0xe3, 0xf1, 0xf8, 0xfc, 0x7e, 0x3f, 0x1f, 0x8f,
     0xc7, 0xe3, 0xbf, 0x8f, 0x80,
 
-    /* U+76 "v" */
+    /* U+0076 "v" */
     0xe0, 0xf8, 0x76, 0x19, 0x86, 0x73, 0x8c, 0xc3,
     0x30, 0xfc, 0x1e, 0x7, 0x81, 0xe0,
 
-    /* U+77 "w" */
+    /* U+0077 "w" */
     0xe6, 0x36, 0x66, 0x66, 0x66, 0xf6, 0x6f, 0x66,
     0x96, 0x69, 0x62, 0x94, 0x39, 0xc3, 0x9c, 0x39,
     0xc0,
 
-    /* U+78 "x" */
+    /* U+0078 "x" */
     0xe1, 0xdc, 0xe3, 0x30, 0xfc, 0x1e, 0x7, 0x81,
-    0xe0, 0xfc, 0x73, 0x9c, 0x6e, 0x1c,
+    0xe0, 0xfc, 0x73, 0x9c, 0xee, 0x1c,
 
-    /* U+79 "y" */
+    /* U+0079 "y" */
     0xe1, 0xf8, 0x76, 0x19, 0xce, 0x73, 0x8c, 0xc3,
     0xf0, 0x7c, 0x1e, 0x7, 0x80, 0xe0, 0x30, 0x1c,
     0x6, 0x3, 0x80,
 
-    /* U+7A "z" */
+    /* U+007A "z" */
     0xff, 0xff, 0xc0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
     0xe0, 0xe0, 0x7f, 0xff, 0xe0,
 
-    /* U+7B "{" */
+    /* U+007B "{" */
     0x3, 0x87, 0xc3, 0x81, 0xc0, 0xe0, 0x70, 0x38,
     0x1c, 0xfc, 0x7e, 0x3, 0x81, 0xc0, 0xe0, 0x70,
     0x38, 0x1c, 0xf, 0x81, 0xc0,
 
-    /* U+7C "|" */
+    /* U+007C "|" */
     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc,
 
-    /* U+7D "}" */
+    /* U+007D "}" */
     0xf0, 0x3e, 0x1, 0xc0, 0x70, 0x1c, 0x7, 0x1,
     0xc0, 0x70, 0xf, 0xc3, 0xf1, 0xc0, 0x70, 0x1c,
     0x7, 0x1, 0xc0, 0x70, 0xf8, 0x3c, 0x0,
 
-    /* U+7E "~" */
+    /* U+007E "~" */
     0x78, 0xff, 0x3c, 0xcf, 0x3f, 0xc7, 0x80,
 
-    /* U+410 "А" */
+    /* U+0410 "А" */
     0x1e, 0x7, 0x81, 0xe0, 0xfc, 0x3f, 0xc, 0xc3,
     0x31, 0xce, 0x73, 0x9f, 0xe7, 0xfb, 0x87, 0xe1,
     0xf0, 0x30,
 
-    /* U+411 "Б" */
+    /* U+0411 "Б" */
     0xff, 0xbf, 0xee, 0x3, 0x80, 0xe0, 0x3f, 0xcf,
     0xfb, 0x8f, 0xe1, 0xf8, 0x7e, 0x1f, 0x8f, 0xff,
-    0xbf, 0x80,
+    0xbf, 0xc0,
 
-    /* U+412 "В" */
+    /* U+0412 "В" */
     0xfe, 0x3f, 0xce, 0x3b, 0x8e, 0xe3, 0xb8, 0xcf,
     0xe3, 0xfc, 0xe3, 0xb8, 0x7e, 0x1f, 0x8f, 0xff,
     0xbf, 0xc0,
 
-    /* U+413 "Г" */
+    /* U+0413 "Г" */
     0xff, 0xff, 0xf8, 0x1c, 0xe, 0x7, 0x3, 0x81,
     0xc0, 0xe0, 0x70, 0x38, 0x1c, 0xe, 0x7, 0x0,
 
-    /* U+414 "Д" */
+    /* U+0414 "Д" */
     0x3f, 0xc7, 0xf8, 0xe7, 0x1c, 0xe3, 0x9c, 0x73,
     0x8e, 0x71, 0xce, 0x39, 0xc7, 0x38, 0xe7, 0x38,
     0xef, 0xff, 0xff, 0xf8, 0x3f, 0x7, 0xe0, 0xe0,
 
-    /* U+415 "Е" */
+    /* U+0415 "Е" */
     0xff, 0xff, 0xf8, 0x1c, 0xe, 0x7, 0x3, 0xfd,
     0xfe, 0xe0, 0x70, 0x38, 0x1c, 0xf, 0xff, 0xfc,
 
-    /* U+416 "Ж" */
+    /* U+0416 "Ж" */
     0xe6, 0x76, 0x66, 0x66, 0x67, 0x66, 0x36, 0xc3,
     0x6c, 0x3f, 0xc3, 0x6c, 0x36, 0xc7, 0x6e, 0x66,
     0x66, 0x66, 0x66, 0x6c, 0x63,
 
-    /* U+417 "З" */
+    /* U+0417 "З" */
     0x1f, 0xf, 0xf3, 0xc7, 0x0, 0x60, 0x1c, 0x1e,
     0x3, 0xf0, 0xe, 0x0, 0xe0, 0x1f, 0x83, 0xf8,
     0xf7, 0xfc, 0x3e, 0x0,
 
-    /* U+418 "И" */
+    /* U+0418 "И" */
     0xc3, 0xe3, 0xf1, 0xf8, 0xfc, 0xde, 0x6f, 0x37,
     0xb3, 0xd9, 0xfc, 0xfc, 0x7e, 0x3e, 0x1f, 0xc,
 
-    /* U+419 "Й" */
+    /* U+0419 "Й" */
     0x63, 0x31, 0x8f, 0x83, 0x80, 0x6, 0x1f, 0x1f,
     0x8f, 0xc7, 0xe7, 0xf3, 0x79, 0xbd, 0x9e, 0xcf,
     0xe7, 0xe3, 0xf1, 0xf8, 0xf8, 0x60,
 
-    /* U+41A "К" */
+    /* U+041A "К" */
     0xe1, 0xf8, 0x7e, 0x3b, 0x8e, 0xe7, 0x39, 0xcf,
     0xe3, 0xf8, 0xe7, 0x39, 0xce, 0x3b, 0x8e, 0xe1,
     0xf8, 0x70,
 
-    /* U+41B "Л" */
+    /* U+041B "Л" */
     0x3f, 0xcf, 0xf3, 0x9c, 0xe7, 0x39, 0xce, 0x73,
     0x9c, 0xe7, 0x39, 0xce, 0x73, 0x9d, 0xe7, 0xf1,
     0xf8, 0x70,
 
-    /* U+41C "М" */
+    /* U+041C "М" */
     0xe1, 0xf8, 0x7f, 0x3f, 0xcf, 0xd2, 0xf7, 0xbd,
     0xef, 0x33, 0xc0, 0xf0, 0x3c, 0xf, 0x3, 0xc0,
     0xf0, 0x30,
 
-    /* U+41D "Н" */
+    /* U+041D "Н" */
     0xe3, 0xf1, 0xf8, 0xfc, 0x7e, 0x3f, 0x1f, 0xff,
     0xff, 0xe3, 0xf1, 0xf8, 0xfc, 0x7e, 0x3f, 0x1c,
 
-    /* U+41E "О" */
+    /* U+041E "О" */
     0x3e, 0x3f, 0xb8, 0xfc, 0x7e, 0x3f, 0x1f, 0x8f,
     0xc7, 0xe3, 0xf1, 0xf8, 0xfc, 0x77, 0xf1, 0xf0,
 
-    /* U+41F "П" */
+    /* U+041F "П" */
     0xff, 0xff, 0xf8, 0xfc, 0x7e, 0x3f, 0x1f, 0x8f,
     0xc7, 0xe3, 0xf1, 0xf8, 0xfc, 0x7e, 0x3f, 0x1c,
 
-    /* U+420 "Р" */
+    /* U+0420 "Р" */
     0xff, 0x3f, 0xee, 0x3f, 0x87, 0xe1, 0xf8, 0xff,
     0xfb, 0xfc, 0xe0, 0x38, 0xe, 0x3, 0x80, 0xe0,
     0x38, 0x0,
 
-    /* U+421 "С" */
+    /* U+0421 "С" */
     0x3f, 0x1f, 0xef, 0x3f, 0x87, 0xe0, 0x38, 0xe,
     0x3, 0x80, 0xe0, 0x38, 0xe, 0x1f, 0xcf, 0x7f,
     0x8f, 0xc0,
 
-    /* U+422 "Т" */
+    /* U+0422 "Т" */
     0xff, 0xff, 0xf0, 0xe0, 0x38, 0xe, 0x3, 0x80,
     0xe0, 0x38, 0xe, 0x3, 0x80, 0xe0, 0x38, 0xe,
     0x3, 0x80,
 
-    /* U+423 "У" */
+    /* U+0423 "У" */
     0xe1, 0xf8, 0x76, 0x19, 0xce, 0x33, 0x8c, 0xc3,
     0xb0, 0x7c, 0x1e, 0x3, 0x80, 0xc0, 0x70, 0x1c,
     0x6, 0x0,
 
-    /* U+424 "Ф" */
+    /* U+0424 "Ф" */
     0xc, 0xf, 0xc7, 0xfb, 0xb7, 0xcc, 0xf3, 0x3c,
     0xcf, 0x33, 0xcc, 0xf3, 0x3c, 0xcf, 0xb7, 0x7f,
     0x8f, 0xc0, 0xc0, 0x30,
 
-    /* U+425 "Х" */
+    /* U+0425 "Х" */
     0xe1, 0xd8, 0x67, 0x38, 0xcc, 0x3f, 0x7, 0x81,
     0xe0, 0x78, 0x1e, 0xf, 0xc3, 0x31, 0xce, 0xe1,
     0xf8, 0x70,
 
-    /* U+426 "Ц" */
+    /* U+0426 "Ц" */
     0xe3, 0xb8, 0xee, 0x3b, 0x8e, 0xe3, 0xb8, 0xee,
     0x3b, 0x8e, 0xe3, 0xb8, 0xee, 0x3b, 0x8e, 0xff,
     0xff, 0xf0, 0x1c, 0x7, 0x1, 0xc0,
 
-    /* U+427 "Ч" */
+    /* U+0427 "Ч" */
     0xe3, 0xf1, 0xf8, 0xfc, 0x7e, 0x3f, 0x1f, 0xce,
     0xff, 0x3f, 0x81, 0xc0, 0xe0, 0x70, 0x38, 0x1c,
 
-    /* U+428 "Ш" */
+    /* U+0428 "Ш" */
     0xcc, 0xf3, 0x3c, 0xcf, 0x33, 0xcc, 0xf3, 0x3c,
     0xcf, 0x33, 0xcc, 0xf3, 0x3c, 0xcf, 0x33, 0xff,
     0xff, 0xf0,
 
-    /* U+429 "Щ" */
+    /* U+0429 "Щ" */
     0xcc, 0xd9, 0x9b, 0x33, 0x66, 0x6c, 0xcd, 0x99,
     0xb3, 0x36, 0x66, 0xcc, 0xd9, 0x9b, 0x33, 0x66,
     0x6f, 0xff, 0xff, 0xc0, 0x18, 0x3,
 
-    /* U+42A "Ъ" */
+    /* U+042A "Ъ" */
     0xfc, 0xf, 0xc0, 0x1c, 0x1, 0xc0, 0x1c, 0x1,
     0xfc, 0x1f, 0xe1, 0xcf, 0x1c, 0x71, 0xc7, 0x1c,
-    0x71, 0xcf, 0x1f, 0xe1, 0xf8,
+    0x71, 0xcf, 0x1f, 0xe1, 0xfc,
 
-    /* U+42B "Ы" */
+    /* U+042B "Ы" */
     0xc0, 0xf0, 0x3c, 0xf, 0x3, 0xc0, 0xfe, 0x3f,
     0xcf, 0x3b, 0xc6, 0xf1, 0xbc, 0x6f, 0x3b, 0xfc,
     0xfe, 0x30,
 
-    /* U+42C "Ь" */
+    /* U+042C "Ь" */
     0xe0, 0x38, 0xe, 0x3, 0x80, 0xe0, 0x3f, 0xcf,
     0xfb, 0x8f, 0xe1, 0xf8, 0x7e, 0x1f, 0x8f, 0xff,
     0xbf, 0x80,
 
-    /* U+42D "Э" */
+    /* U+042D "Э" */
     0x3e, 0x3f, 0xb8, 0xfc, 0x70, 0x38, 0x1c, 0x7e,
     0x3f, 0x3, 0x81, 0xf8, 0xfc, 0x77, 0xf1, 0xf0,
 
-    /* U+42E "Ю" */
+    /* U+042E "Ю" */
     0xc7, 0xb3, 0xfc, 0xcf, 0x33, 0xcc, 0xff, 0x3f,
     0xcf, 0x33, 0xcc, 0xf3, 0x3c, 0xcf, 0x33, 0xcf,
     0xf1, 0xe0,
 
-    /* U+42F "Я" */
+    /* U+042F "Я" */
     0x3f, 0xdf, 0xff, 0x1f, 0x87, 0xe1, 0xfc, 0x77,
     0xfc, 0x7f, 0x19, 0xce, 0x73, 0x1d, 0xc7, 0x71,
     0xf8, 0x70,
 
-    /* U+430 "а" */
+    /* U+0430 "а" */
     0x1f, 0x1f, 0xe7, 0x1c, 0x7, 0x3f, 0xdf, 0xfe,
     0x1f, 0x87, 0xe3, 0xff, 0xf3, 0xdc,
 
-    /* U+431 "б" */
+    /* U+0431 "б" */
     0x1f, 0x3f, 0x9c, 0x1c, 0xe, 0xe7, 0xfb, 0x8f,
     0xc7, 0xe3, 0xf1, 0xf8, 0xfc, 0x77, 0xf1, 0xf0,
 
-    /* U+432 "в" */
+    /* U+0432 "в" */
     0xff, 0x3f, 0xee, 0x3b, 0x8e, 0xfe, 0x3f, 0xee,
     0x1f, 0x87, 0xe1, 0xff, 0xef, 0xf0,
 
-    /* U+433 "г" */
+    /* U+0433 "г" */
     0xff, 0xff, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0,
     0xe0, 0xe0, 0xe0,
 
-    /* U+434 "д" */
+    /* U+0434 "д" */
     0x3f, 0xc7, 0xf8, 0xe7, 0x1c, 0xe3, 0x9c, 0x73,
     0x8e, 0x71, 0xce, 0x71, 0xdf, 0xff, 0xff, 0xf0,
     0x7e, 0xf, 0xc1, 0xc0,
 
-    /* U+435 "е" */
+    /* U+0435 "е" */
     0x3e, 0x3f, 0xb8, 0xfc, 0x7f, 0xff, 0xff, 0x81,
     0xc0, 0xe3, 0xbf, 0x8f, 0x80,
 
-    /* U+436 "ж" */
+    /* U+0436 "ж" */
     0xe6, 0x76, 0x66, 0x66, 0x63, 0x6c, 0x36, 0xc3,
-    0xfc, 0x36, 0xc3, 0x6c, 0x66, 0x66, 0x66, 0xe6,
+    0xfc, 0x36, 0xc3, 0x6e, 0x66, 0x66, 0x66, 0xe6,
     0x70,
 
-    /* U+437 "з" */
+    /* U+0437 "з" */
     0x3f, 0x1f, 0xfe, 0x1c, 0x7, 0x1f, 0x87, 0xe0,
     0x1c, 0x7, 0xe1, 0xdf, 0xe3, 0xf0,
 
-    /* U+438 "и" */
+    /* U+0438 "и" */
     0xc3, 0xe3, 0xf1, 0xf9, 0xfc, 0xde, 0xef, 0x67,
     0xb3, 0xf1, 0xf8, 0xf8, 0x60,
 
-    /* U+439 "й" */
+    /* U+0439 "й" */
     0x63, 0x31, 0x8f, 0x83, 0x80, 0x6, 0x1f, 0x1f,
     0x8f, 0xcf, 0xe6, 0xf7, 0x7b, 0x3f, 0x9f, 0x8f,
     0xc7, 0xc3,
 
-    /* U+43A "к" */
+    /* U+043A "к" */
     0xe1, 0xf8, 0xee, 0x33, 0x9c, 0xfe, 0x3f, 0x8e,
     0x73, 0x9c, 0xe3, 0xb8, 0x6e, 0x1c,
 
-    /* U+43B "л" */
+    /* U+043B "л" */
     0x3f, 0xcf, 0xf3, 0x9c, 0xe7, 0x39, 0xce, 0x73,
     0x9c, 0xe7, 0x39, 0xfc, 0x7e, 0x1c,
 
-    /* U+43C "м" */
+    /* U+043C "м" */
     0xe1, 0xf8, 0x7f, 0x3f, 0xcf, 0xda, 0xf7, 0xbd,
     0xef, 0x33, 0xc0, 0xf0, 0x3c, 0xc,
 
-    /* U+43D "н" */
+    /* U+043D "н" */
     0xe3, 0xf1, 0xf8, 0xfc, 0x7e, 0x3f, 0xff, 0xff,
     0xc7, 0xe3, 0xf1, 0xf8, 0xe0,
 
-    /* U+43E "о" */
+    /* U+043E "о" */
     0x3e, 0x3f, 0xb8, 0xfc, 0x7e, 0x3f, 0x1f, 0x8f,
     0xc7, 0xe3, 0xbf, 0x8f, 0x80,
 
-    /* U+43F "п" */
+    /* U+043F "п" */
     0xff, 0xff, 0xf8, 0xfc, 0x7e, 0x3f, 0x1f, 0x8f,
     0xc7, 0xe3, 0xf1, 0xf8, 0xe0,
 
-    /* U+440 "р" */
+    /* U+0440 "р" */
     0xee, 0x7f, 0xb8, 0xfc, 0x7e, 0x3f, 0x1f, 0x8f,
     0xc7, 0xe3, 0xff, 0xbb, 0x9c, 0xe, 0x7, 0x3,
     0x80,
 
-    /* U+441 "с" */
+    /* U+0441 "с" */
     0x3e, 0x3f, 0xb8, 0xfc, 0x7e, 0x7, 0x3, 0x81,
     0xc7, 0xe3, 0xbf, 0x8f, 0x80,
 
-    /* U+442 "т" */
+    /* U+0442 "т" */
     0xff, 0xff, 0xf0, 0xe0, 0x38, 0xe, 0x3, 0x80,
     0xe0, 0x38, 0xe, 0x3, 0x80, 0xe0,
 
-    /* U+443 "у" */
+    /* U+0443 "у" */
     0xe1, 0xf8, 0x76, 0x19, 0xce, 0x73, 0x8c, 0xc3,
     0xf0, 0x7c, 0x1e, 0x7, 0x80, 0xe0, 0x30, 0x1c,
     0x6, 0x3, 0x80,
 
-    /* U+444 "ф" */
+    /* U+0444 "ф" */
     0xc, 0x3, 0x0, 0xc0, 0xfc, 0x7f, 0xbb, 0x7c,
     0xcf, 0x33, 0xcc, 0xf3, 0x3c, 0xcf, 0xb7, 0x7f,
     0x8f, 0xc0, 0xc0, 0x30, 0xc, 0x3, 0x0,
 
-    /* U+445 "х" */
+    /* U+0445 "х" */
     0xe1, 0xdc, 0xe3, 0x30, 0xfc, 0x1e, 0x7, 0x81,
-    0xe0, 0xfc, 0x73, 0x9c, 0x6e, 0x1c,
+    0xe0, 0xfc, 0x73, 0x9c, 0xee, 0x1c,
 
-    /* U+446 "ц" */
+    /* U+0446 "ц" */
     0xe3, 0xb8, 0xee, 0x3b, 0x8e, 0xe3, 0xb8, 0xee,
     0x3b, 0x8e, 0xe3, 0xbf, 0xff, 0xfc, 0x7, 0x1,
     0xc0, 0x70,
 
-    /* U+447 "ч" */
+    /* U+0447 "ч" */
     0xe3, 0xf1, 0xf8, 0xfc, 0x7e, 0x3b, 0xfc, 0xfe,
     0x7, 0x3, 0x81, 0xc0, 0xe0,
 
-    /* U+448 "ш" */
+    /* U+0448 "ш" */
     0xcc, 0xf3, 0x3c, 0xcf, 0x33, 0xcc, 0xf3, 0x3c,
     0xcf, 0x33, 0xcc, 0xff, 0xff, 0xfc,
 
-    /* U+449 "щ" */
+    /* U+0449 "щ" */
     0xcc, 0xd9, 0x9b, 0x33, 0x66, 0x6c, 0xcd, 0x99,
     0xb3, 0x36, 0x66, 0xcc, 0xdf, 0xff, 0xff, 0x80,
     0x30, 0x6,
 
-    /* U+44A "ъ" */
+    /* U+044A "ъ" */
     0xfc, 0xf, 0xc0, 0x1c, 0x1, 0xc0, 0x1f, 0xc1,
     0xfe, 0x1c, 0x71, 0xc7, 0x1c, 0x71, 0xfe, 0x1f,
     0xc0,
 
-    /* U+44B "ы" */
+    /* U+044B "ы" */
     0xc0, 0xf0, 0x3c, 0xf, 0x3, 0xf8, 0xff, 0x3c,
-    0x6f, 0x1b, 0xc6, 0xff, 0x3f, 0x8c,
+    0xef, 0x1b, 0xc6, 0xff, 0x3f, 0x8c,
 
-    /* U+44C "ь" */
+    /* U+044C "ь" */
     0xe0, 0x38, 0xe, 0x3, 0x80, 0xff, 0x3f, 0xee,
     0x1f, 0x87, 0xe1, 0xff, 0xef, 0xf0,
 
-    /* U+44D "э" */
+    /* U+044D "э" */
     0x3e, 0x3f, 0xb8, 0xe0, 0x70, 0xf8, 0x7c, 0xf,
     0xc7, 0xe7, 0xbf, 0x8f, 0x80,
 
-    /* U+44E "ю" */
+    /* U+044E "ю" */
     0xc7, 0xb3, 0xfc, 0xcf, 0x33, 0xfc, 0xff, 0x3c,
     0xcf, 0x33, 0xcc, 0xf3, 0xfc, 0x78,
 
-    /* U+44F "я" */
+    /* U+044F "я" */
     0x3f, 0xbf, 0xf8, 0xfc, 0x7e, 0x3b, 0xfc, 0xfe,
     0x77, 0x33, 0xb9, 0xf8, 0xe0,
 
@@ -727,7 +731,7 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = {
     0xfc, 0x70, 0x7e, 0x7, 0x7, 0x0, 0x70, 0x70,
     0x7, 0x7, 0x0, 0x70, 0x70, 0x7, 0x7, 0x0,
     0x70, 0x70, 0x7f, 0x7, 0xf, 0xf7, 0xf0, 0xff,
-    0xff, 0x7, 0xef, 0xf0, 0x0, 0xff, 0x0, 0x3,
+    0xff, 0x7, 0xef, 0xf0, 0x10, 0xff, 0x0, 0x3,
     0xc0, 0x0,
 
     /* U+F017 "" */
@@ -739,11 +743,11 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = {
     0x1, 0xff, 0xc0, 0x1f, 0xf0, 0x0, 0x70, 0x0,
 
     /* U+F024 "" */
-    0x70, 0x0, 0xf, 0x80, 0x0, 0xf8, 0x0, 0xf,
+    0x70, 0x0, 0xf, 0x80, 0x0, 0xf9, 0x0, 0xf,
     0xff, 0xf, 0x7f, 0xff, 0xf7, 0xff, 0xff, 0x7f,
     0xff, 0xf7, 0xff, 0xff, 0x7f, 0xff, 0xf7, 0xff,
     0xff, 0x7f, 0xff, 0xf7, 0xff, 0xff, 0x7f, 0xff,
-    0xf7, 0xff, 0xff, 0x7f, 0x7f, 0xe7, 0x0, 0x78,
+    0xf7, 0xff, 0xff, 0x7f, 0xff, 0xe7, 0x0, 0xf8,
     0x70, 0x0, 0x7, 0x0, 0x0, 0x70, 0x0, 0x7,
     0x0, 0x0,
 
@@ -869,35 +873,35 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = {
     0x7f, 0xff, 0xff, 0x7f, 0xff, 0xff, 0xb8, 0x0,
     0x1, 0xfd, 0xff, 0xfe, 0xfe, 0xff, 0xff, 0x7f,
     0x7f, 0xff, 0x9f, 0xbf, 0xff, 0xcf, 0xdf, 0xff,
-    0xe7, 0xe0, 0x0, 0x7, 0xf0, 0x0, 0x3, 0xff,
+    0xef, 0xe0, 0x0, 0x7, 0xf0, 0x0, 0x3, 0xff,
     0xff, 0xff, 0xcf, 0xff, 0xff, 0xe0,
 
     /* U+F241 "" */
     0x7f, 0xff, 0xff, 0x7f, 0xff, 0xff, 0xb8, 0x0,
     0x1, 0xfd, 0xff, 0xe0, 0xfe, 0xff, 0xf0, 0x7f,
     0x7f, 0xf8, 0x1f, 0xbf, 0xfc, 0xf, 0xdf, 0xfe,
-    0x7, 0xe0, 0x0, 0x7, 0xf0, 0x0, 0x3, 0xff,
+    0xf, 0xe0, 0x0, 0x7, 0xf0, 0x0, 0x3, 0xff,
     0xff, 0xff, 0xcf, 0xff, 0xff, 0xe0,
 
     /* U+F242 "" */
     0x7f, 0xff, 0xff, 0x7f, 0xff, 0xff, 0xb8, 0x0,
     0x1, 0xfd, 0xfe, 0x0, 0xfe, 0xff, 0x0, 0x7f,
     0x7f, 0x80, 0x1f, 0xbf, 0xc0, 0xf, 0xdf, 0xe0,
-    0x7, 0xe0, 0x0, 0x7, 0xf0, 0x0, 0x3, 0xff,
+    0xf, 0xe0, 0x0, 0x7, 0xf0, 0x0, 0x3, 0xff,
     0xff, 0xff, 0xcf, 0xff, 0xff, 0xe0,
 
     /* U+F243 "" */
     0x7f, 0xff, 0xff, 0x7f, 0xff, 0xff, 0xb8, 0x0,
     0x1, 0xfd, 0xf0, 0x0, 0xfe, 0xf8, 0x0, 0x7f,
     0x7c, 0x0, 0x1f, 0xbe, 0x0, 0xf, 0xdf, 0x0,
-    0x7, 0xe0, 0x0, 0x7, 0xf0, 0x0, 0x3, 0xff,
+    0xf, 0xe0, 0x0, 0x7, 0xf0, 0x0, 0x3, 0xff,
     0xff, 0xff, 0xcf, 0xff, 0xff, 0xe0,
 
     /* U+F244 "" */
     0x7f, 0xff, 0xff, 0x7f, 0xff, 0xff, 0xb8, 0x0,
     0x1, 0xfc, 0x0, 0x0, 0xfe, 0x0, 0x0, 0x7f,
     0x0, 0x0, 0x1f, 0x80, 0x0, 0xf, 0xc0, 0x0,
-    0x7, 0xe0, 0x0, 0x7, 0xf0, 0x0, 0x3, 0xff,
+    0xf, 0xe0, 0x0, 0x7, 0xf0, 0x0, 0x3, 0xff,
     0xff, 0xff, 0xcf, 0xff, 0xff, 0xe0,
 
     /* U+F252 "" */
@@ -933,9 +937,9 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = {
     0x78, 0xf, 0xe0, 0x1e, 0x7, 0xf0, 0x3, 0xc1,
     0xf8, 0x0, 0xf0, 0x78, 0x0, 0x3c, 0x3c, 0x0,
     0xf, 0xbe, 0x0, 0x1, 0xfe, 0x0, 0x0, 0x7e,
-    0x0, 0x1c, 0x1f, 0x0, 0x7f, 0x3, 0xc0, 0x7f,
+    0x0, 0x1c, 0x1f, 0x0, 0x7f, 0x3, 0xc0, 0x3f,
     0xf0, 0xf0, 0x1f, 0xfc, 0x3c, 0xf, 0xfe, 0x7,
-    0x87, 0xfe, 0x1, 0xe3, 0xf8, 0x0, 0x70, 0x0,
+    0x87, 0xfe, 0x1, 0xe3, 0xf8, 0x0, 0x70, 0x80,
     0x0, 0x10,
 
     /* U+F3FD "" */
@@ -1240,9 +1244,14 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
  *  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 = {
-    .glyph_bitmap = gylph_bitmap,
+#endif
+    .glyph_bitmap = glyph_bitmap,
     .glyph_dsc = glyph_dsc,
     .cmaps = cmaps,
     .kern_dsc = NULL,
@@ -1250,7 +1259,10 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
     .cmap_num = 3,
     .bpp = 1,
     .kern_classes = 0,
-    .bitmap_format = 0
+    .bitmap_format = 0,
+#if LV_VERSION_CHECK(8, 0, 0)
+    .cache = &cache
+#endif
 };
 
 
@@ -1259,7 +1271,11 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
  *----------------*/
 
 /*Initialize a public general font descriptor*/
+#if LV_VERSION_CHECK(8, 0, 0)
+const lv_font_t jetbrains_mono_bold_20 = {
+#else
 lv_font_t jetbrains_mono_bold_20 = {
+#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 = 23,          /*The maximum line height required by the font*/
diff --git a/src/displayapp/screens/SystemInfo.cpp b/src/displayapp/screens/SystemInfo.cpp
index 0b16d633..1cf895c7 100644
--- a/src/displayapp/screens/SystemInfo.cpp
+++ b/src/displayapp/screens/SystemInfo.cpp
@@ -141,9 +141,6 @@ std::unique_ptr<Screen> SystemInfo::CreateScreen2() {
   uptimeSeconds = uptimeSeconds % secondsInAMinute;
   // TODO handle more than 100 days of uptime
 
-  if (batteryPercent == -1)
-    batteryPercent = 0;
-
   // hack to not use the flot functions from printf
   uint8_t batteryVoltageBytes[2];
   batteryVoltageBytes[1] = static_cast<uint8_t>(batteryVoltage); // truncate whole numbers
diff --git a/src/displayapp/screens/WatchFaceAnalog.cpp b/src/displayapp/screens/WatchFaceAnalog.cpp
index 02f1fc2a..0051408c 100644
--- a/src/displayapp/screens/WatchFaceAnalog.cpp
+++ b/src/displayapp/screens/WatchFaceAnalog.cpp
@@ -30,14 +30,14 @@ WatchFaceAnalog::WatchFaceAnalog(Pinetime::Applications::DisplayApp* app,
                                  Controllers::DateTime& dateTimeController,
                                  Controllers::Battery& batteryController,
                                  Controllers::Ble& bleController,
-                                 Controllers::NotificationManager& notificatioManager,
+                                 Controllers::NotificationManager& notificationManager,
                                  Controllers::Settings& settingsController)
   : Screen(app),
     currentDateTime {{}},
     dateTimeController {dateTimeController},
     batteryController {batteryController},
     bleController {bleController},
-    notificatioManager {notificatioManager},
+    notificationManager {notificationManager},
     settingsController {settingsController} {
   settingsController.SetClockFace(1);
 
@@ -172,7 +172,7 @@ bool WatchFaceAnalog::Refresh() {
     lv_label_set_text(batteryIcon, BatteryIcon::GetBatteryIcon(batteryPercent));
   }
 
-  notificationState = notificatioManager.AreNewNotificationsAvailable();
+  notificationState = notificationManager.AreNewNotificationsAvailable();
 
   if (notificationState.IsUpdated()) {
     if (notificationState.Get() == true)
@@ -202,4 +202,4 @@ bool WatchFaceAnalog::Refresh() {
   }
 
   return true;
-}
\ No newline at end of file
+}
diff --git a/src/displayapp/screens/WatchFaceAnalog.h b/src/displayapp/screens/WatchFaceAnalog.h
index 667f6241..96225558 100644
--- a/src/displayapp/screens/WatchFaceAnalog.h
+++ b/src/displayapp/screens/WatchFaceAnalog.h
@@ -27,7 +27,7 @@ namespace Pinetime {
                         Controllers::DateTime& dateTimeController,
                         Controllers::Battery& batteryController,
                         Controllers::Ble& bleController,
-                        Controllers::NotificationManager& notificatioManager,
+                        Controllers::NotificationManager& notificationManager,
                         Controllers::Settings& settingsController);
 
         ~WatchFaceAnalog() override;
@@ -79,11 +79,11 @@ namespace Pinetime {
         Controllers::DateTime& dateTimeController;
         Controllers::Battery& batteryController;
         Controllers::Ble& bleController;
-        Controllers::NotificationManager& notificatioManager;
+        Controllers::NotificationManager& notificationManager;
         Controllers::Settings& settingsController;
 
         void UpdateClock();
       };
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/drivers/St7789.cpp b/src/drivers/St7789.cpp
index 39218e77..0f1dc02e 100644
--- a/src/drivers/St7789.cpp
+++ b/src/drivers/St7789.cpp
@@ -140,8 +140,9 @@ void St7789::Uninit() {
 }
 
 void St7789::DrawPixel(uint16_t x, uint16_t y, uint32_t color) {
-  if ((x < 0) || (x >= Width) || (y < 0) || (y >= Height))
+  if (x >= Width || y >= Height) {
     return;
+  }
 
   SetAddrWindow(x, y, x + 1, y + 1);