Merge and cleanup
make character tokens configurable