Got the theme changing to not reset the tab indexes.