Updating repo with ST3 customizations