only include certain pattern types, add tank top, fix type button event