Rename styleable attributes
Refactor layout xml