Modify the typetool a bit to clean up and make it easier to extract styles #24