Theme related changes (KP)