Merging settings from Paul Irish and Mathias Bynes