Fixes for theming

Signed-off-by: Chintan Shah <cgintan1998@gmail.com>
Merge pull request #6 from Chintan1998/kitkat

Fixes for theming