Added theme controller and model