Template and Addons Added, ds-addons fetched from upstream, wr-addons cloned from far project