Brackets and formatting
Update property attributes
Switch to @import for modules
Update demo projects