Refactored away the use of filters + the view get the settings injected + theme can now be used as base