A lot of changes to custom elements