Finalized Mac screensaver refactor merge