Another update on the new theme editor: I added a “…” context menu with a “Show Locations” item. This will show where a template is coming from, e.g. your custom theme or a plug-in. Still can be confusing, but getting better.