 
 : make-word-table ( -- )
     { wCR } { wLF } connect
-    { wNewline wCR wLF } words iota disconnect
-    words iota { wNewline wCR wLF } disconnect
+    { wNewline wCR wLF } unicode-words iota disconnect
+    unicode-words iota { wNewline wCR wLF } disconnect
     { wALetter } { wMidLetter wMidNumLet } check-letter-after set-table
     { wMidLetter wMidNumLet } { wALetter } check-letter-before set-table
     { wNumeric wALetter } { wNumeric wALetter } connect

    ] map ;

"word-table" create-in
words init-table table
[ make-word-table finish-word-table ] with-variable
define-constant
>>

CONSTANT: wMidNumLet 10
CONSTANT: wNumeric 11
CONSTANT: wExtendNumLet 12
CONSTANT: unicode-words 13

! Is there a way to avoid this?
CONSTANT: word-break-classes H{
