Update support files

Based on feedback from @OliverJAsh and @theefer 
Shouldn't the code also get reindented then?