Equivalent to MERGE of FullScreen

There were some serious merge mix-ups, so I deleted all files then
copied them from a more stable branch
ds_store