Merge remote-tracking branch 'origin/master' into develop

7 files changed, 762 insertions, 1019 deletions

diff --git a/users/drashna/drashna.c b/users/drashna/drashna.c
index 871136c137..71539e8b80 100644
--- a/users/drashna/drashna.c
+++ b/users/drashna/drashna.c
@@ -103,8 +103,11 @@ void                       shutdown_user(void) {
 #ifdef RGB_MATRIX_ENABLE
     rgb_matrix_set_color_all(0xFF, 0x00, 0x00);
     rgb_matrix_update_pwm_buffers();
-
 #endif  // RGB_MATRIX_ENABLE
+#ifdef OLED_ENABLE
+    oled_off();
+#endif
+
     shutdown_keymap();
 }
 
diff --git a/users/drashna/drashna_font.h b/users/drashna/drashna_font.h
index e9353e62a9..27dc8b1b5d 100644
--- a/users/drashna/drashna_font.h
+++ b/users/drashna/drashna_font.h
@@ -6,660 +6,559 @@
 #if __has_include("../../../../Documents/qmk/oled_font.h")
 #    include "../../../../Documents/qmk/oled_font.h"
 #else
+
+// additional fonts from
+// https://github.com/datacute/TinyOLED-Fonts
+
 #    include "progmem.h"
 
 // clang-format off
 static const unsigned char font[] PROGMEM = {
-    0x07, 0x08, 0x7F, 0x08, 0x07, 0x00, // 0x00 0
-    0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x00, // 0x01 1
-    0x3E, 0x6B, 0x4F, 0x6B, 0x3E, 0x00, // 0x02 2
-    0x1C, 0x3E, 0x7C, 0x3E, 0x1C, 0x00, // 0x03 3 ♥
-    0x18, 0x3C, 0x7E, 0x3C, 0x18, 0x00, // 0x04 4 ♦
-    0x1C, 0x57, 0x7D, 0x57, 0x1C, 0x00, // 0x05 5 ♧
-    0x1C, 0x5E, 0x7F, 0x5E, 0x1C, 0x00, // 0x06 6 ♤
-    0x00, 0x18, 0x3C, 0x18, 0x00, 0x00, // 0x07 7
-    0xFF, 0xE7, 0xC3, 0xE7, 0xFF, 0x00, // 0x08 8
-    0x00, 0x18, 0x24, 0x18, 0x00, 0x00, // 0x09 9
-    0xFF, 0xE7, 0xDB, 0xE7, 0xFF, 0x00, // 0x0A 10
-    0x30, 0x48, 0x3A, 0x06, 0x0E, 0x00, // 0x0B 11 ♂
-    0x26, 0x29, 0x79, 0x29, 0x26, 0x00, // 0x0C 12 ♀
-    0x40, 0x7F, 0x05, 0x05, 0x07, 0x00, // 0x0D 13 ♪
-    0x40, 0x7F, 0x05, 0x25, 0x3F, 0x00, // 0x0E 14 ♫
-    0x5A, 0x3C, 0xE7, 0x3C, 0x5A, 0x00, // 0x0F 15
-    0x7F, 0x3E, 0x1C, 0x1C, 0x08, 0x00, // 0x10 16
-    0x08, 0x1C, 0x1C, 0x3E, 0x7F, 0x00, // 0x11 17
-    0x14, 0x22, 0x7F, 0x22, 0x14, 0x00, // 0x12 18 ↕
-    0x5F, 0x5F, 0x00, 0x5F, 0x5F, 0x00, // 0x13 19 ‼
-    0x06, 0x09, 0x7F, 0x01, 0x7F, 0x00, // 0x14 20 ¶
-    0x00, 0x66, 0x89, 0x95, 0x6A, 0x00, // 0x15 21 §
-    0x60, 0x60, 0x60, 0x60, 0x60, 0x00, // 0x16 22 _
-    0x94, 0xA2, 0xFF, 0xA2, 0x94, 0x00, // 0x17 23 ↨
-    0x08, 0x04, 0x7E, 0x04, 0x08, 0x00, // 0x18 24 ↑
-    0x10, 0x20, 0x7E, 0x20, 0x10, 0x00, // 0x19 25 ↓
-    0x08, 0x08, 0x2A, 0x1C, 0x08, 0x00, // 0x1A 26 →
-    0x08, 0x1C, 0x2A, 0x08, 0x08, 0x00, // 0x1B 27 ←
-    0x1E, 0x10, 0x10, 0x10, 0x10, 0x00, // 0x1C 28 ⌙h
-    0x0C, 0x1E, 0x0C, 0x1E, 0x0C, 0x00, // 0x1D 29 ↭
-    0x30, 0x38, 0x3E, 0x38, 0x30, 0x00, // 0x1E 30
-    0x06, 0x0E, 0x3E, 0x0E, 0x06, 0x00, // 0x1F 31
+    0x07, 0x08, 0x7F, 0x08, 0x07, 0x00,
+    0x3E, 0x5B, 0x4F, 0x5B, 0x3E, 0x00,
+    0x3E, 0x6B, 0x4F, 0x6B, 0x3E, 0x00,
+    0x1C, 0x3E, 0x7C, 0x3E, 0x1C, 0x00,
+    0x18, 0x3C, 0x7E, 0x3C, 0x18, 0x00,
+    0x1C, 0x57, 0x7D, 0x57, 0x1C, 0x00,
+    0x1C, 0x5E, 0x7F, 0x5E, 0x1C, 0x00,
+    0x00, 0x18, 0x3C, 0x18, 0x00, 0x00,
+    0xFF, 0xE7, 0xC3, 0xE7, 0xFF, 0x00,
+    0x00, 0x18, 0x24, 0x18, 0x00, 0x00,
+    0xFF, 0xE7, 0xDB, 0xE7, 0xFF, 0x00,
+    0x30, 0x48, 0x3A, 0x06, 0x0E, 0x00,
+    0x26, 0x29, 0x79, 0x29, 0x26, 0x00,
+    0x40, 0x7F, 0x05, 0x05, 0x07, 0x00,
+    0x40, 0x7F, 0x05, 0x25, 0x3F, 0x00,
+    0x5A, 0x3C, 0xE7, 0x3C, 0x5A, 0x00,
+    0x7F, 0x3E, 0x1C, 0x1C, 0x08, 0x00,
+    0x08, 0x1C, 0x1C, 0x3E, 0x7F, 0x00,
+    0x14, 0x22, 0x7F, 0x22, 0x14, 0x00,
+    0x5F, 0x5F, 0x00, 0x5F, 0x5F, 0x00,
+    0x06, 0x09, 0x7F, 0x01, 0x7F, 0x00,
+    0x00, 0x66, 0x89, 0x95, 0x6A, 0x00,
+    0x60, 0x60, 0x60, 0x60, 0x60, 0x00,
+    0x94, 0xA2, 0xFF, 0xA2, 0x94, 0x00,
+    0x08, 0x04, 0x7E, 0x04, 0x08, 0x00,
+    0x10, 0x20, 0x7E, 0x20, 0x10, 0x00,
+    0x08, 0x08, 0x2A, 0x1C, 0x08, 0x00,
+    0x08, 0x1C, 0x2A, 0x08, 0x08, 0x00,
+    0x1E, 0x10, 0x10, 0x10, 0x10, 0x00,
+    0x0C, 0x1E, 0x0C, 0x1E, 0x0C, 0x00,
+    0x30, 0x38, 0x3E, 0x38, 0x30, 0x00,
+    0x06, 0x0E, 0x3E, 0x0E, 0x06, 0x00,
+
 #    if defined(OLED_FONT_5X5)
-    0x00,0x00,0x00,0x00,0x00,0x00, // 0x20 32
-    0x5c,0x00,0x00,0x00,0x00,0x00, // 0x21 33 !
-    0x06,0x00,0x06,0x00,0x00,0x00, // 0x22 34 "
-    0x28,0x7c,0x28,0x7c,0x28,0x00, // 0x23 35 #
-    0x5c,0x54,0xfe,0x54,0x74,0x00, // 0x24 36 $
-    0x44,0x20,0x10,0x08,0x44,0x00, // 0x25 37 %
-    0x28,0x54,0x54,0x20,0x50,0x00, // 0x26 38 &
-    0x06,0x00,0x00,0x00,0x00,0x00, // 0x27 39 '
-    0x38,0x44,0x00,0x00,0x00,0x00, // 0x28 40 (
-    0x44,0x38,0x00,0x00,0x00,0x00, // 0x29 41 )
-    0x02,0x07,0x02,0x00,0x00,0x00, // 0x2A 42 *
-    0x10,0x10,0x7c,0x10,0x10,0x00, // 0x2B 43 +
-    0xc0,0x00,0x00,0x00,0x00,0x00, // 0x2C 44 ,
-    0x10,0x10,0x10,0x10,0x10,0x00, // 0x2D 45 -
-    0x40,0x00,0x00,0x00,0x00,0x00, // 0x2E 46 .
-    0x60,0x10,0x0c,0x00,0x00,0x00, // 0x2F 47 /
-    0x7c,0x64,0x54,0x4c,0x7c,0x00, // 0x30 48 0
-    0x48,0x7c,0x40,0x00,0x00,0x00, // 0x31 49 1
-    0x64,0x54,0x54,0x54,0x48,0x00, // 0x32 50 2
-    0x44,0x54,0x54,0x54,0x6c,0x00, // 0x33 51 3
-    0x3c,0x20,0x70,0x20,0x20,0x00, // 0x34 52 4
-    0x5c,0x54,0x54,0x54,0x24,0x00, // 0x35 53 5
-    0x7c,0x54,0x54,0x54,0x74,0x00, // 0x36 54 6
-    0x04,0x04,0x64,0x14,0x0c,0x00, // 0x37 55 7
-    0x7c,0x54,0x54,0x54,0x7c,0x00, // 0x38 56 8
-    0x5c,0x54,0x54,0x54,0x7c,0x00, // 0x39 57 9
-    0x44,0x00,0x00,0x00,0x00,0x00, // 0x3A 58 :
-    0xc4,0x00,0x00,0x00,0x00,0x00, // 0x3B 59 ;
-    0x10,0x28,0x44,0x00,0x00,0x00, // 0x3C 60 <
-    0x28,0x28,0x28,0x28,0x28,0x00, // 0x3D 61 =
-    0x44,0x28,0x10,0x00,0x00,0x00, // 0x3E 62 >
-    0x08,0x04,0x54,0x08,0x00,0x00, // 0x3F 63 ?
-    0x7c,0x44,0x54,0x54,0x5c,0x00, // 0x40 64 @
-    0x7c,0x24,0x24,0x24,0x7c,0x00, // 0x41 65 A
-    0x7c,0x54,0x54,0x54,0x6c,0x00, // 0x42 66 B
-    0x7c,0x44,0x44,0x44,0x44,0x00, // 0x43 67 C
-    0x7c,0x44,0x44,0x44,0x38,0x00, // 0x44 68 D
-    0x7c,0x54,0x54,0x54,0x44,0x00, // 0x45 69 E
-    0x7c,0x14,0x14,0x14,0x04,0x00, // 0x46 70 F
-    0x7c,0x44,0x44,0x54,0x74,0x00, // 0x47 71 G
-    0x7c,0x10,0x10,0x10,0x7c,0x00, // 0x48 72 H
-    0x44,0x44,0x7c,0x44,0x44,0x00, // 0x49 73 I
-    0x60,0x40,0x40,0x44,0x7c,0x00, // 0x4A 74 J
-    0x7c,0x10,0x10,0x28,0x44,0x00, // 0x4B 75 K
-    0x7c,0x40,0x40,0x40,0x40,0x00, // 0x4C 76 L
-    0x7c,0x08,0x10,0x08,0x7c,0x00, // 0x4D 77 M
-    0x7c,0x08,0x10,0x20,0x7c,0x00, // 0x4E 78 N
-    0x38,0x44,0x44,0x44,0x38,0x00, // 0x4F 79 O
-    0x7c,0x14,0x14,0x14,0x08,0x00, // 0x50 80 P
-    0x3c,0x24,0x64,0x24,0x3c,0x00, // 0x51 81 Q
-    0x7c,0x14,0x14,0x14,0x68,0x00, // 0x52 82 R
-    0x5c,0x54,0x54,0x54,0x74,0x00, // 0x53 83 S
-    0x04,0x04,0x7c,0x04,0x04,0x00, // 0x54 84 T
-    0x7c,0x40,0x40,0x40,0x7c,0x00, // 0x55 85 U
-    0x0c,0x30,0x40,0x30,0x0c,0x00, // 0x56 86 V
-    0x3c,0x40,0x30,0x40,0x3c,0x00, // 0x57 87 W
-    0x44,0x28,0x10,0x28,0x44,0x00, // 0x58 88 X
-    0x0c,0x10,0x60,0x10,0x0c,0x00, // 0x59 89 Y
-    0x44,0x64,0x54,0x4c,0x44,0x00, // 0x5A 90 Z
-    0x7c,0x44,0x00,0x00,0x00,0x00, // 0x5B 91 [
-    0x0c,0x10,0x60,0x00,0x00,0x00, // 0x5C 92 \ backslash
-    0x44,0x7c,0x00,0x00,0x00,0x00, // 0x5D 93 ]
-    0x00,0x01,0x00,0x01,0x00,0x00, // 0x5E 94 ^
-    0x40,0x40,0x40,0x40,0x40,0x40, // 0x5F 95 _
-    0x00,0x01,0x00,0x00,0x00,0x00, // 0x60 96 `
-    0x7c,0x24,0x24,0x24,0x7c,0x00, // 0x61 97 a
-    0x7c,0x54,0x54,0x54,0x6c,0x00, // 0x62 98 b
-    0x7c,0x44,0x44,0x44,0x44,0x00, // 0x63 99 c
-    0x7c,0x44,0x44,0x44,0x38,0x00, // 0x64 100 d
-    0x7c,0x54,0x54,0x54,0x44,0x00, // 0x65 101 e
-    0x7c,0x14,0x14,0x14,0x04,0x00, // 0x66 102 f
-    0x7c,0x44,0x44,0x54,0x74,0x00, // 0x67 103 g
-    0x7c,0x10,0x10,0x10,0x7c,0x00, // 0x68 104 h
-    0x44,0x44,0x7c,0x44,0x44,0x00, // 0x69 105 i
-    0x60,0x40,0x40,0x44,0x7c,0x00, // 0x6A 106 j
-    0x7c,0x10,0x10,0x28,0x44,0x00, // 0x6B 107 k
-    0x7c,0x40,0x40,0x40,0x40,0x00, // 0x6C 108 l
-    0x7c,0x08,0x10,0x08,0x7c,0x00, // 0x6D 109 m
-    0x7c,0x08,0x10,0x20,0x7c,0x00, // 0x6E 110 n
-    0x38,0x44,0x44,0x44,0x38,0x00, // 0x6F 111 o
-    0x7c,0x14,0x14,0x14,0x08,0x00, // 0x70 112 p
-    0x3c,0x24,0x64,0x24,0x3c,0x00, // 0x71 113 q
-    0x7c,0x14,0x14,0x14,0x68,0x00, // 0x72 114 r
-    0x5c,0x54,0x54,0x54,0x74,0x00, // 0x73 115 s
-    0x04,0x04,0x7c,0x04,0x04,0x00, // 0x74 116 t
-    0x7c,0x40,0x40,0x40,0x7c,0x00, // 0x75 117 u
-    0x0c,0x30,0x40,0x30,0x0c,0x00, // 0x76 118 v
-    0x3c,0x40,0x30,0x40,0x3c,0x00, // 0x77 119 w
-    0x44,0x28,0x10,0x28,0x44,0x00, // 0x78 120 x
-    0x0c,0x10,0x60,0x10,0x0c,0x00, // 0x79 121 y
-    0x44,0x64,0x54,0x4c,0x44,0x00, // 0x7A 122 z
-    0x10,0x7c,0x44,0x00,0x00,0x00, // 0x7B 123 {
-    0x6c,0x00,0x00,0x00,0x00,0x00, // 0x7C 124 |
-    0x44,0x7c,0x10,0x00,0x00,0x00, // 0x7D 125 }
-    0x02,0x01,0x02,0x01,0x00,0x00, // 0x7E 126 ~
-    0x00,0x00,0x00,0x00,0x00,0x00, // 0x7F 127
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x5c, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x06, 0x00, 0x06, 0x00, 0x00, 0x00,
+    0x28, 0x7c, 0x28, 0x7c, 0x28, 0x00,
+    0x5c, 0x54, 0xfe, 0x54, 0x74, 0x00,
+    0x44, 0x20, 0x10, 0x08, 0x44, 0x00,
+    0x28, 0x54, 0x54, 0x20, 0x50, 0x00,
+    0x06, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x38, 0x44, 0x00, 0x00, 0x00, 0x00,
+    0x44, 0x38, 0x00, 0x00, 0x00, 0x00,
+    0x02, 0x07, 0x02, 0x00, 0x00, 0x00,
+    0x10, 0x10, 0x7c, 0x10, 0x10, 0x00,
+    0xc0, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x10, 0x10, 0x10, 0x10, 0x10, 0x00,
+    0x40, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x60, 0x10, 0x0c, 0x00, 0x00, 0x00,
+    0x7c, 0x64, 0x54, 0x4c, 0x7c, 0x00,
+    0x48, 0x7c, 0x40, 0x00, 0x00, 0x00,
+    0x64, 0x54, 0x54, 0x54, 0x48, 0x00,
+    0x44, 0x54, 0x54, 0x54, 0x6c, 0x00,
+    0x3c, 0x20, 0x70, 0x20, 0x20, 0x00,
+    0x5c, 0x54, 0x54, 0x54, 0x24, 0x00,
+    0x7c, 0x54, 0x54, 0x54, 0x74, 0x00,
+    0x04, 0x04, 0x64, 0x14, 0x0c, 0x00,
+    0x7c, 0x54, 0x54, 0x54, 0x7c, 0x00,
+    0x5c, 0x54, 0x54, 0x54, 0x7c, 0x00,
+    0x44, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xc4, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x10, 0x28, 0x44, 0x00, 0x00, 0x00,
+    0x28, 0x28, 0x28, 0x28, 0x28, 0x00,
+    0x44, 0x28, 0x10, 0x00, 0x00, 0x00,
+    0x08, 0x04, 0x54, 0x08, 0x00, 0x00,
+    0x7c, 0x44, 0x54, 0x54, 0x5c, 0x00,
+    0x7c, 0x24, 0x24, 0x24, 0x7c, 0x00,
+    0x7c, 0x54, 0x54, 0x54, 0x6c, 0x00,
+    0x7c, 0x44, 0x44, 0x44, 0x44, 0x00,
+    0x7c, 0x44, 0x44, 0x44, 0x38, 0x00,
+    0x7c, 0x54, 0x54, 0x54, 0x44, 0x00,
+    0x7c, 0x14, 0x14, 0x14, 0x04, 0x00,
+    0x7c, 0x44, 0x44, 0x54, 0x74, 0x00,
+    0x7c, 0x10, 0x10, 0x10, 0x7c, 0x00,
+    0x44, 0x44, 0x7c, 0x44, 0x44, 0x00,
+    0x60, 0x40, 0x40, 0x44, 0x7c, 0x00,
+    0x7c, 0x10, 0x10, 0x28, 0x44, 0x00,
+    0x7c, 0x40, 0x40, 0x40, 0x40, 0x00,
+    0x7c, 0x08, 0x10, 0x08, 0x7c, 0x00,
+    0x7c, 0x08, 0x10, 0x20, 0x7c, 0x00,
+    0x38, 0x44, 0x44, 0x44, 0x38, 0x00,
+    0x7c, 0x14, 0x14, 0x14, 0x08, 0x00,
+    0x3c, 0x24, 0x64, 0x24, 0x3c, 0x00,
+    0x7c, 0x14, 0x14, 0x14, 0x68, 0x00,
+    0x5c, 0x54, 0x54, 0x54, 0x74, 0x00,
+    0x04, 0x04, 0x7c, 0x04, 0x04, 0x00,
+    0x7c, 0x40, 0x40, 0x40, 0x7c, 0x00,
+    0x0c, 0x30, 0x40, 0x30, 0x0c, 0x00,
+    0x3c, 0x40, 0x30, 0x40, 0x3c, 0x00,
+    0x44, 0x28, 0x10, 0x28, 0x44, 0x00,
+    0x0c, 0x10, 0x60, 0x10, 0x0c, 0x00,
+    0x44, 0x64, 0x54, 0x4c, 0x44, 0x00,
+    0x7c, 0x44, 0x00, 0x00, 0x00, 0x00,
+    0x0c, 0x10, 0x60, 0x00, 0x00, 0x00,
+    0x44, 0x7c, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x01, 0x00, 0x01, 0x00, 0x00,
+    0x40, 0x40, 0x40, 0x40, 0x40, 0x40,
+    0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
+    0x7c, 0x24, 0x24, 0x24, 0x7c, 0x00,
+    0x7c, 0x54, 0x54, 0x54, 0x6c, 0x00,
+    0x7c, 0x44, 0x44, 0x44, 0x44, 0x00,
+    0x7c, 0x44, 0x44, 0x44, 0x38, 0x00,
+    0x7c, 0x54, 0x54, 0x54, 0x44, 0x00,
+    0x7c, 0x14, 0x14, 0x14, 0x04, 0x00,
+    0x7c, 0x44, 0x44, 0x54, 0x74, 0x00,
+    0x7c, 0x10, 0x10, 0x10, 0x7c, 0x00,
+    0x44, 0x44, 0x7c, 0x44, 0x44, 0x00,
+    0x60, 0x40, 0x40, 0x44, 0x7c, 0x00,
+    0x7c, 0x10, 0x10, 0x28, 0x44, 0x00,
+    0x7c, 0x40, 0x40, 0x40, 0x40, 0x00,
+    0x7c, 0x08, 0x10, 0x08, 0x7c, 0x00,
+    0x7c, 0x08, 0x10, 0x20, 0x7c, 0x00,
+    0x38, 0x44, 0x44, 0x44, 0x38, 0x00,
+    0x7c, 0x14, 0x14, 0x14, 0x08, 0x00,
+    0x3c, 0x24, 0x64, 0x24, 0x3c, 0x00,
+    0x7c, 0x14, 0x14, 0x14, 0x68, 0x00,
+    0x5c, 0x54, 0x54, 0x54, 0x74, 0x00,
+    0x04, 0x04, 0x7c, 0x04, 0x04, 0x00,
+    0x7c, 0x40, 0x40, 0x40, 0x7c, 0x00,
+    0x0c, 0x30, 0x40, 0x30, 0x0c, 0x00,
+    0x3c, 0x40, 0x30, 0x40, 0x3c, 0x00,
+    0x44, 0x28, 0x10, 0x28, 0x44, 0x00,
+    0x0c, 0x10, 0x60, 0x10, 0x0c, 0x00,
+    0x44, 0x64, 0x54, 0x4c, 0x44, 0x00,
+    0x10, 0x7c, 0x44, 0x00, 0x00, 0x00,
+    0x6c, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x44, 0x7c, 0x10, 0x00, 0x00, 0x00,
+    0x02, 0x01, 0x02, 0x01, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 #    lif defined(OLED_FONT_AZTECH)
-    0x00,0x00,0x00,0x00,0x00,0x00, // 0x20 32
-    0x00,0x2e,0x00,0x00,0x00,0x00, // 0x21 33 !
-    0x00,0x02,0x00,0x02,0x00,0x00, // 0x22 34 "
-    0x00,0x0a,0x1e,0x0a,0x1e,0x00, // 0x23 35 #
-    0x00,0x0e,0x2a,0x6b,0x2a,0x3a, // 0x24 36 $
-    0x00,0x06,0x06,0x26,0x18,0x06, // 0x25 37 %
-    0x38,0x3e,0x2a,0x2a,0x28,0x38, // 0x26 38 &
-    0x18,0x02,0x00,0x00,0x00,0x00, // 0x27 39 '
-    0x00,0x3e,0x22,0x00,0x00,0x00, // 0x28 40 (
-    0x00,0x22,0x3e,0x00,0x00,0x00, // 0x29 41 )
-    0x00,0x0e,0x0e,0x0e,0x04,0x00, // 0x2A 42 *
-    0x00,0x08,0x1c,0x08,0x00,0x00, // 0x2B 43 +
-    0x00,0x20,0x00,0x00,0x00,0x00, // 0x2C 44 ,
-    0x00,0x08,0x08,0x08,0x00,0x00, // 0x2D 45 -
-    0x00,0x20,0x00,0x00,0x00,0x00, // 0x2E 46 .
-    0x00,0x20,0x18,0x06,0x00,0x00, // 0x2F 47 /
-    0x00,0x3e,0x22,0x2a,0x22,0x3e, // 0x30 48 0
-    0x02,0x3e,0x00,0x00,0x00,0x00, // 0x31 49 1
-    0x00,0x38,0x28,0x2a,0x2a,0x2e, // 0x32 50 2
-    0x00,0x22,0x2a,0x2e,0x38,0x00, // 0x33 51 3
-    0x00,0x0e,0x08,0x08,0x3e,0x08, // 0x34 52 4
-    0x00,0x2e,0x2a,0x2a,0x28,0x38, // 0x35 53 5
-    0x00,0x3e,0x2a,0x2a,0x28,0x38, // 0x36 54 6
-    0x00,0x06,0x02,0x02,0x0a,0x3e, // 0x37 55 7
-    0x00,0x38,0x2e,0x2a,0x2e,0x38, // 0x38 56 8
-    0x00,0x0e,0x0a,0x2a,0x2a,0x3e, // 0x39 57 9
-    0x00,0x28,0x00,0x00,0x00,0x00, // 0x3A 58 :
-    0x00,0x28,0x00,0x00,0x00,0x00, // 0x3B 59 ;
-    0x00,0x08,0x14,0x22,0x00,0x00, // 0x3C 60 <
-    0x00,0x14,0x14,0x14,0x14,0x00, // 0x3D 61 =
-    0x00,0x22,0x14,0x08,0x00,0x00, // 0x3E 62 >
-    0x00,0x06,0x02,0x2a,0x0a,0x06, // 0x3F 63 ?
-    0x00,0x3e,0x02,0x3a,0x2a,0x0a, // 0x40 64 @
-    0x22,0x3e,0x02,0x0a,0x0a,0x3e, // 0x41 65 A
-    0x00,0x3e,0x22,0x2a,0x2e,0x38, // 0x42 66 B
-    0x00,0x3e,0x22,0x22,0x20,0x30, // 0x43 67 C
-    0x00,0x3e,0x22,0x22,0x22,0x3c, // 0x44 68 D
-    0x00,0x3e,0x2a,0x22,0x20,0x30, // 0x45 69 E
-    0x00,0x3e,0x0a,0x0a,0x06,0x02, // 0x46 70 F
-    0x00,0x3e,0x22,0x2a,0x28,0x38, // 0x47 71 G
-    0x00,0x3e,0x08,0x08,0x08,0x3e, // 0x48 72 H
-    0x00,0x22,0x3e,0x22,0x00,0x00, // 0x49 73 I
-    0x00,0x30,0x20,0x20,0x22,0x3e, // 0x4A 74 J
-    0x00,0x3e,0x08,0x08,0x0e,0x38, // 0x4B 75 K
-    0x00,0x3e,0x20,0x20,0x20,0x30, // 0x4C 76 L
-    0x00,0x3e,0x02,0x3e,0x20,0x3e, // 0x4D 77 M
-    0x3e,0x3e,0x02,0x3e,0x20,0x3e, // 0x4E 78 N
-    0x00,0x3e,0x22,0x22,0x22,0x3e, // 0x4F 79 O
-    0x00,0x3e,0x02,0x0a,0x0a,0x0e, // 0x50 80 P
-    0x00,0x3e,0x22,0x22,0x22,0x3e, // 0x51 81 Q
-    0x00,0x3e,0x02,0x0a,0x0e,0x38, // 0x52 82 R
-    0x00,0x0e,0x0a,0x2a,0x2a,0x3a, // 0x53 83 S
-    0x00,0x06,0x02,0x3e,0x02,0x06, // 0x54 84 T
-    0x00,0x3e,0x20,0x20,0x20,0x3e, // 0x55 85 U
-    0x00,0x3e,0x20,0x20,0x3e,0x00, // 0x56 86 V
-    0x00,0x3e,0x20,0x3e,0x02,0x3e, // 0x57 87 W
-    0x3e,0x3a,0x0e,0x08,0x0e,0x3a, // 0x58 88 X
-    0x00,0x0e,0x08,0x08,0x28,0x3e, // 0x59 89 Y
-    0x00,0x3a,0x2a,0x2a,0x0a,0x0e, // 0x5A 90 Z
-    0x00,0x3e,0x22,0x00,0x00,0x00, // 0x5B 91 [
-    0x00,0x02,0x0c,0x30,0x00,0x00, // 0x5C 92 \ backslash
-    0x22,0x3e,0x00,0x00,0x00,0x00, // 0x5D 93 ]
-    0x00,0x01,0x00,0x01,0x00,0x00, // 0x5E 94 ^
-    0x00,0x20,0x20,0x20,0x00,0x00, // 0x5F 95 _
-    0x00,0x01,0x00,0x00,0x00,0x00, // 0x60 96 `
-    0x00,0x38,0x28,0x28,0x08,0x38, // 0x61 97 a
-    0x00,0x3e,0x20,0x28,0x28,0x38, // 0x62 98 b
-    0x00,0x38,0x28,0x28,0x20,0x30, // 0x63 99 c
-    0x00,0x38,0x28,0x28,0x20,0x3e, // 0x64 100 d
-    0x00,0xf8,0x88,0x28,0x28,0x38, // 0x65 101 e
-    0x00,0xf8,0x28,0x28,0x18,0x08, // 0x66 102 f
-    0x00,0x38,0x28,0xa8,0x88,0xf8, // 0x67 103 g
-    0x00,0x3c,0x08,0x08,0x08,0x38, // 0x68 104 h
-    0x00,0x3a,0x00,0x00,0x00,0x00, // 0x69 105 i
-    0x80,0xfa,0x00,0x00,0x00,0x00, // 0x6A 106 j
-    0x00,0x3e,0x08,0x08,0x38,0x2c, // 0x6B 107 k
-    0x00,0x3e,0x20,0x00,0x00,0x00, // 0x6C 108 l
-    0x00,0x38,0x08,0x38,0x20,0x38, // 0x6D 109 m
-    0x38,0x38,0x08,0x38,0x20,0x38, // 0x6E 110 n
-    0x00,0x38,0x28,0x28,0x28,0x38, // 0x6F 111 o
-    0x00,0xf8,0x08,0x28,0x28,0x38, // 0x70 112 p
-    0x00,0x38,0x28,0x28,0x08,0xf8, // 0x71 113 q
-    0x00,0x38,0x08,0x08,0x18,0x08, // 0x72 114 r
-    0x00,0x38,0x28,0xa8,0xa8,0xe8, // 0x73 115 s
-    0x00,0x3e,0x28,0x28,0x20,0x30, // 0x74 116 t
-    0x00,0x38,0x20,0x20,0x20,0x38, // 0x75 117 u
-    0x00,0x38,0x20,0x38,0x00,0x00, // 0x76 118 v
-    0x00,0x38,0x20,0x38,0x08,0x38, // 0x77 119 w
-    0x38,0x28,0x38,0x10,0x38,0x28, // 0x78 120 x
-    0x00,0x38,0x20,0xa0,0xa0,0xf8, // 0x79 121 y
-    0x00,0xe8,0xa8,0xa8,0x28,0x38, // 0x7A 122 z
-    0x08,0x3e,0x22,0x00,0x00,0x00, // 0x7B 123 {
-    0x00,0x3f,0x00,0x00,0x00,0x00, // 0x7C 124 |
-    0x22,0x3e,0x08,0x00,0x00,0x00, // 0x7D 125 }
-    0x00,0x00,0x00,0x00,0x00,0x00, // 0x7E 126 ~
-    0x00,0x00,0x00,0x00,0x00,0x00, // 0x7F 127
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x2e, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x02, 0x00, 0x02, 0x00, 0x00,
+    0x00, 0x0a, 0x1e, 0x0a, 0x1e, 0x00,
+    0x00, 0x0e, 0x2a, 0x6b, 0x2a, 0x3a,
+    0x00, 0x06, 0x06, 0x26, 0x18, 0x06,
+    0x38, 0x3e, 0x2a, 0x2a, 0x28, 0x38,
+    0x18, 0x02, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x3e, 0x22, 0x00, 0x00, 0x00,
+    0x00, 0x22, 0x3e, 0x00, 0x00, 0x00,
+    0x00, 0x0e, 0x0e, 0x0e, 0x04, 0x00,
+    0x00, 0x08, 0x1c, 0x08, 0x00, 0x00,
+    0x00, 0x20, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x08, 0x08, 0x08, 0x00, 0x00,
+    0x00, 0x20, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x20, 0x18, 0x06, 0x00, 0x00,
+    0x00, 0x3e, 0x22, 0x2a, 0x22, 0x3e,
+    0x02, 0x3e, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x38, 0x28, 0x2a, 0x2a, 0x2e,
+    0x00, 0x22, 0x2a, 0x2e, 0x38, 0x00,
+    0x00, 0x0e, 0x08, 0x08, 0x3e, 0x08,
+    0x00, 0x2e, 0x2a, 0x2a, 0x28, 0x38,
+    0x00, 0x3e, 0x2a, 0x2a, 0x28, 0x38,
+    0x00, 0x06, 0x02, 0x02, 0x0a, 0x3e,
+    0x00, 0x38, 0x2e, 0x2a, 0x2e, 0x38,
+    0x00, 0x0e, 0x0a, 0x2a, 0x2a, 0x3e,
+    0x00, 0x28, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x28, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x08, 0x14, 0x22, 0x00, 0x00,
+    0x00, 0x14, 0x14, 0x14, 0x14, 0x00,
+    0x00, 0x22, 0x14, 0x08, 0x00, 0x00,
+    0x00, 0x06, 0x02, 0x2a, 0x0a, 0x06,
+    0x00, 0x3e, 0x02, 0x3a, 0x2a, 0x0a,
+    0x22, 0x3e, 0x02, 0x0a, 0x0a, 0x3e,
+    0x00, 0x3e, 0x22, 0x2a, 0x2e, 0x38,
+    0x00, 0x3e, 0x22, 0x22, 0x20, 0x30,
+    0x00, 0x3e, 0x22, 0x22, 0x22, 0x3c,
+    0x00, 0x3e, 0x2a, 0x22, 0x20, 0x30,
+    0x00, 0x3e, 0x0a, 0x0a, 0x06, 0x02,
+    0x00, 0x3e, 0x22, 0x2a, 0x28, 0x38,
+    0x00, 0x3e, 0x08, 0x08, 0x08, 0x3e,
+    0x00, 0x22, 0x3e, 0x22, 0x00, 0x00,
+    0x00, 0x30, 0x20, 0x20, 0x22, 0x3e,
+    0x00, 0x3e, 0x08, 0x08, 0x0e, 0x38,
+    0x00, 0x3e, 0x20, 0x20, 0x20, 0x30,
+    0x00, 0x3e, 0x02, 0x3e, 0x20, 0x3e,
+    0x3e, 0x3e, 0x02, 0x3e, 0x20, 0x3e,
+    0x00, 0x3e, 0x22, 0x22, 0x22, 0x3e,
+    0x00, 0x3e, 0x02, 0x0a, 0x0a, 0x0e,
+    0x00, 0x3e, 0x22, 0x22, 0x22, 0x3e,
+    0x00, 0x3e, 0x02, 0x0a, 0x0e, 0x38,
+    0x00, 0x0e, 0x0a, 0x2a, 0x2a, 0x3a,
+    0x00, 0x06, 0x02, 0x3e, 0x02, 0x06,
+    0x00, 0x3e, 0x20, 0x20, 0x20, 0x3e,
+    0x00, 0x3e, 0x20, 0x20, 0x3e, 0x00,
+    0x00, 0x3e, 0x20, 0x3e, 0x02, 0x3e,
+    0x3e, 0x3a, 0x0e, 0x08, 0x0e, 0x3a,
+    0x00, 0x0e, 0x08, 0x08, 0x28, 0x3e,
+    0x00, 0x3a, 0x2a, 0x2a, 0x0a, 0x0e,
+    0x00, 0x3e, 0x22, 0x00, 0x00, 0x00,
+    0x00, 0x02, 0x0c, 0x30, 0x00, 0x00,
+    0x22, 0x3e, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x01, 0x00, 0x01, 0x00, 0x00,
+    0x00, 0x20, 0x20, 0x20, 0x00, 0x00,
+    0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x38, 0x28, 0x28, 0x08, 0x38,
+    0x00, 0x3e, 0x20, 0x28, 0x28, 0x38,
+    0x00, 0x38, 0x28, 0x28, 0x20, 0x30,
+    0x00, 0x38, 0x28, 0x28, 0x20, 0x3e,
+    0x00, 0xf8, 0x88, 0x28, 0x28, 0x38,
+    0x00, 0xf8, 0x28, 0x28, 0x18, 0x08,
+    0x00, 0x38, 0x28, 0xa8, 0x88, 0xf8,
+    0x00, 0x3c, 0x08, 0x08, 0x08, 0x38,
+    0x00, 0x3a, 0x00, 0x00, 0x00, 0x00,
+    0x80, 0xfa, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x3e, 0x08, 0x08, 0x38, 0x2c,
+    0x00, 0x3e, 0x20, 0x00, 0x00, 0x00,
+    0x00, 0x38, 0x08, 0x38, 0x20, 0x38,
+    0x38, 0x38, 0x08, 0x38, 0x20, 0x38,
+    0x00, 0x38, 0x28, 0x28, 0x28, 0x38,
+    0x00, 0xf8, 0x08, 0x28, 0x28, 0x38,
+    0x00, 0x38, 0x28, 0x28, 0x08, 0xf8,
+    0x00, 0x38, 0x08, 0x08, 0x18, 0x08,
+    0x00, 0x38, 0x28, 0xa8, 0xa8, 0xe8,
+    0x00, 0x3e, 0x28, 0x28, 0x20, 0x30,
+    0x00, 0x38, 0x20, 0x20, 0x20, 0x38,
+    0x00, 0x38, 0x20, 0x38, 0x00, 0x00,
+    0x00, 0x38, 0x20, 0x38, 0x08, 0x38,
+    0x38, 0x28, 0x38, 0x10, 0x38, 0x28,
+    0x00, 0x38, 0x20, 0xa0, 0xa0, 0xf8,
+    0x00, 0xe8, 0xa8, 0xa8, 0x28, 0x38,
+    0x08, 0x3e, 0x22, 0x00, 0x00, 0x00,
+    0x00, 0x3f, 0x00, 0x00, 0x00, 0x00,
+    0x22, 0x3e, 0x08, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 #    elif defined(OLED_FONT_BMPLAIN)
-    0x00,0x00,0x00,0x00,0x00,0x00, // 0x20 32
-    0x2e,0x00,0x00,0x00,0x00,0x00, // 0x21 33 !
-    0x03,0x00,0x03,0x00,0x00,0x00, // 0x22 34 "
-    0x0a,0x1f,0x0a,0x1f,0x0a,0x00, // 0x23 35 #
-    0x2e,0x2a,0x6b,0x2a,0x3a,0x00, // 0x24 36 $
-    0x0e,0x2a,0x1e,0x08,0x3c,0x2a, // 0x25 37 %
-    0x3e,0x2a,0x2a,0x22,0x38,0x08, // 0x26 38 &
-    0x03,0x00,0x00,0x00,0x00,0x00, // 0x27 39 '
-    0x1c,0x22,0x00,0x00,0x00,0x00, // 0x28 40 (
-    0x22,0x1c,0x00,0x00,0x00,0x00, // 0x29 41 )
-    0x15,0x0e,0x04,0x0e,0x15,0x00, // 0x2A 42 *
-    0x08,0x08,0x3e,0x08,0x08,0x00, // 0x2B 43 +
-    0x60,0x00,0x00,0x00,0x00,0x00, // 0x2C 44 ,
-    0x08,0x08,0x08,0x08,0x08,0x00, // 0x2D 45 -
-    0x20,0x00,0x00,0x00,0x00,0x00, // 0x2E 46 .
-    0x20,0x10,0x08,0x04,0x02,0x00, // 0x2F 47 /
-    0x3e,0x22,0x2a,0x22,0x3e,0x00, // 0x30 48 0
-    0x04,0x3e,0x00,0x00,0x00,0x00, // 0x31 49 1
-    0x3a,0x2a,0x2a,0x2a,0x2e,0x00, // 0x32 50 2
-    0x2a,0x2a,0x2a,0x2a,0x3e,0x00, // 0x33 51 3
-    0x0e,0x08,0x08,0x08,0x3e,0x00, // 0x34 52 4
-    0x2e,0x2a,0x2a,0x2a,0x3a,0x00, // 0x35 53 5
-    0x3e,0x2a,0x2a,0x2a,0x3a,0x00, // 0x36 54 6
-    0x02,0x02,0x02,0x02,0x3e,0x00, // 0x37 55 7
-    0x3e,0x2a,0x2a,0x2a,0x3e,0x00, // 0x38 56 8
-    0x2e,0x2a,0x2a,0x2a,0x3e,0x00, // 0x39 57 9
-    0x14,0x00,0x00,0x00,0x00,0x00, // 0x3A 58 :
-    0x34,0x00,0x00,0x00,0x00,0x00, // 0x3B 59 ;
-    0x08,0x14,0x22,0x00,0x00,0x00, // 0x3C 60 <
-    0x14,0x14,0x14,0x14,0x14,0x00, // 0x3D 61 =
-    0x22,0x14,0x08,0x00,0x00,0x00, // 0x3E 62 >
-    0x06,0x02,0x2a,0x0a,0x0e,0x00, // 0x3F 63 ?
-    0x3e,0x02,0x3a,0x2a,0x3e,0x00, // 0x40 64 @
-    0x3e,0x12,0x12,0x12,0x3e,0x00, // 0x41 65 A
-    0x3e,0x2a,0x2a,0x2a,0x36,0x00, // 0x42 66 B
-    0x3e,0x22,0x22,0x22,0x22,0x00, // 0x43 67 C
-    0x3e,0x22,0x22,0x22,0x1c,0x00, // 0x44 68 D
-    0x3e,0x2a,0x2a,0x2a,0x22,0x00, // 0x45 69 E
-    0x3e,0x0a,0x0a,0x0a,0x02,0x00, // 0x46 70 F
-    0x3e,0x22,0x2a,0x2a,0x3a,0x00, // 0x47 71 G
-    0x3e,0x08,0x08,0x08,0x3e,0x00, // 0x48 72 H
-    0x22,0x3e,0x22,0x00,0x00,0x00, // 0x49 73 I
-    0x38,0x20,0x20,0x20,0x3e,0x00, // 0x4A 74 J
-    0x3e,0x08,0x08,0x14,0x22,0x00, // 0x4B 75 K
-    0x3e,0x20,0x20,0x20,0x20,0x00, // 0x4C 76 L
-    0x3e,0x04,0x38,0x04,0x3e,0x00, // 0x4D 77 M
-    0x3e,0x04,0x08,0x10,0x3e,0x00, // 0x4E 78 N
-    0x3e,0x22,0x22,0x22,0x3e,0x00, // 0x4F 79 O
-    0x3e,0x0a,0x0a,0x0a,0x0e,0x00, // 0x50 80 P
-    0x3e,0x22,0x72,0x22,0x3e,0x00, // 0x51 81 Q
-    0x3e,0x0a,0x0a,0x1a,0x2e,0x00, // 0x52 82 R
-    0x2e,0x2a,0x2a,0x2a,0x3a,0x00, // 0x53 83 S
-    0x02,0x02,0x3e,0x02,0x02,0x00, // 0x54 84 T
-    0x1e,0x20,0x20,0x20,0x1e,0x00, // 0x55 85 U
-    0x0e,0x10,0x20,0x10,0x0e,0x00, // 0x56 86 V
-    0x3e,0x10,0x0e,0x10,0x3e,0x00, // 0x57 87 W
-    0x22,0x14,0x08,0x14,0x22,0x00, // 0x58 88 X
-    0x02,0x04,0x38,0x04,0x02,0x00, // 0x59 89 Y
-    0x3a,0x2a,0x2a,0x2a,0x2e,0x00, // 0x5A 90 Z
-    0x3e,0x22,0x00,0x00,0x00,0x00, // 0x5B 91 [
-    0x3f,0x21,0x3f,0x00,0x00,0x00, // 0x5C 92 \ backslash
-    0x22,0x3e,0x00,0x00,0x00,0x00, // 0x5D 93 ]
-    0x0c,0x1e,0x3c,0x1e,0x0c,0x00, // 0x5E 94 ^
-    0x20,0x20,0x20,0x20,0x20,0x00, // 0x5F 95 _
-    0x1c,0x3e,0x3e,0x3e,0x1c,0x00, // 0x60 96 `
-    0x3c,0x24,0x24,0x24,0x3c,0x20, // 0x61 97 a
-    0x3e,0x24,0x24,0x24,0x3c,0x00, // 0x62 98 b
-    0x3c,0x24,0x24,0x24,0x24,0x00, // 0x63 99 c
-    0x3c,0x24,0x24,0x24,0x3e,0x00, // 0x64 100 d
-    0x3c,0x24,0x34,0x2c,0x24,0x00, // 0x65 101 e
-    0x08,0x3e,0x0a,0x0a,0x00,0x00, // 0x66 102 f
-    0x1c,0x54,0x54,0x54,0x7c,0x00, // 0x67 103 g
-    0x3e,0x04,0x04,0x04,0x3c,0x00, // 0x68 104 h
-    0x3a,0x00,0x00,0x00,0x00,0x00, // 0x69 105 i
-    0x7a,0x00,0x00,0x00,0x00,0x00, // 0x6A 106 j
-    0x3e,0x08,0x14,0x22,0x00,0x00, // 0x6B 107 k
-    0x02,0x3e,0x00,0x00,0x00,0x00, // 0x6C 108 l
-    0x3c,0x04,0x3c,0x04,0x3c,0x00, // 0x6D 109 m
-    0x3c,0x04,0x04,0x04,0x3c,0x00, // 0x6E 110 n
-    0x3c,0x24,0x24,0x24,0x3c,0x00, // 0x6F 111 o
-    0x7c,0x24,0x24,0x24,0x3c,0x00, // 0x70 112 p
-    0x3c,0x24,0x24,0x24,0x7c,0x00, // 0x71 113 q
-    0x3c,0x04,0x04,0x04,0x00,0x00, // 0x72 114 r
-    0x24,0x2c,0x34,0x24,0x00,0x00, // 0x73 115 s
-    0x04,0x3e,0x24,0x24,0x00,0x00, // 0x74 116 t
-    0x3c,0x20,0x20,0x20,0x3c,0x00, // 0x75 117 u
-    0x0c,0x10,0x20,0x10,0x0c,0x00, // 0x76 118 v
-    0x3c,0x20,0x3c,0x20,0x3c,0x00, // 0x77 119 w
-    0x24,0x24,0x18,0x24,0x24,0x00, // 0x78 120 x
-    0x1c,0x50,0x50,0x50,0x7c,0x00, // 0x79 121 y
-    0x24,0x34,0x2c,0x24,0x00,0x00, // 0x7A 122 z
-    0x08,0x3e,0x22,0x00,0x00,0x00, // 0x7B 123 {
-    0x1c,0x22,0x22,0x22,0x1c,0x00, // 0x7C 124 |
-    0x22,0x3e,0x08,0x00,0x00,0x00, // 0x7D 125 }
-    0x01,0x01,0x01,0x00,0x00,0x00, // 0x7E 126 ~
-    0x00,0x00,0x00,0x00,0x00,0x00, // 0x7F 127
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x2e, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x03, 0x00, 0x03, 0x00, 0x00, 0x00,
+    0x0a, 0x1f, 0x0a, 0x1f, 0x0a, 0x00,
+    0x2e, 0x2a, 0x6b, 0x2a, 0x3a, 0x00,
+    0x0e, 0x2a, 0x1e, 0x08, 0x3c, 0x2a,
+    0x3e, 0x2a, 0x2a, 0x22, 0x38, 0x08,
+    0x03, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x1c, 0x22, 0x00, 0x00, 0x00, 0x00,
+    0x22, 0x1c, 0x00, 0x00, 0x00, 0x00,
+    0x15, 0x0e, 0x04, 0x0e, 0x15, 0x00,
+    0x08, 0x08, 0x3e, 0x08, 0x08, 0x00,
+    0x60, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x08, 0x08, 0x08, 0x08, 0x08, 0x00,
+    0x20, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x20, 0x10, 0x08, 0x04, 0x02, 0x00,
+    0x3e, 0x22, 0x2a, 0x22, 0x3e, 0x00,
+    0x04, 0x3e, 0x00, 0x00, 0x00, 0x00,
+    0x3a, 0x2a, 0x2a, 0x2a, 0x2e, 0x00,
+    0x2a, 0x2a, 0x2a, 0x2a, 0x3e, 0x00,
+    0x0e, 0x08, 0x08, 0x08, 0x3e, 0x00,
+    0x2e, 0x2a, 0x2a, 0x2a, 0x3a, 0x00,
+    0x3e, 0x2a, 0x2a, 0x2a, 0x3a, 0x00,
+    0x02, 0x02, 0x02, 0x02, 0x3e, 0x00,
+    0x3e, 0x2a, 0x2a, 0x2a, 0x3e, 0x00,
+    0x2e, 0x2a, 0x2a, 0x2a, 0x3e, 0x00,
+    0x14, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x34, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x08, 0x14, 0x22, 0x00, 0x00, 0x00,
+    0x14, 0x14, 0x14, 0x14, 0x14, 0x00,
+    0x22, 0x14, 0x08, 0x00, 0x00, 0x00,
+    0x06, 0x02, 0x2a, 0x0a, 0x0e, 0x00,
+    0x3e, 0x02, 0x3a, 0x2a, 0x3e, 0x00,
+    0x3e, 0x12, 0x12, 0x12, 0x3e, 0x00,
+    0x3e, 0x2a, 0x2a, 0x2a, 0x36, 0x00,
+    0x3e, 0x22, 0x22, 0x22, 0x22, 0x00,
+    0x3e, 0x22, 0x22, 0x22, 0x1c, 0x00,
+    0x3e, 0x2a, 0x2a, 0x2a, 0x22, 0x00,
+    0x3e, 0x0a, 0x0a, 0x0a, 0x02, 0x00,
+    0x3e, 0x22, 0x2a, 0x2a, 0x3a, 0x00,
+    0x3e, 0x08, 0x08, 0x08, 0x3e, 0x00,
+    0x22, 0x3e, 0x22, 0x00, 0x00, 0x00,
+    0x38, 0x20, 0x20, 0x20, 0x3e, 0x00,
+    0x3e, 0x08, 0x08, 0x14, 0x22, 0x00,
+    0x3e, 0x20, 0x20, 0x20, 0x20, 0x00,
+    0x3e, 0x04, 0x38, 0x04, 0x3e, 0x00,
+    0x3e, 0x04, 0x08, 0x10, 0x3e, 0x00,
+    0x3e, 0x22, 0x22, 0x22, 0x3e, 0x00,
+    0x3e, 0x0a, 0x0a, 0x0a, 0x0e, 0x00,
+    0x3e, 0x22, 0x72, 0x22, 0x3e, 0x00,
+    0x3e, 0x0a, 0x0a, 0x1a, 0x2e, 0x00,
+    0x2e, 0x2a, 0x2a, 0x2a, 0x3a, 0x00,
+    0x02, 0x02, 0x3e, 0x02, 0x02, 0x00,
+    0x1e, 0x20, 0x20, 0x20, 0x1e, 0x00,
+    0x0e, 0x10, 0x20, 0x10, 0x0e, 0x00,
+    0x3e, 0x10, 0x0e, 0x10, 0x3e, 0x00,
+    0x22, 0x14, 0x08, 0x14, 0x22, 0x00,
+    0x02, 0x04, 0x38, 0x04, 0x02, 0x00,
+    0x3a, 0x2a, 0x2a, 0x2a, 0x2e, 0x00,
+    0x3e, 0x22, 0x00, 0x00, 0x00, 0x00,
+    0x3f, 0x21, 0x3f, 0x00, 0x00, 0x00,
+    0x22, 0x3e, 0x00, 0x00, 0x00, 0x00,
+    0x0c, 0x1e, 0x3c, 0x1e, 0x0c, 0x00,
+    0x20, 0x20, 0x20, 0x20, 0x20, 0x00,
+    0x1c, 0x3e, 0x3e, 0x3e, 0x1c, 0x00,
+    0x3c, 0x24, 0x24, 0x24, 0x3c, 0x20,
+    0x3e, 0x24, 0x24, 0x24, 0x3c, 0x00,
+    0x3c, 0x24, 0x24, 0x24, 0x24, 0x00,
+    0x3c, 0x24, 0x24, 0x24, 0x3e, 0x00,
+    0x3c, 0x24, 0x34, 0x2c, 0x24, 0x00,
+    0x08, 0x3e, 0x0a, 0x0a, 0x00, 0x00,
+    0x1c, 0x54, 0x54, 0x54, 0x7c, 0x00,
+    0x3e, 0x04, 0x04, 0x04, 0x3c, 0x00,
+    0x3a, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x7a, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x3e, 0x08, 0x14, 0x22, 0x00, 0x00,
+    0x02, 0x3e, 0x00, 0x00, 0x00, 0x00,
+    0x3c, 0x04, 0x3c, 0x04, 0x3c, 0x00,
+    0x3c, 0x04, 0x04, 0x04, 0x3c, 0x00,
+    0x3c, 0x24, 0x24, 0x24, 0x3c, 0x00,
+    0x7c, 0x24, 0x24, 0x24, 0x3c, 0x00,
+    0x3c, 0x24, 0x24, 0x24, 0x7c, 0x00,
+    0x3c, 0x04, 0x04, 0x04, 0x00, 0x00,
+    0x24, 0x2c, 0x34, 0x24, 0x00, 0x00,
+    0x04, 0x3e, 0x24, 0x24, 0x00, 0x00,
+    0x3c, 0x20, 0x20, 0x20, 0x3c, 0x00,
+    0x0c, 0x10, 0x20, 0x10, 0x0c, 0x00,
+    0x3c, 0x20, 0x3c, 0x20, 0x3c, 0x00,
+    0x24, 0x24, 0x18, 0x24, 0x24, 0x00,
+    0x1c, 0x50, 0x50, 0x50, 0x7c, 0x00,
+    0x24, 0x34, 0x2c, 0x24, 0x00, 0x00,
+    0x08, 0x3e, 0x22, 0x00, 0x00, 0x00,
+    0x1c, 0x22, 0x22, 0x22, 0x1c, 0x00,
+    0x22, 0x3e, 0x08, 0x00, 0x00, 0x00,
+    0x01, 0x01, 0x01, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 #    elif defined(OLED_FONT_SUPER_DIGG)
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x20 32
-    0x58, 0x5C, 0x00, 0x00, 0x00, 0x00, // 0x21 33 !
-    0x00, 0x01, 0x00, 0x00, 0x01, 0x00, // 0x22 34 "
-    0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00, // 0x23 35 #
-    0x5C, 0xFE, 0x54, 0xFE, 0x74, 0x00, // 0x24 36 $
-    0x03, 0x63, 0x38, 0x0C, 0x63, 0x60, // 0x25 37 %
-    0x70, 0x5C, 0x54, 0x74, 0x7C, 0x50, // 0x26 38 &
-    0x00, 0x01, 0x00, 0x00, 0x00, 0x00, // 0x27 39 '
-    0x70, 0x7C, 0x44, 0x00, 0x00, 0x00, // 0x28 40 (
-    0x44, 0x7C, 0x70, 0x00, 0x00, 0x00, // 0x29 41 )
-    0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00, // 0x2A 42 *
-    0x10, 0x10, 0x70, 0x7C, 0x10, 0x00, // 0x2B 43 +
-    0x40, 0xC0, 0x00, 0x00, 0x00, 0x00, // 0x2C 44 ,
-    0x10, 0x10, 0x10, 0x10, 0x00, 0x00, // 0x2D 45 -
-    0x40, 0x40, 0x00, 0x00, 0x00, 0x00, // 0x2E 46 .
-    0x70, 0x7C, 0x03, 0x00, 0x00, 0x00, // 0x2F 47 /
-    0x7C, 0x44, 0x44, 0x44, 0x7C, 0x1C, // 0x30 48 0
-    0x04, 0x04, 0x7C, 0x1C, 0x00, 0x00, // 0x31 49 1
-    0x74, 0x74, 0x54, 0x54, 0x5C, 0x00, // 0x32 50 2
-    0x44, 0x54, 0x54, 0x54, 0x7C, 0x70, // 0x33 51 3
-    0x1C, 0x10, 0x10, 0x7C, 0x7C, 0x00, // 0x34 52 4
-    0x5C, 0x5C, 0x54, 0x54, 0x74, 0x00, // 0x35 53 5
-    0x70, 0x7C, 0x54, 0x54, 0x74, 0x00, // 0x36 54 6
-    0x04, 0x14, 0x14, 0x14, 0x7C, 0x70, // 0x37 55 7
-    0x70, 0x5C, 0x54, 0x74, 0x7C, 0x00, // 0x38 56 8
-    0x5C, 0x54, 0x54, 0x54, 0x7C, 0x1C, // 0x39 57 9
-    0x50, 0x50, 0x00, 0x00, 0x00, 0x00, // 0x3A 58 :
-    0x50, 0xD0, 0x00, 0x00, 0x00, 0x00, // 0x3B 59 ;
-    0x18, 0x18, 0x24, 0x42, 0x00, 0x00, // 0x3C 60 <
-    0x28, 0x28, 0x28, 0x28, 0x00, 0x00, // 0x3D 61 =
-    0x42, 0x24, 0x18, 0x18, 0x00, 0x00, // 0x3E 62 >
-    0x04, 0x14, 0x54, 0x54, 0x1C, 0x1C, // 0x3F 63 ?
-    0xF8, 0x04, 0x74, 0x74, 0x54, 0x54, // 0x40 64 @
-    0x70, 0x7C, 0x14, 0x14, 0x3C, 0x00, // 0x41 65 A
-    0x7C, 0x74, 0x54, 0x54, 0x7C, 0x00, // 0x42 66 B
-    0x70, 0x7C, 0x44, 0x44, 0x44, 0x44, // 0x43 67 C
-    0x70, 0x7C, 0x44, 0x44, 0x48, 0x70, // 0x44 68 D
-    0x70, 0x7C, 0x54, 0x54, 0x54, 0x44, // 0x45 69 E
-    0x70, 0x7C, 0x14, 0x14, 0x14, 0x04, // 0x46 70 F
-    0x70, 0x7C, 0x44, 0x44, 0x54, 0x74, // 0x47 71 G
-    0x70, 0x7C, 0x10, 0x10, 0x7C, 0x00, // 0x48 72 H
-    0x70, 0x7C, 0x00, 0x00, 0x00, 0x00, // 0x49 73 I
-    0x60, 0x40, 0x40, 0x40, 0x7C, 0x70, // 0x4A 74 J
-    0x7C, 0x70, 0x10, 0x1C, 0x70, 0x00, // 0x4B 75 K
-    0x70, 0x7C, 0x40, 0x40, 0x40, 0x60, // 0x4C 76 L
-    0x70, 0x7C, 0x04, 0x04, 0x7C, 0x04, // 0x4D 77 M
-    0x70, 0x7C, 0x04, 0x04, 0x04, 0x7C, // 0x4E 78 N
-    0x70, 0x7C, 0x44, 0x44, 0x44, 0x7C, // 0x4F 79 O
-    0x70, 0x7C, 0x24, 0x24, 0x3C, 0x00, // 0x50 80 P
-    0x7C, 0x44, 0x44, 0x44, 0x7C, 0x00, // 0x51 81 Q
-    0x7C, 0x74, 0x14, 0x14, 0x3C, 0x00, // 0x52 82 R
-    0x5C, 0x5C, 0x54, 0x54, 0x74, 0x00, // 0x53 83 S
-    0x04, 0x04, 0x7C, 0x74, 0x04, 0x00, // 0x54 84 T
-    0x70, 0x7C, 0x40, 0x40, 0x40, 0x7C, // 0x55 85 U
-    0x70, 0x7C, 0x40, 0x40, 0x20, 0x1C, // 0x56 86 V
-    0x70, 0x7C, 0x40, 0x40, 0x7C, 0x40, // 0x57 87 W
-    0x70, 0x7C, 0x10, 0x10, 0x3C, 0x00, // 0x58 88 X
-    0x1C, 0x10, 0x70, 0x70, 0x1C, 0x00, // 0x59 89 Y
-    0x74, 0x74, 0x54, 0x54, 0x5C, 0x00, // 0x5A 90 Z
-    0xF0, 0xFE, 0x82, 0x00, 0x00, 0x00, // 0x5B 91 [
-    0x03, 0x7C, 0x70, 0x00, 0x00, 0x00, // 0x5C 92 \ backslash
-    0x82, 0xFE, 0xF0, 0x00, 0x00, 0x00, // 0x5D 93 ]
-    0x04, 0x02, 0x01, 0x06, 0x04, 0x00, // 0x5E 94 ^
-    0x40, 0x40, 0x40, 0x40, 0x00, 0x00, // 0x5F 95 _
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // 0x60 96 `
-    0x70, 0x7C, 0x14, 0x14, 0x3C, 0x00, // 0x61 97 a
-    0x7C, 0x74, 0x54, 0x54, 0x7C, 0x00, // 0x62 98 b
-    0x70, 0x7C, 0x44, 0x44, 0x44, 0x44, // 0x63 99 c
-    0x70, 0x7C, 0x44, 0x44, 0x48, 0x70, // 0x64 100 d
-    0x70, 0x7C, 0x54, 0x54, 0x54, 0x44, // 0x65 101 e
-    0x70, 0x7C, 0x14, 0x14, 0x14, 0x04, // 0x66 102 f
-    0x70, 0x7C, 0x44, 0x44, 0x54, 0x74, // 0x67 103 g
-    0x70, 0x7C, 0x10, 0x10, 0x7C, 0x00, // 0x68 104 h
-    0x70, 0x7C, 0x00, 0x00, 0x00, 0x00, // 0x69 105 i
-    0x60, 0x40, 0x40, 0x40, 0x7C, 0x70, // 0x6A 106 j
-    0x7C, 0x70, 0x10, 0x1C, 0x70, 0x00, // 0x6B 107 k
-    0x70, 0x7C, 0x40, 0x40, 0x40, 0x60, // 0x6C 108 l
-    0x70, 0x7C, 0x04, 0x04, 0x7C, 0x04, // 0x6D 109 m
-    0x70, 0x7C, 0x04, 0x04, 0x04, 0x7C, // 0x6E 110 n
-    0x70, 0x7C, 0x44, 0x44, 0x44, 0x7C, // 0x6F 111 o
-    0x70, 0x7C, 0x24, 0x24, 0x3C, 0x00, // 0x70 112 p
-    0x7C, 0x44, 0x44, 0x44, 0x7C, 0x00, // 0x71 113 q
-    0x7C, 0x74, 0x14, 0x14, 0x3C, 0x00, // 0x72 114 r
-    0x5C, 0x5C, 0x54, 0x54, 0x74, 0x00, // 0x73 115 s
-    0x04, 0x04, 0x7C, 0x74, 0x04, 0x00, // 0x74 116 t
-    0x70, 0x7C, 0x40, 0x40, 0x40, 0x7C, // 0x75 117 u
-    0x70, 0x7C, 0x40, 0x40, 0x20, 0x1C, // 0x76 118 v
-    0x70, 0x7C, 0x40, 0x40, 0x7C, 0x40, // 0x77 119 w
-    0x70, 0x7C, 0x10, 0x10, 0x3C, 0x00, // 0x78 120 x
-    0x1C, 0x10, 0x70, 0x70, 0x1C, 0x00, // 0x79 121 y
-    0x74, 0x74, 0x54, 0x54, 0x5C, 0x00, // 0x7A 122 z
-    0x10, 0xFE, 0xC2, 0x00, 0x00, 0x00, // 0x7B 123 {
-    0x00, 0x44, 0x77, 0x00, 0x00, 0x00, // 0x7C 124 |
-    0xC2, 0xFE, 0x10, 0x00, 0x00, 0x00, // 0x7D 125 }
-    0x02, 0x01, 0x03, 0x04, 0x06, 0x02, // 0x7E 126 ~
-    0x3C, 0x22, 0x21, 0x22, 0x3C, 0x00, // 0x7F 127
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x58, 0x5C, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x01, 0x00, 0x00, 0x01, 0x00,
+    0x14, 0x7F, 0x14, 0x7F, 0x14, 0x00,
+    0x5C, 0xFE, 0x54, 0xFE, 0x74, 0x00,
+    0x03, 0x63, 0x38, 0x0C, 0x63, 0x60,
+    0x70, 0x5C, 0x54, 0x74, 0x7C, 0x50,
+    0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
+    0x70, 0x7C, 0x44, 0x00, 0x00, 0x00,
+    0x44, 0x7C, 0x70, 0x00, 0x00, 0x00,
+    0x2A, 0x1C, 0x7F, 0x1C, 0x2A, 0x00,
+    0x10, 0x10, 0x70, 0x7C, 0x10, 0x00,
+    0x40, 0xC0, 0x00, 0x00, 0x00, 0x00,
+    0x10, 0x10, 0x10, 0x10, 0x00, 0x00,
+    0x40, 0x40, 0x00, 0x00, 0x00, 0x00,
+    0x70, 0x7C, 0x03, 0x00, 0x00, 0x00,
+    0x7C, 0x44, 0x44, 0x44, 0x7C, 0x1C,
+    0x04, 0x04, 0x7C, 0x1C, 0x00, 0x00,
+    0x74, 0x74, 0x54, 0x54, 0x5C, 0x00,
+    0x44, 0x54, 0x54, 0x54, 0x7C, 0x70,
+    0x1C, 0x10, 0x10, 0x7C, 0x7C, 0x00,
+    0x5C, 0x5C, 0x54, 0x54, 0x74, 0x00,
+    0x70, 0x7C, 0x54, 0x54, 0x74, 0x00,
+    0x04, 0x14, 0x14, 0x14, 0x7C, 0x70,
+    0x70, 0x5C, 0x54, 0x74, 0x7C, 0x00,
+    0x5C, 0x54, 0x54, 0x54, 0x7C, 0x1C,
+    0x50, 0x50, 0x00, 0x00, 0x00, 0x00,
+    0x50, 0xD0, 0x00, 0x00, 0x00, 0x00,
+    0x18, 0x18, 0x24, 0x42, 0x00, 0x00,
+    0x28, 0x28, 0x28, 0x28, 0x00, 0x00,
+    0x42, 0x24, 0x18, 0x18, 0x00, 0x00,
+    0x04, 0x14, 0x54, 0x54, 0x1C, 0x1C,
+    0xF8, 0x04, 0x74, 0x74, 0x54, 0x54,
+    0x70, 0x7C, 0x14, 0x14, 0x3C, 0x00,
+    0x7C, 0x74, 0x54, 0x54, 0x7C, 0x00,
+    0x70, 0x7C, 0x44, 0x44, 0x44, 0x44,
+    0x70, 0x7C, 0x44, 0x44, 0x48, 0x70,
+    0x70, 0x7C, 0x54, 0x54, 0x54, 0x44,
+    0x70, 0x7C, 0x14, 0x14, 0x14, 0x04,
+    0x70, 0x7C, 0x44, 0x44, 0x54, 0x74,
+    0x70, 0x7C, 0x10, 0x10, 0x7C, 0x00,
+    0x70, 0x7C, 0x00, 0x00, 0x00, 0x00,
+    0x60, 0x40, 0x40, 0x40, 0x7C, 0x70,
+    0x7C, 0x70, 0x10, 0x1C, 0x70, 0x00,
+    0x70, 0x7C, 0x40, 0x40, 0x40, 0x60,
+    0x70, 0x7C, 0x04, 0x04, 0x7C, 0x04,
+    0x70, 0x7C, 0x04, 0x04, 0x04, 0x7C,
+    0x70, 0x7C, 0x44, 0x44, 0x44, 0x7C,
+    0x70, 0x7C, 0x24, 0x24, 0x3C, 0x00,
+    0x7C, 0x44, 0x44, 0x44, 0x7C, 0x00,
+    0x7C, 0x74, 0x14, 0x14, 0x3C, 0x00,
+    0x5C, 0x5C, 0x54, 0x54, 0x74, 0x00,
+    0x04, 0x04, 0x7C, 0x74, 0x04, 0x00,
+    0x70, 0x7C, 0x40, 0x40, 0x40, 0x7C,
+    0x70, 0x7C, 0x40, 0x40, 0x20, 0x1C,
+    0x70, 0x7C, 0x40, 0x40, 0x7C, 0x40,
+    0x70, 0x7C, 0x10, 0x10, 0x3C, 0x00,
+    0x1C, 0x10, 0x70, 0x70, 0x1C, 0x00,