Theming becomes better

Signed-off-by: Chintan Shah <cgintan1998@gmail.com>

Conflicts:

	res/values/styles.xml