Updated: Removed deprecated settings blocks