diff --git a/src/openrct2/drawing/Font.cpp b/src/openrct2/drawing/Font.cpp
index 1352e4819e..41744bd777 100644
--- a/src/openrct2/drawing/Font.cpp
+++ b/src/openrct2/drawing/Font.cpp
@@ -37,7 +37,7 @@ static uint8_t _spriteFontCharacterWidths[FontStyleCount][SPR_FONTS_GLYPH_COUNT]
 TTFFontSetDescriptor* gCurrentTTFFontSet;
 #endif // DISABLE_TTF
 
-constexpr uint8_t CS_SPRITE_FONT_OFFSET = 32;
+constexpr uint8_t kCSSpriteFontOffset = 32;
 
 static const std::unordered_map<char32_t, int32_t> codepointOffsetMap = {
     { UnicodeChar::ae_uc, SPR_FONTS_AE_UPPER - SPR_FONTS_BEGIN },
@@ -47,38 +47,38 @@ static const std::unordered_map<char32_t, int32_t> codepointOffsetMap = {
     { UnicodeChar::o_stroke, SPR_FONTS_O_STROKE_LOWER - SPR_FONTS_BEGIN },
     { UnicodeChar::y_acute, SPR_FONTS_Y_ACUTE_LOWER - SPR_FONTS_BEGIN },
     { UnicodeChar::a_breve_uc, SPR_FONTS_A_BREVE_UPPER - SPR_FONTS_BEGIN },
-    { UnicodeChar::a_breve, 226 - CS_SPRITE_FONT_OFFSET }, // Render as â, no visual difference in the RCT font
-    { UnicodeChar::a_ogonek_uc, CSChar::a_ogonek_uc - CS_SPRITE_FONT_OFFSET },
-    { UnicodeChar::a_ogonek, CSChar::a_ogonek - CS_SPRITE_FONT_OFFSET },
-    { UnicodeChar::c_acute_uc, CSChar::c_acute_uc - CS_SPRITE_FONT_OFFSET },
-    { UnicodeChar::c_acute, CSChar::c_acute - CS_SPRITE_FONT_OFFSET },
+    { UnicodeChar::a_breve, 226 - kCSSpriteFontOffset }, // Render as â, no visual difference in the RCT font
+    { UnicodeChar::a_ogonek_uc, CSChar::a_ogonek_uc - kCSSpriteFontOffset },
+    { UnicodeChar::a_ogonek, CSChar::a_ogonek - kCSSpriteFontOffset },
+    { UnicodeChar::c_acute_uc, CSChar::c_acute_uc - kCSSpriteFontOffset },
+    { UnicodeChar::c_acute, CSChar::c_acute - kCSSpriteFontOffset },
     { UnicodeChar::c_caron_uc, SPR_FONTS_C_CARON_UPPER - SPR_FONTS_BEGIN },
     { UnicodeChar::c_caron, SPR_FONTS_C_CARON_LOWER - SPR_FONTS_BEGIN },
     { UnicodeChar::d_caron_uc, SPR_FONTS_D_CARON_UPPER - SPR_FONTS_BEGIN },
     { UnicodeChar::d_caron, SPR_FONTS_D_CARON_LOWER - SPR_FONTS_BEGIN },
-    { UnicodeChar::e_ogonek_uc, CSChar::e_ogonek_uc - CS_SPRITE_FONT_OFFSET },
-    { UnicodeChar::e_ogonek, CSChar::e_ogonek - CS_SPRITE_FONT_OFFSET },
+    { UnicodeChar::e_ogonek_uc, CSChar::e_ogonek_uc - kCSSpriteFontOffset },
+    { UnicodeChar::e_ogonek, CSChar::e_ogonek - kCSSpriteFontOffset },
     { UnicodeChar::e_caron_uc, SPR_FONTS_E_CARON_UPPER - SPR_FONTS_BEGIN },
     { UnicodeChar::e_caron, SPR_FONTS_E_CARON_LOWER - SPR_FONTS_BEGIN },
     { UnicodeChar::g_breve_uc, SPR_FONTS_G_BREVE_UPPER - SPR_FONTS_BEGIN },
     { UnicodeChar::g_breve, SPR_FONTS_G_BREVE_LOWER - SPR_FONTS_BEGIN },
     { UnicodeChar::i_with_dot_uc, SPR_FONTS_I_WITH_DOT_UPPER - SPR_FONTS_BEGIN },
     { UnicodeChar::i_without_dot, SPR_FONTS_I_WITHOUT_DOT_LOWER - SPR_FONTS_BEGIN },
-    { UnicodeChar::l_stroke_uc, CSChar::l_stroke_uc - CS_SPRITE_FONT_OFFSET },
-    { UnicodeChar::l_stroke, CSChar::l_stroke - CS_SPRITE_FONT_OFFSET },
-    { UnicodeChar::n_acute_uc, CSChar::n_acute_uc - CS_SPRITE_FONT_OFFSET },
-    { UnicodeChar::n_acute, CSChar::n_acute - CS_SPRITE_FONT_OFFSET },
+    { UnicodeChar::l_stroke_uc, CSChar::l_stroke_uc - kCSSpriteFontOffset },
+    { UnicodeChar::l_stroke, CSChar::l_stroke - kCSSpriteFontOffset },
+    { UnicodeChar::n_acute_uc, CSChar::n_acute_uc - kCSSpriteFontOffset },
+    { UnicodeChar::n_acute, CSChar::n_acute - kCSSpriteFontOffset },
     { UnicodeChar::n_caron_uc, SPR_FONTS_N_CARON_UPPER - SPR_FONTS_BEGIN },
     { UnicodeChar::n_caron, SPR_FONTS_N_CARON_LOWER - SPR_FONTS_BEGIN },
-    { UnicodeChar::o_macron, CSChar::o_circumflex - CS_SPRITE_FONT_OFFSET }, // No visual difference
+    { UnicodeChar::o_macron, CSChar::o_circumflex - kCSSpriteFontOffset }, // No visual difference
     { UnicodeChar::o_double_acute_uc, SPR_FONTS_O_DOUBLE_ACUTE_UPPER - SPR_FONTS_BEGIN },
     { UnicodeChar::o_double_acute, SPR_FONTS_O_DOUBLE_ACUTE_LOWER - SPR_FONTS_BEGIN },
     { UnicodeChar::oe_uc, SPR_FONTS_OE_UPPER - SPR_FONTS_BEGIN },
     { UnicodeChar::oe, SPR_FONTS_OE_LOWER - SPR_FONTS_BEGIN },
     { UnicodeChar::r_caron_uc, SPR_FONTS_R_CARON_UPPER - SPR_FONTS_BEGIN },
     { UnicodeChar::r_caron, SPR_FONTS_R_CARON_LOWER - SPR_FONTS_BEGIN },
-    { UnicodeChar::s_acute_uc, CSChar::s_acute_uc - CS_SPRITE_FONT_OFFSET },
-    { UnicodeChar::s_acute, CSChar::s_acute - CS_SPRITE_FONT_OFFSET },
+    { UnicodeChar::s_acute_uc, CSChar::s_acute_uc - kCSSpriteFontOffset },
+    { UnicodeChar::s_acute, CSChar::s_acute - kCSSpriteFontOffset },
     { UnicodeChar::s_cedilla_uc, SPR_FONTS_S_CEDILLA_UPPER - SPR_FONTS_BEGIN },
     { UnicodeChar::s_cedilla, SPR_FONTS_S_CEDILLA_LOWER - SPR_FONTS_BEGIN },
     { UnicodeChar::s_caron_uc, SPR_FONTS_S_CARON_UPPER - SPR_FONTS_BEGIN },
@@ -93,18 +93,18 @@ static const std::unordered_map<char32_t, int32_t> codepointOffsetMap = {
     { UnicodeChar::w_circumflex, SPR_FONTS_W_CIRCUMFLEX_LOWER - SPR_FONTS_BEGIN },
     { UnicodeChar::y_circumflex_uc, SPR_FONTS_Y_CIRCUMFLEX_UPPER - SPR_FONTS_BEGIN },
     { UnicodeChar::y_circumflex, SPR_FONTS_Y_CIRCUMFLEX_LOWER - SPR_FONTS_BEGIN },
-    { UnicodeChar::z_acute_uc, CSChar::z_acute_uc - CS_SPRITE_FONT_OFFSET },
-    { UnicodeChar::z_acute, CSChar::z_acute - CS_SPRITE_FONT_OFFSET },
-    { UnicodeChar::z_dot_uc, CSChar::z_dot_uc - CS_SPRITE_FONT_OFFSET },
-    { UnicodeChar::z_dot, CSChar::z_dot - CS_SPRITE_FONT_OFFSET },
+    { UnicodeChar::z_acute_uc, CSChar::z_acute_uc - kCSSpriteFontOffset },
+    { UnicodeChar::z_acute, CSChar::z_acute - kCSSpriteFontOffset },
+    { UnicodeChar::z_dot_uc, CSChar::z_dot_uc - kCSSpriteFontOffset },
+    { UnicodeChar::z_dot, CSChar::z_dot - kCSSpriteFontOffset },
     { UnicodeChar::z_caron_uc, SPR_FONTS_Z_CARON_UPPER - SPR_FONTS_BEGIN },
     { UnicodeChar::z_caron, SPR_FONTS_Z_CARON_LOWER - SPR_FONTS_BEGIN },
-    { UnicodeChar::f_with_hook_uc, 'F' - CS_SPRITE_FONT_OFFSET },
+    { UnicodeChar::f_with_hook_uc, 'F' - kCSSpriteFontOffset },
     { UnicodeChar::s_comma_uc, SPR_FONTS_S_CEDILLA_UPPER - SPR_FONTS_BEGIN }, // No visual difference
     { UnicodeChar::s_comma, SPR_FONTS_S_CEDILLA_LOWER - SPR_FONTS_BEGIN },    // Ditto
     { UnicodeChar::t_comma_uc, SPR_FONTS_T_COMMA_UPPER - SPR_FONTS_BEGIN },
     { UnicodeChar::t_comma, SPR_FONTS_T_COMMA_LOWER - SPR_FONTS_BEGIN },
-    { UnicodeChar::sharp_s_uc, 223 - CS_SPRITE_FONT_OFFSET },
+    { UnicodeChar::sharp_s_uc, 223 - kCSSpriteFontOffset },
     { UnicodeChar::c_circumflex_uc, SPR_FONTS_C_CIRCUMFLEX_UPPER - SPR_FONTS_BEGIN },
     { UnicodeChar::c_circumflex, SPR_FONTS_C_CIRCUMFLEX_LOWER - SPR_FONTS_BEGIN },
     { UnicodeChar::g_circumflex_uc, SPR_FONTS_G_CIRCUMFLEX_UPPER - SPR_FONTS_BEGIN },
@@ -119,34 +119,34 @@ static const std::unordered_map<char32_t, int32_t> codepointOffsetMap = {
     { UnicodeChar::u_breve, SPR_FONTS_U_BREVE_LOWER - SPR_FONTS_BEGIN },
 
     // Cyrillic alphabet
-    { UnicodeChar::cyrillic_io_uc, 203 - CS_SPRITE_FONT_OFFSET }, // Looks just like Ë
+    { UnicodeChar::cyrillic_io_uc, 203 - kCSSpriteFontOffset }, // Looks just like Ë
     { UnicodeChar::cyrillic_ukrainian_ie_uc, SPR_FONTS_CYRILLIC_UKRAINIAN_IE_UPPER - SPR_FONTS_BEGIN },
-    { UnicodeChar::cyrillic_dze_uc, 'S' - CS_SPRITE_FONT_OFFSET },
-    { UnicodeChar::cyrillic_dotted_i_uc, 'I' - CS_SPRITE_FONT_OFFSET },
-    { UnicodeChar::cyrillic_yi_uc, 207 - CS_SPRITE_FONT_OFFSET }, // Looks just like Ï
-    { UnicodeChar::cyrillic_je_uc, 'J' - CS_SPRITE_FONT_OFFSET },
-    { UnicodeChar::cyrillic_a_uc, 'A' - CS_SPRITE_FONT_OFFSET },
+    { UnicodeChar::cyrillic_dze_uc, 'S' - kCSSpriteFontOffset },
+    { UnicodeChar::cyrillic_dotted_i_uc, 'I' - kCSSpriteFontOffset },
+    { UnicodeChar::cyrillic_yi_uc, 207 - kCSSpriteFontOffset }, // Looks just like Ï
+    { UnicodeChar::cyrillic_je_uc, 'J' - kCSSpriteFontOffset },
+    { UnicodeChar::cyrillic_a_uc, 'A' - kCSSpriteFontOffset },
     { UnicodeChar::cyrillic_be_uc, SPR_FONTS_CYRILLIC_BE_UPPER - SPR_FONTS_BEGIN },
-    { UnicodeChar::cyrillic_ve_uc, 'B' - CS_SPRITE_FONT_OFFSET },
+    { UnicodeChar::cyrillic_ve_uc, 'B' - kCSSpriteFontOffset },
     { UnicodeChar::cyrillic_ghe_uc, SPR_FONTS_CYRILLIC_GHE_UPPER - SPR_FONTS_BEGIN },
     { UnicodeChar::cyrillic_de_uc, SPR_FONTS_CYRILLIC_DE_UPPER - SPR_FONTS_BEGIN },
-    { UnicodeChar::cyrillic_ie_uc, 'E' - CS_SPRITE_FONT_OFFSET },
+    { UnicodeChar::cyrillic_ie_uc, 'E' - kCSSpriteFontOffset },
     { UnicodeChar::cyrillic_zhe_uc, SPR_FONTS_CYRILLIC_ZHE_UPPER - SPR_FONTS_BEGIN },
     { UnicodeChar::cyrillic_ze_uc, SPR_FONTS_CYRILLIC_ZE_UPPER - SPR_FONTS_BEGIN },
     { UnicodeChar::cyrillic_i_uc, SPR_FONTS_CYRILLIC_I_UPPER - SPR_FONTS_BEGIN },
     { UnicodeChar::cyrillic_short_i_uc, SPR_FONTS_CYRILLIC_SHORT_I_UPPER - SPR_FONTS_BEGIN },
-    { UnicodeChar::cyrillic_ka_uc, 'K' - CS_SPRITE_FONT_OFFSET },
+    { UnicodeChar::cyrillic_ka_uc, 'K' - kCSSpriteFontOffset },
     { UnicodeChar::cyrillic_el_uc, SPR_FONTS_CYRILLIC_EL_UPPER - SPR_FONTS_BEGIN },
-    { UnicodeChar::cyrillic_em_uc, 'M' - CS_SPRITE_FONT_OFFSET },
-    { UnicodeChar::cyrillic_en_uc, 'H' - CS_SPRITE_FONT_OFFSET },
-    { UnicodeChar::cyrillic_o_uc, 'O' - CS_SPRITE_FONT_OFFSET },
+    { UnicodeChar::cyrillic_em_uc, 'M' - kCSSpriteFontOffset },
+    { UnicodeChar::cyrillic_en_uc, 'H' - kCSSpriteFontOffset },
+    { UnicodeChar::cyrillic_o_uc, 'O' - kCSSpriteFontOffset },
     { UnicodeChar::cyrillic_pe_uc, SPR_FONTS_CYRILLIC_PE_UPPER - SPR_FONTS_BEGIN },
-    { UnicodeChar::cyrillic_er_uc, 'P' - CS_SPRITE_FONT_OFFSET },
-    { UnicodeChar::cyrillic_es_uc, 'C' - CS_SPRITE_FONT_OFFSET },
-    { UnicodeChar::cyrillic_te_uc, 'T' - CS_SPRITE_FONT_OFFSET },
+    { UnicodeChar::cyrillic_er_uc, 'P' - kCSSpriteFontOffset },
+    { UnicodeChar::cyrillic_es_uc, 'C' - kCSSpriteFontOffset },
+    { UnicodeChar::cyrillic_te_uc, 'T' - kCSSpriteFontOffset },
     { UnicodeChar::cyrillic_u_uc, SPR_FONTS_CYRILLIC_U_UPPER - SPR_FONTS_BEGIN },
     { UnicodeChar::cyrillic_ef_uc, SPR_FONTS_CYRILLIC_EF_UPPER - SPR_FONTS_BEGIN },
-    { UnicodeChar::cyrillic_ha_uc, 'X' - CS_SPRITE_FONT_OFFSET },
+    { UnicodeChar::cyrillic_ha_uc, 'X' - kCSSpriteFontOffset },
     { UnicodeChar::cyrillic_tse_uc, SPR_FONTS_CYRILLIC_TSE_UPPER - SPR_FONTS_BEGIN },
     { UnicodeChar::cyrillic_che_uc, SPR_FONTS_CYRILLIC_CHE_UPPER - SPR_FONTS_BEGIN },
     { UnicodeChar::cyrillic_sha_uc, SPR_FONTS_CYRILLIC_SHA_UPPER - SPR_FONTS_BEGIN },
@@ -158,12 +158,12 @@ static const std::unordered_map<char32_t, int32_t> codepointOffsetMap = {
     { UnicodeChar::cyrillic_yu_uc, SPR_FONTS_CYRILLIC_YU_UPPER - SPR_FONTS_BEGIN },
     { UnicodeChar::cyrillic_ya_uc, SPR_FONTS_CYRILLIC_YA_UPPER - SPR_FONTS_BEGIN },
 
-    { UnicodeChar::cyrillic_a, 'a' - CS_SPRITE_FONT_OFFSET },
+    { UnicodeChar::cyrillic_a, 'a' - kCSSpriteFontOffset },
     { UnicodeChar::cyrillic_be, SPR_FONTS_CYRILLIC_BE_LOWER - SPR_FONTS_BEGIN },
     { UnicodeChar::cyrillic_ve, SPR_FONTS_CYRILLIC_VE_LOWER - SPR_FONTS_BEGIN },
     { UnicodeChar::cyrillic_ghe, SPR_FONTS_CYRILLIC_GHE_LOWER - SPR_FONTS_BEGIN },
     { UnicodeChar::cyrillic_de, SPR_FONTS_CYRILLIC_DE_LOWER - SPR_FONTS_BEGIN },
-    { UnicodeChar::cyrillic_ie, 'e' - CS_SPRITE_FONT_OFFSET },
+    { UnicodeChar::cyrillic_ie, 'e' - kCSSpriteFontOffset },
     { UnicodeChar::cyrillic_zhe, SPR_FONTS_CYRILLIC_ZHE_LOWER - SPR_FONTS_BEGIN },
     { UnicodeChar::cyrillic_ze, SPR_FONTS_CYRILLIC_ZE_LOWER - SPR_FONTS_BEGIN },
     { UnicodeChar::cyrillic_i, SPR_FONTS_CYRILLIC_I_LOWER - SPR_FONTS_BEGIN },
@@ -172,14 +172,14 @@ static const std::unordered_map<char32_t, int32_t> codepointOffsetMap = {
     { UnicodeChar::cyrillic_el, SPR_FONTS_CYRILLIC_EL_LOWER - SPR_FONTS_BEGIN },
     { UnicodeChar::cyrillic_em, SPR_FONTS_CYRILLIC_EM_LOWER - SPR_FONTS_BEGIN },
     { UnicodeChar::cyrillic_en, SPR_FONTS_CYRILLIC_EN_LOWER - SPR_FONTS_BEGIN },
-    { UnicodeChar::cyrillic_o, 'o' - CS_SPRITE_FONT_OFFSET },
+    { UnicodeChar::cyrillic_o, 'o' - kCSSpriteFontOffset },
     { UnicodeChar::cyrillic_pe, SPR_FONTS_CYRILLIC_PE_LOWER - SPR_FONTS_BEGIN },
-    { UnicodeChar::cyrillic_er, 'p' - CS_SPRITE_FONT_OFFSET },
-    { UnicodeChar::cyrillic_es, 'c' - CS_SPRITE_FONT_OFFSET },
+    { UnicodeChar::cyrillic_er, 'p' - kCSSpriteFontOffset },
+    { UnicodeChar::cyrillic_es, 'c' - kCSSpriteFontOffset },
     { UnicodeChar::cyrillic_te, SPR_FONTS_CYRILLIC_TE_LOWER - SPR_FONTS_BEGIN },
-    { UnicodeChar::cyrillic_u, 'y' - CS_SPRITE_FONT_OFFSET },
+    { UnicodeChar::cyrillic_u, 'y' - kCSSpriteFontOffset },
     { UnicodeChar::cyrillic_ef, SPR_FONTS_CYRILLIC_EF_LOWER - SPR_FONTS_BEGIN },
-    { UnicodeChar::cyrillic_ha, 'x' - CS_SPRITE_FONT_OFFSET },
+    { UnicodeChar::cyrillic_ha, 'x' - kCSSpriteFontOffset },
     { UnicodeChar::cyrillic_tse, SPR_FONTS_CYRILLIC_TSE_LOWER - SPR_FONTS_BEGIN },
     { UnicodeChar::cyrillic_che, SPR_FONTS_CYRILLIC_CHE_LOWER - SPR_FONTS_BEGIN },
     { UnicodeChar::cyrillic_sha, SPR_FONTS_CYRILLIC_SHA_LOWER - SPR_FONTS_BEGIN },
@@ -190,12 +190,12 @@ static const std::unordered_map<char32_t, int32_t> codepointOffsetMap = {
     { UnicodeChar::cyrillic_e, SPR_FONTS_CYRILLIC_E_LOWER - SPR_FONTS_BEGIN },
     { UnicodeChar::cyrillic_yu, SPR_FONTS_CYRILLIC_YU_LOWER - SPR_FONTS_BEGIN },
     { UnicodeChar::cyrillic_ya, SPR_FONTS_CYRILLIC_YA_LOWER - SPR_FONTS_BEGIN },
-    { UnicodeChar::cyrillic_io, 235 - CS_SPRITE_FONT_OFFSET }, // Looks just like ë
+    { UnicodeChar::cyrillic_io, 235 - kCSSpriteFontOffset }, // Looks just like ë
     { UnicodeChar::cyrillic_ukrainian_ie, SPR_FONTS_CYRILLIC_UKRAINIAN_IE_LOWER - SPR_FONTS_BEGIN },
-    { UnicodeChar::cyrillic_dze, 's' - CS_SPRITE_FONT_OFFSET },
-    { UnicodeChar::cyrillic_dotted_i, 'i' - CS_SPRITE_FONT_OFFSET },
-    { UnicodeChar::cyrillic_yi, 239 - CS_SPRITE_FONT_OFFSET }, // Looks just like ï
-    { UnicodeChar::cyrillic_je, 'J' - CS_SPRITE_FONT_OFFSET },
+    { UnicodeChar::cyrillic_dze, 's' - kCSSpriteFontOffset },
+    { UnicodeChar::cyrillic_dotted_i, 'i' - kCSSpriteFontOffset },
+    { UnicodeChar::cyrillic_yi, 239 - kCSSpriteFontOffset }, // Looks just like ï
+    { UnicodeChar::cyrillic_je, 'J' - kCSSpriteFontOffset },
     { UnicodeChar::cyrillic_ghe_upturn_uc, SPR_FONTS_CYRILLIC_GHE_UPTURN_UPPER - SPR_FONTS_BEGIN },
     { UnicodeChar::cyrillic_ghe_upturn, SPR_FONTS_CYRILLIC_GHE_UPTURN_LOWER - SPR_FONTS_BEGIN },
 
@@ -204,47 +204,47 @@ static const std::unordered_map<char32_t, int32_t> codepointOffsetMap = {
     { UnicodeChar::vertical_bar, SPR_FONTS_VERTICAL_BAR - SPR_FONTS_BEGIN },
     { UnicodeChar::right_brace, SPR_FONTS_RIGHT_BRACE - SPR_FONTS_BEGIN },
     { UnicodeChar::tilde, SPR_FONTS_TILDE - SPR_FONTS_BEGIN },
-    { UnicodeChar::non_breaking_space, ' ' - CS_SPRITE_FONT_OFFSET },
+    { UnicodeChar::non_breaking_space, ' ' - kCSSpriteFontOffset },
     { UnicodeChar::interpunct, SPR_FONTS_INTERPUNCT - SPR_FONTS_BEGIN },
-    { UnicodeChar::multiplication_sign, CSChar::cross - CS_SPRITE_FONT_OFFSET },
-    { UnicodeChar::en_dash, '-' - CS_SPRITE_FONT_OFFSET },
-    { UnicodeChar::em_dash, '-' - CS_SPRITE_FONT_OFFSET },
-    { UnicodeChar::single_quote_open, '`' - CS_SPRITE_FONT_OFFSET },
-    { UnicodeChar::single_quote_end, '\'' - CS_SPRITE_FONT_OFFSET },
-    { UnicodeChar::single_german_quote_open, ',' - CS_SPRITE_FONT_OFFSET },
+    { UnicodeChar::multiplication_sign, CSChar::cross - kCSSpriteFontOffset },
+    { UnicodeChar::en_dash, '-' - kCSSpriteFontOffset },
+    { UnicodeChar::em_dash, '-' - kCSSpriteFontOffset },
+    { UnicodeChar::single_quote_open, '`' - kCSSpriteFontOffset },
+    { UnicodeChar::single_quote_end, '\'' - kCSSpriteFontOffset },
+    { UnicodeChar::single_german_quote_open, ',' - kCSSpriteFontOffset },
     { UnicodeChar::german_quote_open, SPR_FONTS_GERMAN_OPENQUOTES - SPR_FONTS_BEGIN },
-    { UnicodeChar::bullet, CSChar::bullet - CS_SPRITE_FONT_OFFSET },
+    { UnicodeChar::bullet, CSChar::bullet - kCSSpriteFontOffset },
     { UnicodeChar::ellipsis, SPR_FONTS_ELLIPSIS - SPR_FONTS_BEGIN },
-    { UnicodeChar::narrow_non_breaking_space, ' ' - CS_SPRITE_FONT_OFFSET },
-    { UnicodeChar::quote_open, CSChar::quote_open - CS_SPRITE_FONT_OFFSET },
-    { UnicodeChar::quote_close, CSChar::quote_close - CS_SPRITE_FONT_OFFSET },
+    { UnicodeChar::narrow_non_breaking_space, ' ' - kCSSpriteFontOffset },
+    { UnicodeChar::quote_open, CSChar::quote_open - kCSSpriteFontOffset },
+    { UnicodeChar::quote_close, CSChar::quote_close - kCSSpriteFontOffset },
 
     // Currency
     { UnicodeChar::guilder, SPR_FONTS_GUILDER_SIGN - SPR_FONTS_BEGIN },
-    { UnicodeChar::euro, CSChar::euro - CS_SPRITE_FONT_OFFSET },
+    { UnicodeChar::euro, CSChar::euro - kCSSpriteFontOffset },
     { UnicodeChar::rouble, SPR_FONTS_ROUBLE_SIGN - SPR_FONTS_BEGIN },
 
     // Dingbats
-    { UnicodeChar::up, CSChar::up - CS_SPRITE_FONT_OFFSET },
-    { UnicodeChar::small_up, CSChar::small_up - CS_SPRITE_FONT_OFFSET },
-    { UnicodeChar::right, CSChar::right - CS_SPRITE_FONT_OFFSET },
-    { UnicodeChar::down, CSChar::down - CS_SPRITE_FONT_OFFSET },
-    { UnicodeChar::small_down, CSChar::small_down - CS_SPRITE_FONT_OFFSET },
-    { UnicodeChar::left, CSChar::left - CS_SPRITE_FONT_OFFSET },
-    { UnicodeChar::air, CSChar::air - CS_SPRITE_FONT_OFFSET },
-    { UnicodeChar::tick, CSChar::tick - CS_SPRITE_FONT_OFFSET },
-    { UnicodeChar::plus, '+' - CS_SPRITE_FONT_OFFSET },
-    { UnicodeChar::minus, '-' - CS_SPRITE_FONT_OFFSET },
+    { UnicodeChar::up, CSChar::up - kCSSpriteFontOffset },
+    { UnicodeChar::small_up, CSChar::small_up - kCSSpriteFontOffset },
+    { UnicodeChar::right, CSChar::right - kCSSpriteFontOffset },
+    { UnicodeChar::down, CSChar::down - kCSSpriteFontOffset },
+    { UnicodeChar::small_down, CSChar::small_down - kCSSpriteFontOffset },
+    { UnicodeChar::left, CSChar::left - kCSSpriteFontOffset },
+    { UnicodeChar::air, CSChar::air - kCSSpriteFontOffset },
+    { UnicodeChar::tick, CSChar::tick - kCSSpriteFontOffset },
+    { UnicodeChar::plus, '+' - kCSSpriteFontOffset },
+    { UnicodeChar::minus, '-' - kCSSpriteFontOffset },
 
     // Emoji
-    { UnicodeChar::cross, CSChar::cross - CS_SPRITE_FONT_OFFSET },
-    { UnicodeChar::water, CSChar::water - CS_SPRITE_FONT_OFFSET },
+    { UnicodeChar::cross, CSChar::cross - kCSSpriteFontOffset },
+    { UnicodeChar::water, CSChar::water - kCSSpriteFontOffset },
     { UnicodeChar::eye, SPR_FONTS_EYE - SPR_FONTS_BEGIN },
-    { UnicodeChar::road, CSChar::road - CS_SPRITE_FONT_OFFSET },
-    { UnicodeChar::railway, CSChar::railway - CS_SPRITE_FONT_OFFSET },
+    { UnicodeChar::road, CSChar::road - kCSSpriteFontOffset },
+    { UnicodeChar::railway, CSChar::railway - kCSSpriteFontOffset },
 
     // Misc
-    { UnicodeChar::superscript_minus_one, CSChar::superscript_minus_one - CS_SPRITE_FONT_OFFSET },
+    { UnicodeChar::superscript_minus_one, CSChar::superscript_minus_one - kCSSpriteFontOffset },
 };
 
 static char32_t _smallestCodepointValue = 0;