Added the other side of the settings migration and foxed more typoes
Fixed the theme cache status
Merge branch 'master' into New-Tab

Conflicts:
	index.html