Tweaks to use new git repos,  use more variables and less static crap