Make template overriding more similar to static overriding. Re-arrange theme templates.