include macros
update tikzstyles
mostly done