Merge pull request #7 from Jimmytanuwijaya/master

Update UserProperty, style dan themes