Change dialog templates to not explicitly specify extended window