Make syntax and first-time loading fixes

* Move syntax files to after dir to override system
* Fix chicken-egg loading of bundles on first start