Attributes collection

Attributes collection was returning type Control and not XrmAttribute
New theme class was somehow not included in the project.