Finish porting theme controller to Bluebird