Improved how the theme, and added an Index that works (at least, the
connections work well)