fix gadget name and include less gadgets