Mostly finishing conversion to new hidden style. Also merged origin/main