Templates updates in sync with master for Non-NewUI themes