fixes for halo/hover from codex, slight changes by me.

Change-Id: Ic0978fc28510ea68d08c3f64201a1800a26faf7e
Signed-off-by: scott <scott@ubuntu>