diff --git a/src/xpdev/unicode_defs.h b/src/xpdev/unicode_defs.h
index 4f1ad4af9fd0fd6adaaf463df8174e47f4766fc5..44a118bb40da8ef144ececd0f47790244448e9d8 100644
--- a/src/xpdev/unicode_defs.h
+++ b/src/xpdev/unicode_defs.h
@@ -249,6 +249,124 @@ enum unicode_codepoint {
 	UNICODE_COUNTERSINK = 0x2335,
 	UNICODE_APL_FUNCTIONAL_SYMBOL_I_BEAM = 0x2336,
 
+	UNICODE_BOX_DRAWINGS_LIGHT_HORIZONTAL = 0x2500,
+	UNICODE_BOX_DRAWINGS_HEAVY_HORIZONTAL = 0x2501,
+	UNICODE_BOX_DRAWINGS_LIGHT_TRIPLE_DASH_HORIZONTAL = 0x2504,
+	UNICODE_BOX_DRAWINGS_HEAVY_TRIPLE_DASH_HORIZONTAL = 0x2505,
+	UNICODE_BOX_DRAWINGS_LIGHT_QUADRUPLE_DASH_HORIZONTAL = 0x2508,
+	UNICODE_BOX_DRAWINGS_HEAVY_QUADRUPLE_DASH_HORIZONTAL = 0x2509,
+	UNICODE_BOX_DRAWINGS_LIGHT_DOUBLE_DASH_HORIZONTAL = 0x254C,
+	UNICODE_BOX_DRAWINGS_HEAVY_DOUBLE_DASH_HORIZONTAL = 0x254D,
+	UNICODE_BOX_DRAWINGS_LIGHT_LEFT	= 0x2574,
+	UNICODE_BOX_DRAWINGS_LIGHT_RIGHT = 0x2576,
+	UNICODE_BOX_DRAWINGS_HEAVY_LEFT	= 0x2578,
+	UNICODE_BOX_DRAWINGS_HEAVY_RIGHT = 0x257A,
+	UNICODE_BOX_DRAWINGS_LIGHT_LEFT_AND_HEAVY_RIGHT	= 0x257C,
+	UNICODE_BOX_DRAWINGS_HEAVY_LEFT_AND_LIGHT_RIGHT	= 0x257E,
+	UNICODE_BOX_DRAWINGS_LIGHT_VERTICAL	= 0x2502,
+	UNICODE_BOX_DRAWINGS_HEAVY_VERTICAL	= 0x2503,
+	UNICODE_BOX_DRAWINGS_LIGHT_TRIPLE_DASH_VERTICAL	= 0x2506,
+	UNICODE_BOX_DRAWINGS_HEAVY_TRIPLE_DASH_VERTICAL	= 0x2507,
+	UNICODE_BOX_DRAWINGS_LIGHT_QUADRUPLE_DASH_VERTICAL = 0x250A,
+	UNICODE_BOX_DRAWINGS_HEAVY_QUADRUPLE_DASH_VERTICAL = 0x250B,
+	UNICODE_BOX_DRAWINGS_LIGHT_DOWN_AND_RIGHT = 0x250C,
+	UNICODE_BOX_DRAWINGS_250D = 0x250D,
+	UNICODE_BOX_DRAWINGS_250E = 0x250E,
+	UNICODE_BOX_DRAWINGS_HEAVY_DOWN_AND_RIGHT = 0x250F,
+	UNICODE_BOX_DRAWINGS_LIGHT_DOWN_AND_LEFT = 0x2510,
+	UNICODE_BOX_DRAWINGS_2511 = 0x2511,
+	UNICODE_BOX_DRAWINGS_2512 = 0x2512,
+	UNICODE_BOX_DRAWINGS_HEAVY_DOWN_AND_LEFT = 0x2513,
+	UNICODE_BOX_DRAWINGS_LIGHT_UP_AND_RIGHT	= 0x2514,
+	UNICODE_BOX_DRAWINGS_2515 = 0x2515,
+	UNICODE_BOX_DRAWINGS_2516 = 0x2516,
+	UNICODE_BOX_DRAWINGS_HEAVY_UP_AND_RIGHT	= 0x2517,
+	UNICODE_BOX_DRAWINGS_LIGHT_UP_AND_LEFT	= 0x2518,
+	UNICODE_BOX_DRAWINGS_2519 = 0x2519,
+	UNICODE_BOX_DRAWINGS_251A = 0x251A,
+	UNICODE_BOX_DRAWINGS_HEAVY_UP_AND_LEFT	= 0x251B,
+	UNICODE_BOX_DRAWINGS_LIGHT_VERTICAL_AND_RIGHT	= 0x251C,
+	UNICODE_BOX_DRAWINGS_251D = 0x251D,
+	UNICODE_BOX_DRAWINGS_251E = 0x251E,
+	UNICODE_BOX_DRAWINGS_251F = 0x251F,
+	UNICODE_BOX_DRAWINGS_2520 = 0x2520,
+	UNICODE_BOX_DRAWINGS_2521 = 0x2521,
+	UNICODE_BOX_DRAWINGS_2522= 0x2522,
+	UNICODE_BOX_DRAWINGS_HEAVY_VERTICAL_AND_RIGHT = 0x2523,
+	UNICODE_BOX_DRAWINGS_LIGHT_VERTICAL_AND_LEFT = 0x2524,
+	UNICODE_BOX_DRAWINGS_2525 = 0x2525,
+	UNICODE_BOX_DRAWINGS_2526 = 0x2526,
+	UNICODE_BOX_DRAWINGS_2527 = 0x2527,
+	UNICODE_BOX_DRAWINGS_2528 = 0x2528,
+	UNICODE_BOX_DRAWINGS_2529 = 0x2529,
+	UNICODE_BOX_DRAWINGS_252A = 0x252A,
+	UNICODE_BOX_DRAWINGS_252B = 0x252B,
+	UNICODE_BOX_DRAWINGS_LIGHT_DOWN_AND_HORIZONTAL = 0x252C,
+	UNICODE_BOX_DRAWINGS_252D = 0x252D,
+	UNICODE_BOX_DRAWINGS_252E = 0x252E,
+	UNICODE_BOX_DRAWINGS_252F = 0x252F,
+	UNICODE_BOX_DRAWINGS_2530 = 0x2530,
+	UNICODE_BOX_DRAWINGS_2531 = 0x2531,
+	UNICODE_BOX_DRAWINGS_LEFT_LIGHT_AND_RIGHT_DOWN_HEAVY = 0x2532,
+	UNICODE_BOX_DRAWINGS_HEAVY_DOWN_AND_HORIZONTAL	= 0x2533,
+	UNICODE_BOX_DRAWINGS_LIGHT_UP_AND_HORIZONTAL	= 0x2534,
+	UNICODE_BOX_DRAWINGS_LEFT_HEAVY_AND_RIGHT_UP_LIGHT	= 0x2535,
+	UNICODE_BOX_DRAWINGS_RIGHT_HEAVY_AND_LEFT_UP_LIGHT	= 0x2536,
+	UNICODE_BOX_DRAWINGS_UP_LIGHT_AND_HORIZONTAL_HEAVY	= 0x2537,
+	UNICODE_BOX_DRAWINGS_UP_HEAVY_AND_HORIZONTAL_LIGHT	= 0x2538,
+	UNICODE_BOX_DRAWINGS_RIGHT_LIGHT_AND_LEFT_UP_HEAVY	= 0x2539,
+	UNICODE_BOX_DRAWINGS_LEFT_LIGHT_AND_RIGHT_UP_HEAVY	= 0x253A,
+	UNICODE_BOX_DRAWINGS_HEAVY_UP_AND_HORIZONTAL = 0x253B,
+	UNICODE_BOX_DRAWINGS_LIGHT_VERTICAL_AND_HORIZONTAL	= 0x253C,
+	UNICODE_BOX_DRAWINGS_LEFT_HEAVY_AND_RIGHT_VERTICAL_LIGHT = 0x253D,
+	UNICODE_BOX_DRAWINGS_RIGHT_HEAVY_AND_LEFT_VERTICAL_LIGHT = 0x253E,
+	UNICODE_BOX_DRAWINGS_VERTICAL_LIGHT_AND_HORIZONTAL_HEAVY = 0x253F,
+	UNICODE_BOX_DRAWINGS_UP_HEAVY_AND_DOWN_HORIZONTAL_LIGHT	= 0x2540,
+	UNICODE_BOX_DRAWINGS_DOWN_HEAVY_AND_UP_HORIZONTAL_LIGHT	= 0x2541,
+	UNICODE_BOX_DRAWINGS_VERTICAL_HEAVY_AND_HORIZONTAL_LIGHT = 0x2542,
+	UNICODE_BOX_DRAWINGS_LEFT_UP_HEAVY_AND_RIGHT_DOWN_LIGHT	= 0x2543,
+	UNICODE_BOX_DRAWINGS_RIGHT_UP_HEAVY_AND_LEFT_DOWN_LIGHT	= 0x2544,
+	UNICODE_BOX_DRAWINGS_LEFT_DOWN_HEAVY_AND_RIGHT_UP_LIGHT	= 0x2545,
+	UNICODE_BOX_DRAWINGS_RIGHT_DOWN_HEAVY_AND_LEFT_UP_LIGHT	= 0x2546,
+	UNICODE_BOX_DRAWINGS_DOWN_LIGHT_AND_UP_HORIZONTAL_HEAVY	= 0x2547,
+	UNICODE_BOX_DRAWINGS_UP_LIGHT_AND_DOWN_HORIZONTAL_HEAVY	= 0x2548,
+	UNICODE_BOX_DRAWINGS_RIGHT_LIGHT_AND_LEFT_VERTICAL_HEAVY = 0x2549,
+	UNICODE_BOX_DRAWINGS_LEFT_LIGHT_AND_RIGHT_VERTICAL_HEAVY = 0x254A,
+	UNICODE_BOX_DRAWINGS_HEAVY_VERTICAL_AND_HORIZONTAL = 0x254B,
+	UNICODE_BOX_DRAWINGS_LIGHT_DOUBLE_DASH_VERTICAL	= 0x254E,
+	UNICODE_BOX_DRAWINGS_HEAVY_DOUBLE_DASH_VERTICAL	= 0x254F,
+	UNICODE_BOX_DRAWINGS_LIGHT_ARC_DOWN_AND_RIGHT	= 0x256D,
+	UNICODE_BOX_DRAWINGS_LIGHT_ARC_DOWN_AND_LEFT	= 0x256E,
+	UNICODE_BOX_DRAWINGS_LIGHT_ARC_UP_AND_LEFT	= 0x256F,
+	UNICODE_BOX_DRAWINGS_LIGHT_ARC_UP_AND_RIGHT	= 0x2570,
+	UNICODE_BOX_DRAWINGS_LIGHT_DIAGONAL_UPPER_RIGHT_TO_LOWER_LEFT = 0x2571,
+	UNICODE_BOX_DRAWINGS_LIGHT_DIAGONAL_UPPER_LEFT_TO_LOWER_RIGHT = 0x2572,
+	UNICODE_BOX_DRAWINGS_LIGHT_DIAGONAL_CROSS = 0x2573,
+	UNICODE_BOX_DRAWINGS_LIGHT_UP = 0x2575,
+	UNICODE_BOX_DRAWINGS_LIGHT_DOWN	= 0x2577,
+	UNICODE_BOX_DRAWINGS_HEAVY_UP = 0x2579,
+	UNICODE_BOX_DRAWINGS_HEAVY_DOWN	= 0x257B,
+	UNICODE_BOX_DRAWINGS_LIGHT_UP_AND_HEAVY_DOWN = 0x257D,
+	UNICODE_BOX_DRAWINGS_HEAVY_UP_AND_LIGHT_DOWN = 0x257F,
+
+	UNICODE_LOWER_ONE_EIGHTH_BLOCK	= 0x2581,
+	UNICODE_LOWER_ONE_QUARTER_BLOCK	= 0x2582,
+	UNICODE_LOWER_THREE_EIGHTHS_BLOCK = 0x2583,
+	UNICODE_LOWER_FIVE_EIGHTHS_BLOCK = 0x2585,
+	UNICODE_LOWER_THREE_QUARTERS_BLOCK = 0x2586,
+	UNICODE_LOWER_SEVEN_EIGHTHS_BLOCK = 0x2587,
+	UNICODE_FULL_BLOCK = 0x2588,
+	UNICODE_LEFT_SEVEN_EIGHTHS_BLOCK = 0x2589,
+	UNICODE_LEFT_THREE_QUARTERS_BLOCK = 0x258A,
+	UNICODE_LEFT_FIVE_EIGHTHS_BLOCK	= 0x258B,
+	UNICODE_LEFT_HALF_BLOCK	= 0x258C,
+	UNICODE_LEFT_THREE_EIGHTHS_BLOCK = 0x258D,
+	UNICODE_LEFT_ONE_QUARTER_BLOCK = 0x258E,
+	UNICODE_LEFT_ONE_EIGHTH_BLOCK = 0x258F,
+	UNICODE_RIGHT_HALF_BLOCK = 0x2590,
+	UNICODE_RIGHT_ONE_EIGHTH_BLOCK = 0x2595,
+	UNICODE_UPPER_ONE_EIGHTH_BLOCK = 0x2594,
+
 	UNICODE_BLACK_SQUARE = 0x25A0,
 
 	UNICODE_CHECK_MARK = 0x2713,
@@ -259,6 +377,8 @@ enum unicode_codepoint {
 	UNICODE_BALLOT_X = 0x2717,
 	UNICODE_HEAVY_BALLOT_X = 0x2718,
 
+	UNICODE_IDEOGRAPHIC_SPACE = 0x3000,	// Fullwidth space
+
 	UNICODE_VARIATION_SELECTOR_1 = 0xFE00,
 	UNICODE_VARIATION_SELECTOR_2 = 0xFE01,
 	UNICODE_VARIATION_SELECTOR_3 = 0xFE02,
@@ -320,7 +440,7 @@ enum unicode_codepoint {
 #define UNICIDE_BLOCK_HANGUL_SYLLABLES_BEGIN					0xAC00	// Fullwidth
 #define UNICIDE_BLOCK_HANGUL_SYLLABLES_END						0xD7AF	// Fullwidth
 #define UNICODE_BLOCK_CJK_COMPATIBILITY_IDEOGRAPHS_BEGIN		0xF900	// Fullwidth
-#define UNICODE_BLOCK_CJK_COMPATIBILITY_IDEOGRAPHS_END			0xFAFF
+#define UNICODE_BLOCK_CJK_COMPATIBILITY_IDEOGRAPHS_END			0xFAFF	// Fullwidth
 #define UNICODE_BLOCK_VERTICAL_FORMS_BEGIN						0xFE10	// Fullwidth
 #define UNICODE_BLOCK_VERTICAL_FORMS_END						0xFE1F	// Fullwidth
 #define UNICODE_BLOCK_CJK_COMPATIBILITY_FORMS_BEGIN				0xFE30	// Fullwidth