Fat theme controller fixes