Fix indentation, add kits and more