Some initial cleanup
Merge branch '1080i' of https://github.com/Drae/skin.refocus into 1080i