Improved 1.1 repo rewriting script

Rewrite within args and strings