Adding spotlight, version control settings