Merge pull request #30 from iPkay/master

[Update] more sreens skinned