Also cleans up inflation so that we can apply themes more easily. Change-Id: I56decb29fe987286a38fc0aa96f95952cf67c120