Topics/eyecandy

Should be pretty straight forward — see my commits.