Change "video-resolution" and "video-color-depth" properties to "resolution" and "color-depth".

Should I just do a pull request to remove all dead code? There's quite a bit in this file for some reason.