Tidying of theme/routing