Added better customization support; Run on save as well.