More changes to controllers and home tempate