Add Al100 macros
geometry overlap and black tape material fix