complete refactoring
new mapper
remove unused fonts