Sorted out the themes route and focusareas index route
Updated the tests, templates and the controllers