thema builder refactoring and save file bugs.
intermediate font changes.