updated Tools- flavours and addons