Settings changes, keyboard auto pull
trying to merge