Fixes one dimension
Better plugging in the existing code
Better separation of functionality between macros and styles