Use custom URL + fixes
Rename tool