complete overhaul of style and structure
Further cleanup
Update TypeKit code