Add fill/stroke type of button
Fix the versions of SDK and tools