Reorganizing old dashboard stuff back into core
Updating lockfile before starting work
Moving stuff around
Merge branch 'dashboard' into 1.10.0
broke stuff with themes, had to refix it