Fix indent settings & add puppet custom settings