Merge pull request #16 from dimazest/theme

Theme