Changed all markup/theme controllers to constructor injection