Refactored themes to be simpler and compatible with all supported versions of Android
Remove unnecessary layout file
Bump version code