Load in showThumbnailOnEnd as a setting
Merge branch 'master' into paleo