From afd2418d7387dc2a50835128e24840686600ef4b Mon Sep 17 00:00:00 2001
From: Tomas Cohen Arazi <tomascohen@gmail.com>
Date: Tue, 8 Jul 2014 11:34:27 -0300
Subject: [PATCH] Bug 11349: Change .tmpl -> .tt in scripts using templates

Since we switched to Template Toolkit we don't need to stick with the
sufix we used for HTML::Template::Pro.

This patch changes the occurences of '.tmpl' in favour of '.tt'.

To test:
- Apply the patch
- Install koha, and verify that every page can be accesed

Regards
To+

P.S. a followup will remove the glue code.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
---
 C4/Acquisition.pm                             |  4 +--
 C4/Auth.pm                                    |  6 ++--
 C4/InstallAuth.pm                             |  6 ++--
 about.pl                                      |  2 +-
 acqui/acqui-home.pl                           |  2 +-
 acqui/addorder.pl                             |  4 +--
 acqui/addorderiso2709.pl                      |  2 +-
 acqui/aqbasketuser_search.pl                  |  2 +-
 acqui/basket.pl                               |  2 +-
 acqui/basketgroup.pl                          |  2 +-
 acqui/basketheader.pl                         |  2 +-
 acqui/booksellers.pl                          |  2 +-
 acqui/check_budget_total.pl                   |  2 +-
 acqui/histsearch.pl                           |  2 +-
 acqui/invoice.pl                              |  2 +-
 acqui/invoices.pl                             |  2 +-
 acqui/lateorders.pl                           | 18 ++++++-----
 acqui/modordernotes.pl                        |  2 +-
 acqui/neworderbiblio.pl                       |  2 +-
 acqui/neworderempty.pl                        |  4 +--
 acqui/newordersuggestion.pl                   |  2 +-
 acqui/orderreceive.pl                         |  2 +-
 acqui/parcel.pl                               |  2 +-
 acqui/parcels.pl                              |  2 +-
 acqui/supplier.pl                             |  2 +-
 acqui/transferorder.pl                        |  2 +-
 acqui/uncertainprice.pl                       |  2 +-
 acqui/z3950_search.pl                         |  2 +-
 admin/admin-home.pl                           |  2 +-
 admin/aqbudgetperiods.pl                      | 15 +++++-----
 admin/aqcontract.pl                           |  2 +-
 admin/aqplan.pl                               |  2 +-
 admin/auth_subfields_structure.pl             |  2 +-
 admin/auth_tag_structure.pl                   |  2 +-
 admin/authorised_values.pl                    |  2 +-
 admin/authtypes.pl                            |  2 +-
 admin/biblio_framework.pl                     |  2 +-
 admin/branch_transfer_limits.pl               |  2 +-
 admin/branches.pl                             |  2 +-
 admin/categorie.pl                            |  2 +-
 admin/check_budget_parent.pl                  |  2 +-
 admin/check_parent_total.pl                   |  2 +-
 admin/checkmarc.pl                            |  2 +-
 admin/cities.pl                               |  2 +-
 admin/classsources.pl                         |  2 +-
 admin/clone-rules.pl                          |  2 +-
 admin/currency.pl                             |  2 +-
 admin/env_tz_test.pl                          | 18 ++++++-----
 admin/fieldmapping.pl                         |  2 +-
 admin/item_circulation_alerts.pl              |  2 +-
 admin/itemtypes.pl                            |  2 +-
 admin/koha2marclinks.pl                       |  2 +-
 admin/marc_subfields_structure.pl             |  2 +-
 admin/marctagstructure.pl                     |  2 +-
 admin/matching-rules.pl                       |  2 +-
 admin/patron-attr-types.pl                    |  2 +-
 admin/preferences.pl                          |  2 +-
 admin/printers.pl                             | 18 ++++++-----
 admin/smart-rules.pl                          |  2 +-
 admin/stopwords.pl                            |  2 +-
 admin/systempreferences.pl                    |  2 +-
 admin/transport-cost-matrix.pl                |  2 +-
 admin/z3950servers.pl                         |  2 +-
 authorities/authorities-home.pl               |  6 ++--
 authorities/authorities.pl                    |  2 +-
 authorities/blinddetail-biblio-search.pl      |  2 +-
 authorities/detail-biblio-search.pl           |  2 +-
 authorities/detail.pl                         | 18 ++++++-----
 basket/basket.pl                              |  2 +-
 basket/downloadcart.pl                        |  2 +-
 basket/sendbasket.pl                          |  4 +--
 catalogue/ISBDdetail.pl                       |  2 +-
 catalogue/MARCdetail.pl                       |  4 +--
 catalogue/detail.pl                           |  2 +-
 catalogue/imageviewer.pl                      |  2 +-
 catalogue/issuehistory.pl                     |  2 +-
 catalogue/labeledMARCdetail.pl                |  2 +-
 catalogue/moredetail.pl                       | 21 +++++++------
 catalogue/search.pl                           |  4 +--
 catalogue/showmarc.pl                         |  2 +-
 cataloguing/addbooks.pl                       |  2 +-
 cataloguing/linkitem.pl                       | 18 ++++++-----
 cataloguing/merge.pl                          |  2 +-
 cataloguing/moveitem.pl                       | 16 +++++-----
 cataloguing/value_builder/callnumber-KU.pl    |  2 +-
 cataloguing/value_builder/callnumber.pl       |  2 +-
 cataloguing/value_builder/labs_theses.pl      | 30 +++++++++++--------
 cataloguing/value_builder/macles.pl           |  2 +-
 cataloguing/value_builder/marc21_field_006.pl |  2 +-
 cataloguing/value_builder/marc21_field_007.pl |  2 +-
 cataloguing/value_builder/marc21_field_008.pl |  2 +-
 .../marc21_field_008_authorities.pl           |  2 +-
 cataloguing/value_builder/marc21_leader.pl    |  2 +-
 .../marc21_leader_authorities.pl              |  2 +-
 .../value_builder/marc21_leader_book.pl       |  2 +-
 .../marc21_leader_computerfile.pl             |  2 +-
 .../value_builder/marc21_leader_video.pl      |  2 +-
 .../value_builder/normarc_field_007.pl        |  2 +-
 .../value_builder/normarc_field_008.pl        |  2 +-
 cataloguing/value_builder/normarc_leader.pl   |  2 +-
 cataloguing/value_builder/stocknumberAV.pl    |  2 +-
 cataloguing/value_builder/stocknumberam123.pl |  2 +-
 .../value_builder/unimarc_field_010.pl        |  2 +-
 .../value_builder/unimarc_field_100.pl        |  2 +-
 .../unimarc_field_100_authorities.pl          |  2 +-
 .../value_builder/unimarc_field_105.pl        |  2 +-
 .../value_builder/unimarc_field_106.pl        |  2 +-
 .../value_builder/unimarc_field_110.pl        |  2 +-
 .../value_builder/unimarc_field_115a.pl       |  2 +-
 .../value_builder/unimarc_field_115b.pl       |  2 +-
 .../value_builder/unimarc_field_116.pl        |  2 +-
 .../value_builder/unimarc_field_117.pl        |  2 +-
 .../value_builder/unimarc_field_120.pl        |  2 +-
 .../value_builder/unimarc_field_121a.pl       |  2 +-
 .../value_builder/unimarc_field_121b.pl       |  2 +-
 .../value_builder/unimarc_field_122.pl        |  2 +-
 .../value_builder/unimarc_field_123a.pl       |  2 +-
 .../value_builder/unimarc_field_123d.pl       |  2 +-
 .../value_builder/unimarc_field_123e.pl       |  2 +-
 .../value_builder/unimarc_field_123f.pl       |  2 +-
 .../value_builder/unimarc_field_123g.pl       |  2 +-
 .../value_builder/unimarc_field_123i.pl       |  2 +-
 .../value_builder/unimarc_field_123j.pl       |  2 +-
 .../value_builder/unimarc_field_124.pl        |  2 +-
 .../value_builder/unimarc_field_124a.pl       |  2 +-
 .../value_builder/unimarc_field_124b.pl       |  2 +-
 .../value_builder/unimarc_field_124c.pl       |  2 +-
 .../value_builder/unimarc_field_124d.pl       |  2 +-
 .../value_builder/unimarc_field_124e.pl       |  2 +-
 .../value_builder/unimarc_field_124f.pl       |  2 +-
 .../value_builder/unimarc_field_124g.pl       |  2 +-
 .../value_builder/unimarc_field_125.pl        |  2 +-
 .../value_builder/unimarc_field_125a.pl       |  2 +-
 .../value_builder/unimarc_field_125b.pl       |  2 +-
 .../value_builder/unimarc_field_126.pl        |  2 +-
 .../value_builder/unimarc_field_126a.pl       |  2 +-
 .../value_builder/unimarc_field_126b.pl       |  2 +-
 .../value_builder/unimarc_field_127.pl        |  2 +-
 .../value_builder/unimarc_field_128a.pl       |  2 +-
 .../value_builder/unimarc_field_128b.pl       |  2 +-
 .../value_builder/unimarc_field_128c.pl       |  2 +-
 .../value_builder/unimarc_field_130.pl        |  2 +-
 .../value_builder/unimarc_field_135a.pl       |  2 +-
 .../value_builder/unimarc_field_140.pl        |  2 +-
 .../value_builder/unimarc_field_141.pl        |  2 +-
 .../value_builder/unimarc_field_210c.pl       |  4 +--
 .../value_builder/unimarc_field_210c_bis.pl   |  2 +-
 .../value_builder/unimarc_field_225a.pl       |  2 +-
 .../value_builder/unimarc_field_4XX.pl        |  6 ++--
 .../value_builder/unimarc_field_686a.pl       | 18 ++++++-----
 .../value_builder/unimarc_field_700-4.pl      | 18 ++++++-----
 cataloguing/value_builder/unimarc_leader.pl   |  2 +-
 cataloguing/z3950_auth_search.pl              |  2 +-
 cataloguing/z3950_search.pl                   |  2 +-
 circ/add_message.pl                           |  2 +-
 circ/bookcount.pl                             |  2 +-
 circ/branchoverdues.pl                        |  2 +-
 circ/branchtransfers.pl                       |  2 +-
 circ/circulation-home.pl                      | 16 +++++-----
 circ/circulation.pl                           |  2 +-
 circ/del_message.pl                           |  2 +-
 circ/hold-transfer-slip.pl                    |  2 +-
 circ/overdue.pl                               |  2 +-
 circ/pendingreserves.pl                       |  2 +-
 circ/renew.pl                                 |  2 +-
 circ/reserveratios.pl                         |  2 +-
 circ/returns.pl                               |  2 +-
 circ/selectbranchprinter.pl                   |  2 +-
 circ/stats.pl                                 |  2 +-
 circ/transfer-slip.pl                         |  2 +-
 circ/transferstoreceive.pl                    |  2 +-
 circ/view_holdsqueue.pl                       |  2 +-
 circ/waitingreserves.pl                       |  2 +-
 course_reserves/course-reserves.pl            |  2 +-
 course_reserves/mod_course.pl                 |  2 +-
 errors/400.pl                                 |  2 +-
 errors/401.pl                                 |  2 +-
 errors/402.pl                                 |  2 +-
 errors/403.pl                                 |  2 +-
 errors/404.pl                                 |  2 +-
 errors/500.pl                                 |  2 +-
 installer/install.pl                          |  2 +-
 labels/label-edit-batch.pl                    |  2 +-
 labels/label-edit-layout.pl                   |  2 +-
 labels/label-edit-profile.pl                  |  2 +-
 labels/label-edit-template.pl                 |  2 +-
 labels/label-home.pl                          |  2 +-
 labels/label-item-search.pl                   |  4 +--
 labels/label-manage.pl                        |  2 +-
 labels/label-print.pl                         |  2 +-
 labels/spinelabel-home.pl                     |  2 +-
 labels/spinelabel-print.pl                    |  2 +-
 mainpage.pl                                   |  2 +-
 members/boraccount.pl                         | 19 +++++++-----
 members/deletemem.pl                          |  2 +-
 members/files.pl                              |  2 +-
 members/guarantor_search.pl                   |  2 +-
 members/mancredit.pl                          | 19 +++++++-----
 members/maninvoice.pl                         | 19 ++++++------
 members/member-flags.pl                       | 16 +++++-----
 members/member-password.pl                    |  2 +-
 members/memberentry.pl                        |  2 +-
 members/members-home.pl                       |  2 +-
 members/members-update-do.pl                  |  2 +-
 members/members-update.pl                     |  2 +-
 members/moremember.pl                         | 10 +++----
 members/notices.pl                            |  2 +-
 members/pay.pl                                |  2 +-
 members/paycollect.pl                         |  2 +-
 members/printfeercpt.pl                       |  2 +-
 members/printinvoice.pl                       |  2 +-
 members/printslip.pl                          |  2 +-
 members/readingrec.pl                         |  2 +-
 members/statistics.pl                         |  2 +-
 members/update-child.pl                       |  2 +-
 misc/cronjobs/gather_print_notices.pl         |  4 +--
 misc/translator/text-extract2.pl              |  2 +-
 misc/translator/xgettext.pl                   | 12 ++++----
 offline_circ/enqueue_koc.pl                   |  2 +-
 offline_circ/list.pl                          |  2 +-
 offline_circ/process.pl                       |  2 +-
 offline_circ/process_koc.pl                   |  2 +-
 opac/errors/400.pl                            |  2 +-
 opac/errors/401.pl                            |  2 +-
 opac/errors/402.pl                            |  2 +-
 opac/errors/403.pl                            |  2 +-
 opac/errors/404.pl                            |  2 +-
 opac/errors/500.pl                            |  2 +-
 opac/ilsdi.pl                                 |  4 +--
 opac/maintenance.pl                           |  2 +-
 opac/opac-ISBDdetail.pl                       |  4 +--
 opac/opac-MARCdetail.pl                       |  4 +--
 opac/opac-account.pl                          |  2 +-
 opac/opac-addbybiblionumber.pl                |  2 +-
 opac/opac-alert-subscribe.pl                  |  2 +-
 opac/opac-authorities-home.pl                 |  4 +--
 opac/opac-basket.pl                           |  2 +-
 opac/opac-browser.pl                          |  2 +-
 opac/opac-course-details.pl                   |  2 +-
 opac/opac-course-reserves.pl                  |  2 +-
 opac/opac-detail.pl                           |  2 +-
 opac/opac-downloadcart.pl                     |  2 +-
 opac/opac-downloadshelf.pl                    |  2 +-
 opac/opac-ics.pl                              |  2 +-
 opac/opac-imageviewer.pl                      |  2 +-
 opac/opac-main.pl                             |  2 +-
 opac/opac-memberentry.pl                      |  8 ++---
 opac/opac-messaging.pl                        |  2 +-
 opac/opac-modrequest-suspend.pl               |  2 +-
 opac/opac-modrequest.pl                       |  2 +-
 opac/opac-mymessages.pl                       |  2 +-
 opac/opac-overdrive-search.pl                 |  2 +-
 opac/opac-passwd.pl                           |  2 +-
 opac/opac-privacy.pl                          |  2 +-
 opac/opac-readingrecord.pl                    |  2 +-
 opac/opac-registration-verify.pl              |  4 +--
 opac/opac-renew.pl                            | 12 ++++----
 opac/opac-reserve.pl                          |  2 +-
 opac/opac-review.pl                           |  2 +-
 opac/opac-search-history.pl                   |  2 +-
 opac/opac-search.pl                           | 10 +++----
 opac/opac-sendbasket.pl                       |  4 +--
 opac/opac-sendshelf.pl                        |  4 +--
 opac/opac-serial-issues.pl                    |  4 +--
 opac/opac-shareshelf.pl                       |  2 +-
 opac/opac-shelves.pl                          |  2 +-
 opac/opac-showmarc.pl                         |  2 +-
 opac/opac-showreviews.pl                      |  4 +--
 opac/opac-suggestions.pl                      |  4 +--
 opac/opac-tags.pl                             | 10 +++----
 opac/opac-tags_subject.pl                     |  2 +-
 opac/opac-topissues.pl                        | 16 +++++-----
 opac/opac-user.pl                             |  2 +-
 opac/sco/help.pl                              |  2 +-
 opac/sco/printslip.pl                         |  2 +-
 opac/sco/sco-main.pl                          |  2 +-
 patroncards/card-print.pl                     |  2 +-
 patroncards/edit-batch.pl                     |  2 +-
 patroncards/edit-layout.pl                    |  2 +-
 patroncards/edit-profile.pl                   |  2 +-
 patroncards/edit-template.pl                  |  2 +-
 patroncards/home.pl                           |  2 +-
 patroncards/image-manage.pl                   |  2 +-
 patroncards/manage.pl                         |  2 +-
 patroncards/members-search.pl                 |  2 +-
 patroncards/print.pl                          |  2 +-
 plugins/plugins-uninstall.pl                  |  2 +-
 plugins/plugins-upload.pl                     |  2 +-
 plugins/run.pl                                |  2 +-
 reports/acquisitions_stats.pl                 |  2 +-
 reports/bor_issues_top.pl                     |  2 +-
 reports/borrowers_out.pl                      |  2 +-
 reports/borrowers_stats.pl                    |  2 +-
 reports/cat_issues_top.pl                     |  2 +-
 reports/catalogue_out.pl                      |  2 +-
 reports/catalogue_stats.pl                    |  2 +-
 reports/dictionary.pl                         |  2 +-
 reports/guided_reports.pl                     |  2 +-
 reports/issues_avg_stats.pl                   |  2 +-
 reports/issues_stats.pl                       |  2 +-
 reports/itemslost.pl                          |  2 +-
 reports/manager.pl                            |  2 +-
 reports/reports-home.pl                       |  2 +-
 reports/reservereport.pl                      |  2 +-
 reports/reserves_stats.pl                     |  2 +-
 reports/serials_stats.pl                      |  2 +-
 reports/stats.screen.pl                       |  2 +-
 reserve/modrequest.pl                         |  2 +-
 reserve/modrequest_suspendall.pl              |  2 +-
 reserve/renewscript.pl                        |  2 +-
 reserve/request.pl                            |  2 +-
 reviews/reviewswaiting.pl                     |  2 +-
 rotating_collections/addItems.pl              |  2 +-
 rotating_collections/editCollections.pl       |  2 +-
 rotating_collections/rotatingCollections.pl   |  2 +-
 rotating_collections/transferCollection.pl    |  2 +-
 serials/acqui-search-result.pl                |  2 +-
 serials/acqui-search.pl                       |  2 +-
 serials/checkexpiration.pl                    |  2 +-
 serials/claims.pl                             |  2 +-
 serials/member-search.pl                      |  2 +-
 serials/routing-preview.pl                    |  4 +--
 serials/routing.pl                            |  2 +-
 serials/serial-issues.pl                      |  4 +--
 serials/serials-collection.pl                 |  2 +-
 serials/serials-edit.pl                       |  2 +-
 serials/serials-home.pl                       |  2 +-
 serials/serials-recieve.pl                    |  2 +-
 serials/subscription-bib-search.pl            |  4 +--
 serials/subscription-detail.pl                |  2 +-
 serials/subscription-renew.pl                 |  2 +-
 serials/viewalerts.pl                         |  2 +-
 services/itemrecorddisplay.pl                 |  2 +-
 sms/sms.pl                                    |  2 +-
 suggestion/suggestion.pl                      |  2 +-
 svc/report                                    |  2 +-
 t/db_dependent/Auth.t                         |  4 +--
 tags/list.pl                                  |  2 +-
 tags/review.pl                                | 18 ++++++-----
 test/progressbar.pl                           |  2 +-
 test/progressbarsubmit.pl                     |  2 +-
 tools/batchMod.pl                             |  4 +--
 tools/cleanborrowers.pl                       |  2 +-
 tools/csv-profiles.pl                         |  2 +-
 tools/export.pl                               |  2 +-
 tools/holidays.pl                             |  2 +-
 tools/import_borrowers.pl                     |  2 +-
 tools/koha-news.pl                            |  2 +-
 tools/letter.pl                               |  2 +-
 tools/manage-marc-import.pl                   |  2 +-
 tools/modborrowers.pl                         |  2 +-
 tools/overduerules.pl                         |  2 +-
 tools/picture-upload.pl                       |  2 +-
 tools/scheduler.pl                            |  2 +-
 tools/stage-marc-import.pl                    |  2 +-
 tools/tools-home.pl                           |  2 +-
 tools/upload-cover-image.pl                   |  2 +-
 tools/viewlog.pl                              |  2 +-
 virtualshelves/addbybiblionumber.pl           |  2 +-
 virtualshelves/downloadshelf.pl               |  2 +-
 virtualshelves/sendshelf.pl                   | 12 ++++----
 virtualshelves/shelves.pl                     |  2 +-
 xt/author/show-template-structure.pl          |  2 +-
 363 files changed, 591 insertions(+), 554 deletions(-)

diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm
index 28b52f5fb6..d017d62953 100644
--- a/C4/Acquisition.pm
+++ b/C4/Acquisition.pm
@@ -295,7 +295,7 @@ sub GetBasketAsCSV {
     my @orders = GetOrders($basketno);
     my $contract = GetContract($basket->{'contractnumber'});
 
-    my $template = C4::Templates::gettemplate("acqui/csv/basket.tmpl", "intranet", $cgi);
+    my $template = C4::Templates::gettemplate("acqui/csv/basket.tt", "intranet", $cgi);
 
     my @rows;
     foreach my $order (@orders) {
@@ -356,7 +356,7 @@ sub GetBasketGroupAsCSV {
     my ($basketgroupid, $cgi) = @_;
     my $baskets = GetBasketsByBasketgroup($basketgroupid);
 
-    my $template = C4::Templates::gettemplate('acqui/csv/basketgroup.tmpl', 'intranet', $cgi);
+    my $template = C4::Templates::gettemplate('acqui/csv/basketgroup.tt', 'intranet', $cgi);
 
     my @rows;
     for my $basket (@$baskets) {
diff --git a/C4/Auth.pm b/C4/Auth.pm
index 1bbc0bdb37..fb4081fc7d 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -82,7 +82,7 @@ C4::Auth - Authenticates Koha users
   my ($template, $borrowernumber, $cookie)
     = get_template_and_user(
         {
-            template_name   => "opac-main.tmpl",
+            template_name   => "opac-main.tt",
             query           => $query,
       type            => "opac",
       authnotrequired => 0,
@@ -106,7 +106,7 @@ automatically. This gets loaded into the template.
  my ($template, $borrowernumber, $cookie)
      = get_template_and_user(
        {
-         template_name   => "opac-main.tmpl",
+         template_name   => "opac-main.tt",
          query           => $query,
          type            => "opac",
          authnotrequired => 0,
@@ -1046,7 +1046,7 @@ sub checkauth {
     $LibraryNameTitle =~ s/<(?:\/?)(?:br|p)\s*(?:\/?)>/ /sgi;
     $LibraryNameTitle =~ s/<(?:[^<>'"]|'(?:[^']*)'|"(?:[^"]*)")*>//sg;
 
-    my $template_name = ( $type eq 'opac' ) ? 'opac-auth.tmpl' : 'auth.tmpl';
+    my $template_name = ( $type eq 'opac' ) ? 'opac-auth.tt' : 'auth.tt';
     my $template = C4::Templates::gettemplate($template_name, $type, $query );
     $template->param(
         branchloop           => GetBranchesLoop(),
diff --git a/C4/InstallAuth.pm b/C4/InstallAuth.pm
index 5f0d51d3d6..7657fe22c8 100644
--- a/C4/InstallAuth.pm
+++ b/C4/InstallAuth.pm
@@ -46,7 +46,7 @@ InstallAuth - Authenticates Koha users for Install process
   my $query = new CGI;
 
   my ($template, $borrowernumber, $cookie) 
-    = get_template_and_user({template_name   => "opac-main.tmpl",
+    = get_template_and_user({template_name   => "opac-main.tt",
                              query           => $query,
 			     type            => "opac",
 			     authnotrequired => 1,
@@ -81,7 +81,7 @@ InstallAuth - Authenticates Koha users for Install process
 =item get_template_and_user
 
   my ($template, $borrowernumber, $cookie)
-    = get_template_and_user({template_name   => "opac-main.tmpl",
+    = get_template_and_user({template_name   => "opac-main.tt",
                              query           => $query,
 			     type            => "opac",
 			     authnotrequired => 1,
@@ -234,7 +234,7 @@ sub checkauth {
 
     my $dbh = C4::Context->dbh();
     my $template_name;
-    $template_name = "installer/auth.tmpl";
+    $template_name = "installer/auth.tt";
 
     # state variables
     my $loggedin = 0;
diff --git a/about.pl b/about.pl
index 4687a45a3b..8b9c1e75b5 100755
--- a/about.pl
+++ b/about.pl
@@ -38,7 +38,7 @@ use C4::Installer;
 my $query = new CGI;
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "about.tmpl",
+        template_name   => "about.tt",
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/acqui/acqui-home.pl b/acqui/acqui-home.pl
index cd5683185a..8cffc26ca3 100755
--- a/acqui/acqui-home.pl
+++ b/acqui/acqui-home.pl
@@ -42,7 +42,7 @@ use C4::Suggestions;
 
 my $query = CGI->new;
 my ( $template, $loggedinuser, $cookie, $userflags ) = get_template_and_user(
-    {   template_name   => 'acqui/acqui-home.tmpl',
+    {   template_name   => 'acqui/acqui-home.tt',
         query           => $query,
         type            => 'intranet',
         authnotrequired => 0,
diff --git a/acqui/addorder.pl b/acqui/addorder.pl
index 1b05f07cc4..e048d05e9f 100755
--- a/acqui/addorder.pl
+++ b/acqui/addorder.pl
@@ -155,7 +155,7 @@ unless($confirm_budget_exceeding) {
       || ( ($budget_expenditure+0) && ($budget_used + $total) > $budget_expenditure) )
     {
         my ($template, $loggedinuser, $cookie) = get_template_and_user({
-            template_name   => "acqui/addorder.tmpl",
+            template_name   => "acqui/addorder.tt",
             query           => $input,
             type            => "intranet",
             authnotrequired => 0,
@@ -212,7 +212,7 @@ unless($confirm_budget_exceeding) {
 # get_template_and_user used only to check auth & get user id
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "acqui/booksellers.tmpl",
+        template_name   => "acqui/booksellers.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/acqui/addorderiso2709.pl b/acqui/addorderiso2709.pl
index 91c0a4c4ae..f4d1a257d1 100755
--- a/acqui/addorderiso2709.pl
+++ b/acqui/addorderiso2709.pl
@@ -47,7 +47,7 @@ use C4::Members;
 
 my $input = new CGI;
 my ($template, $loggedinuser, $cookie, $userflags) = get_template_and_user({
-    template_name => "acqui/addorderiso2709.tmpl",
+    template_name => "acqui/addorderiso2709.tt",
     query => $input,
     type => "intranet",
     authnotrequired => 0,
diff --git a/acqui/aqbasketuser_search.pl b/acqui/aqbasketuser_search.pl
index 512c10ac84..6c020ca9a3 100755
--- a/acqui/aqbasketuser_search.pl
+++ b/acqui/aqbasketuser_search.pl
@@ -31,7 +31,7 @@ my $input = new CGI;
 my $dbh = C4::Context->dbh;
 
 my ( $template, $loggedinuser, $cookie, $staff_flags ) = get_template_and_user(
-    {   template_name   => "acqui/aqbasketuser_search.tmpl",
+    {   template_name   => "acqui/aqbasketuser_search.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/acqui/basket.pl b/acqui/basket.pl
index 4f2a37e8ad..5366bf89d7 100755
--- a/acqui/basket.pl
+++ b/acqui/basket.pl
@@ -71,7 +71,7 @@ my $booksellerid = $query->param('booksellerid');
 
 my ( $template, $loggedinuser, $cookie, $userflags ) = get_template_and_user(
     {
-        template_name   => "acqui/basket.tmpl",
+        template_name   => "acqui/basket.tt",
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/acqui/basketgroup.pl b/acqui/basketgroup.pl
index cdb392d721..c226ea359e 100755
--- a/acqui/basketgroup.pl
+++ b/acqui/basketgroup.pl
@@ -62,7 +62,7 @@ use C4::Members qw/GetMember/;
 our $input=new CGI;
 
 our ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "acqui/basketgroup.tmpl",
+    = get_template_and_user({template_name => "acqui/basketgroup.tt",
 			     query => $input,
 			     type => "intranet",
 			     authnotrequired => 0,
diff --git a/acqui/basketheader.pl b/acqui/basketheader.pl
index 93bd7f8ebf..deb77b700f 100755
--- a/acqui/basketheader.pl
+++ b/acqui/basketheader.pl
@@ -59,7 +59,7 @@ use C4::Bookseller qw/GetBookSellerFromId GetBookSeller/;
 my $input = new CGI;
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "acqui/basketheader.tmpl",
+        template_name   => "acqui/basketheader.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/acqui/booksellers.pl b/acqui/booksellers.pl
index 04aa2b8bb8..c8d70b9486 100755
--- a/acqui/booksellers.pl
+++ b/acqui/booksellers.pl
@@ -66,7 +66,7 @@ use C4::Context;
 
 my $query = CGI->new;
 my ( $template, $loggedinuser, $cookie, $userflags ) = get_template_and_user(
-    {   template_name   => 'acqui/booksellers.tmpl',
+    {   template_name   => 'acqui/booksellers.tt',
         query           => $query,
         type            => 'intranet',
         authnotrequired => 0,
diff --git a/acqui/check_budget_total.pl b/acqui/check_budget_total.pl
index 6ee346c98b..83fda5e840 100755
--- a/acqui/check_budget_total.pl
+++ b/acqui/check_budget_total.pl
@@ -36,7 +36,7 @@ my $budget_id = $input->param('budget_id');
 my $total   = $input->param('total');
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
-    {   template_name   => "acqui/ajax.tmpl",
+    {   template_name   => "acqui/ajax.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/acqui/histsearch.pl b/acqui/histsearch.pl
index bd1aa4cf8a..b474ac1d1d 100755
--- a/acqui/histsearch.pl
+++ b/acqui/histsearch.pl
@@ -86,7 +86,7 @@ if ( not $input->param('from') ) {
 my $dbh = C4::Context->dbh;
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "acqui/histsearch.tmpl",
+        template_name   => "acqui/histsearch.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/acqui/invoice.pl b/acqui/invoice.pl
index 66089478d8..9d5955cf3f 100755
--- a/acqui/invoice.pl
+++ b/acqui/invoice.pl
@@ -40,7 +40,7 @@ use Koha::Misc::Files;
 my $input = new CGI;
 my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
     {
-        template_name   => 'acqui/invoice.tmpl',
+        template_name   => 'acqui/invoice.tt',
         query           => $input,
         type            => 'intranet',
         authnotrequired => 0,
diff --git a/acqui/invoices.pl b/acqui/invoices.pl
index 451cf05053..23cd2ac134 100755
--- a/acqui/invoices.pl
+++ b/acqui/invoices.pl
@@ -41,7 +41,7 @@ use C4::Budgets;
 my $input = CGI->new;
 my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
     {
-        template_name   => 'acqui/invoices.tmpl',
+        template_name   => 'acqui/invoices.tt',
         query           => $input,
         type            => 'intranet',
         authnotrequired => 0,
diff --git a/acqui/lateorders.pl b/acqui/lateorders.pl
index 3c96e11691..d43dbbefaa 100755
--- a/acqui/lateorders.pl
+++ b/acqui/lateorders.pl
@@ -56,14 +56,16 @@ use C4::Branch; # GetBranches
 use Koha::DateUtils;
 
 my $input = new CGI;
-my ($template, $loggedinuser, $cookie) = get_template_and_user({
-	template_name => "acqui/lateorders.tmpl",
-	query => $input,
-	 type => "intranet",
-	authnotrequired => 0,
-	flagsrequired => {acquisition => 'order_receive'},
-	debug => 1,
-});
+my ($template, $loggedinuser, $cookie) = get_template_and_user(
+    {
+        template_name   => "acqui/lateorders.tt",
+        query           => $input,
+        type            => "intranet",
+        authnotrequired => 0,
+        flagsrequired   => { acquisition => 'order_receive' },
+        debug           => 1,
+    }
+);
 
 my $booksellerid = $input->param('booksellerid') || undef; # we don't want "" or 0
 my $delay        = $input->param('delay') // 0;
diff --git a/acqui/modordernotes.pl b/acqui/modordernotes.pl
index 74ccd186b7..fc9fde356f 100755
--- a/acqui/modordernotes.pl
+++ b/acqui/modordernotes.pl
@@ -36,7 +36,7 @@ use C4::Bookseller qw( GetBookSellerFromId);
 
 my $input = new CGI;
 my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user( {
-    template_name   => 'acqui/modordernotes.tmpl',
+    template_name   => 'acqui/modordernotes.tt',
     query           => $input,
     type            => 'intranet',
     authnotrequired => 0,
diff --git a/acqui/neworderbiblio.pl b/acqui/neworderbiblio.pl
index 0e0706699b..cfa2e828f8 100755
--- a/acqui/neworderbiblio.pl
+++ b/acqui/neworderbiblio.pl
@@ -84,7 +84,7 @@ my $bookseller = GetBookSellerFromId($booksellerid);
 # getting the template
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "acqui/neworderbiblio.tmpl",
+        template_name   => "acqui/neworderbiblio.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/acqui/neworderempty.pl b/acqui/neworderempty.pl
index 61df7894f7..6ae34400a3 100755
--- a/acqui/neworderempty.pl
+++ b/acqui/neworderempty.pl
@@ -112,7 +112,7 @@ my $budget_name;
 
 our ( $template, $loggedinuser, $cookie, $userflags ) = get_template_and_user(
     {
-        template_name   => "acqui/neworderempty.tmpl",
+        template_name   => "acqui/neworderempty.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
@@ -514,7 +514,7 @@ sub Load_Duplicate {
   my ($duplicatetitle)= @_;
   ($template, $loggedinuser, $cookie) = get_template_and_user(
     {
-        template_name   => "acqui/neworderempty_duplicate.tmpl",
+        template_name   => "acqui/neworderempty_duplicate.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/acqui/newordersuggestion.pl b/acqui/newordersuggestion.pl
index c807938168..21ac9882a9 100755
--- a/acqui/newordersuggestion.pl
+++ b/acqui/newordersuggestion.pl
@@ -116,7 +116,7 @@ $op = 'else' unless $op;
 my $dbh = C4::Context->dbh;
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {
-        template_name   => "acqui/newordersuggestion.tmpl",
+        template_name   => "acqui/newordersuggestion.tt",
         type            => "intranet",
         query           => $input,
         flagsrequired   => { acquisition => 'order_manage' },
diff --git a/acqui/orderreceive.pl b/acqui/orderreceive.pl
index 50920e0c27..ca6de5249b 100755
--- a/acqui/orderreceive.pl
+++ b/acqui/orderreceive.pl
@@ -97,7 +97,7 @@ $results = SearchOrders({
 
 my ( $template, $loggedinuser, $cookie, $userflags ) = get_template_and_user(
     {
-        template_name   => "acqui/orderreceive.tmpl",
+        template_name   => "acqui/orderreceive.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/acqui/parcel.pl b/acqui/parcel.pl
index 557030c6c1..00e64998a5 100755
--- a/acqui/parcel.pl
+++ b/acqui/parcel.pl
@@ -111,7 +111,7 @@ sub get_gst {
 }
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "acqui/parcel.tmpl",
+    = get_template_and_user({template_name => "acqui/parcel.tt",
                  query => $input,
                  type => "intranet",
                  authnotrequired => 0,
diff --git a/acqui/parcels.pl b/acqui/parcels.pl
index 3565d6d033..acf2edf5e8 100755
--- a/acqui/parcels.pl
+++ b/acqui/parcels.pl
@@ -89,7 +89,7 @@ my $op             = $input->param('op');
 $resultsperpage ||= 20;
 
 our ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
-    {   template_name   => 'acqui/parcels.tmpl',
+    {   template_name   => 'acqui/parcels.tt',
         query           => $input,
         type            => 'intranet',
         authnotrequired => 0,
diff --git a/acqui/supplier.pl b/acqui/supplier.pl
index 86aad0aa1b..1e6954a1cd 100755
--- a/acqui/supplier.pl
+++ b/acqui/supplier.pl
@@ -59,7 +59,7 @@ if ($booksellerid) {
 }
 my $op = $query->param('op') || 'display';
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
-    {   template_name   => 'acqui/supplier.tmpl',
+    {   template_name   => 'acqui/supplier.tt',
         query           => $query,
         type            => 'intranet',
         authnotrequired => 0,
diff --git a/acqui/transferorder.pl b/acqui/transferorder.pl
index 3d5fe83e4d..d82ce20738 100755
--- a/acqui/transferorder.pl
+++ b/acqui/transferorder.pl
@@ -33,7 +33,7 @@ use Date::Calc qw/Today/;
 
 my $input = new CGI;
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
-    {   template_name   => "acqui/transferorder.tmpl",
+    {   template_name   => "acqui/transferorder.tt",
         query           => $input,
         type            => "intranet",
         flagsrequired   => { acquisition => 'order_manage' },
diff --git a/acqui/uncertainprice.pl b/acqui/uncertainprice.pl
index fd76e473fb..83bdea6352 100755
--- a/acqui/uncertainprice.pl
+++ b/acqui/uncertainprice.pl
@@ -58,7 +58,7 @@ use C4::Biblio qw/GetBiblioData/;
 my $input=new CGI;
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "acqui/uncertainprice.tmpl",
+    = get_template_and_user({template_name => "acqui/uncertainprice.tt",
 			     query => $input,
 			     type => "intranet",
 			     authnotrequired => 0,
diff --git a/acqui/z3950_search.pl b/acqui/z3950_search.pl
index ab3732eb0f..659dfa4764 100755
--- a/acqui/z3950_search.pl
+++ b/acqui/z3950_search.pl
@@ -67,7 +67,7 @@ my $vendor = GetBookSellerFromId($booksellerid);
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "acqui/z3950_search.tmpl",
+        template_name   => "acqui/z3950_search.tt",
         query           => $input,
         type            => "intranet",
         flagsrequired   => { acquisition => 'order_manage' },
diff --git a/admin/admin-home.pl b/admin/admin-home.pl
index bf3d9af6e5..23a78388cb 100755
--- a/admin/admin-home.pl
+++ b/admin/admin-home.pl
@@ -26,7 +26,7 @@ use C4::Output;
 
 my $query = new CGI;
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "admin/admin-home.tmpl",
+    = get_template_and_user({template_name => "admin/admin-home.tt",
 			     query => $query,
 			     type => "intranet",
 			     authnotrequired => 0,
diff --git a/admin/aqbudgetperiods.pl b/admin/aqbudgetperiods.pl
index d5657460e1..3319d05a2f 100755
--- a/admin/aqbudgetperiods.pl
+++ b/admin/aqbudgetperiods.pl
@@ -80,13 +80,14 @@ my $inactivepagesize = 20;
 $searchfield =~ s/\,//g;
 
 my ($template, $borrowernumber, $cookie, $staff_flags ) = get_template_and_user(
-	{   template_name   => "admin/aqbudgetperiods.tmpl",
-		query           => $input,
-		type            => "intranet",
-		authnotrequired => 0,
-		flagsrequired   => { acquisition => 'period_manage' },
-		debug           => 1,
-	}
+    {
+        template_name   => "admin/aqbudgetperiods.tt",
+        query           => $input,
+        type            => "intranet",
+        authnotrequired => 0,
+        flagsrequired   => { acquisition => 'period_manage' },
+        debug           => 1,
+    }
 );
 
 
diff --git a/admin/aqcontract.pl b/admin/aqcontract.pl
index 43a6b0a139..d173dfef6c 100755
--- a/admin/aqcontract.pl
+++ b/admin/aqcontract.pl
@@ -38,7 +38,7 @@ my $op             = $input->param('op') || 'list';
 my $bookseller = GetBookSellerFromId($booksellerid);
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
-    {   template_name   => "admin/aqcontract.tmpl",
+    {   template_name   => "admin/aqcontract.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/admin/aqplan.pl b/admin/aqplan.pl
index 0614babb9d..d4f355e69f 100755
--- a/admin/aqplan.pl
+++ b/admin/aqplan.pl
@@ -45,7 +45,7 @@ my $input = new CGI;
 my $dbh = C4::Context->dbh;
 
 my ( $template, $borrowernumber, $cookie, $staff_flags ) = get_template_and_user(
-    {   template_name   => "admin/aqplan.tmpl",
+    {   template_name   => "admin/aqplan.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/admin/auth_subfields_structure.pl b/admin/auth_subfields_structure.pl
index 321e54c1ac..c25090bfe0 100755
--- a/admin/auth_subfields_structure.pl
+++ b/admin/auth_subfields_structure.pl
@@ -53,7 +53,7 @@ my $op           = $input->param('op') || '';
 my $script_name  = "/cgi-bin/koha/admin/auth_subfields_structure.pl";
 
 my ($template, $borrowernumber, $cookie) = get_template_and_user(
-    {   template_name   => "admin/auth_subfields_structure.tmpl",
+    {   template_name   => "admin/auth_subfields_structure.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/admin/auth_tag_structure.pl b/admin/auth_tag_structure.pl
index ae2d2da330..3b06cc2774 100755
--- a/admin/auth_tag_structure.pl
+++ b/admin/auth_tag_structure.pl
@@ -46,7 +46,7 @@ my $dbh = C4::Context->dbh;
 
 # open template
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "admin/auth_tag_structure.tmpl",
+    = get_template_and_user({template_name => "admin/auth_tag_structure.tt",
                  query => $input,
                  type => "intranet",
                  authnotrequired => 0,
diff --git a/admin/authorised_values.pl b/admin/authorised_values.pl
index 332f09a399..8a442562de 100755
--- a/admin/authorised_values.pl
+++ b/admin/authorised_values.pl
@@ -54,7 +54,7 @@ our $script_name = "/cgi-bin/koha/admin/authorised_values.pl";
 our $dbh = C4::Context->dbh;
 
 our ($template, $borrowernumber, $cookie)= get_template_and_user({
-    template_name => "admin/authorised_values.tmpl",
+    template_name => "admin/authorised_values.tt",
     authnotrequired => 0,
     flagsrequired => {parameters => 'parameters_remaining_permissions'},
     query => $input,
diff --git a/admin/authtypes.pl b/admin/authtypes.pl
index 98693724e3..bbcfff37f8 100755
--- a/admin/authtypes.pl
+++ b/admin/authtypes.pl
@@ -41,7 +41,7 @@ my $offset       = $input->param('offset') || 0;
 my $op           = $input->param('op')     || '';
 my $pagesize     = 20;
 my ($template, $borrowernumber, $cookie)
-    = get_template_and_user({template_name => "admin/authtypes.tmpl",
+    = get_template_and_user({template_name => "admin/authtypes.tt",
                 query => $input,
                 type => "intranet",
                 authnotrequired => 0,
diff --git a/admin/biblio_framework.pl b/admin/biblio_framework.pl
index 583bc50ac2..7d3ffec1bc 100755
--- a/admin/biblio_framework.pl
+++ b/admin/biblio_framework.pl
@@ -43,7 +43,7 @@ my $op            = $input->param('op') || '';
 my $pagesize      = 20;
 
 my ($template, $borrowernumber, $cookie)
-    = get_template_and_user({template_name => "admin/biblio_framework.tmpl",
+    = get_template_and_user({template_name => "admin/biblio_framework.tt",
 			     query => $input,
 			     type => "intranet",
 			     authnotrequired => 0,
diff --git a/admin/branch_transfer_limits.pl b/admin/branch_transfer_limits.pl
index e7422a63c5..4aa41dd85c 100755
--- a/admin/branch_transfer_limits.pl
+++ b/admin/branch_transfer_limits.pl
@@ -32,7 +32,7 @@ use C4::Circulation qw{ IsBranchTransferAllowed DeleteBranchTransferLimits Creat
 my $input = new CGI;
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "admin/branch_transfer_limits.tmpl",
+    = get_template_and_user({template_name => "admin/branch_transfer_limits.tt",
 			     query => $input,
 			     type => "intranet",
 			     flagsrequired => {borrowers => 1},
diff --git a/admin/branches.pl b/admin/branches.pl
index 9e6b14a0a4..7c4b539dbe 100755
--- a/admin/branches.pl
+++ b/admin/branches.pl
@@ -59,7 +59,7 @@ my $op           = $input->param('op') || '';
 
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {
-        template_name   => "admin/branches.tmpl",
+        template_name   => "admin/branches.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/admin/categorie.pl b/admin/categorie.pl
index 4e7382974b..1b4ad8571f 100755
--- a/admin/categorie.pl
+++ b/admin/categorie.pl
@@ -76,7 +76,7 @@ my $block_expired = $input->param("block_expired");
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "admin/categorie.tmpl",
+        template_name   => "admin/categorie.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/admin/check_budget_parent.pl b/admin/check_budget_parent.pl
index 8f56e2ccd8..c1e0d4108c 100755
--- a/admin/check_budget_parent.pl
+++ b/admin/check_budget_parent.pl
@@ -38,7 +38,7 @@ my $budget_id     = $input->param('budget_id');
 my $new_parent_id = $input->param('new_parent');
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
-    {   template_name   => "acqui/ajax.tmpl",
+    {   template_name   => "acqui/ajax.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/admin/check_parent_total.pl b/admin/check_parent_total.pl
index cd3678b389..27006f5389 100755
--- a/admin/check_parent_total.pl
+++ b/admin/check_parent_total.pl
@@ -44,7 +44,7 @@ my $period_id = $input->param('period_id');
 my $returncode;
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
-    {   template_name   => "acqui/ajax.tmpl",
+    {   template_name   => "acqui/ajax.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/admin/checkmarc.pl b/admin/checkmarc.pl
index 8734441f1b..a01ccc849d 100755
--- a/admin/checkmarc.pl
+++ b/admin/checkmarc.pl
@@ -30,7 +30,7 @@ use C4::Biblio;
 my $input = new CGI;
 
 my ($template, $borrowernumber, $cookie)
-    = get_template_and_user({template_name => "admin/checkmarc.tmpl",
+    = get_template_and_user({template_name => "admin/checkmarc.tt",
 			     query => $input,
 			     type => "intranet",
 			     authnotrequired => 0,
diff --git a/admin/cities.pl b/admin/cities.pl
index e00e6076bd..082350e2a7 100755
--- a/admin/cities.pl
+++ b/admin/cities.pl
@@ -37,7 +37,7 @@ my $cityid      = $input->param('cityid');
 my $op          = $input->param('op') || '';
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "admin/cities.tmpl",
+    = get_template_and_user({template_name => "admin/cities.tt",
 			     query => $input,
 			     type => "intranet",
 			     authnotrequired => 0,
diff --git a/admin/classsources.pl b/admin/classsources.pl
index e7f6c9a671..93914fda77 100755
--- a/admin/classsources.pl
+++ b/admin/classsources.pl
@@ -36,7 +36,7 @@ my $source_code = $input->param('class_source');
 my $rule_code   = $input->param('sort_rule');
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "admin/classsources.tmpl",
+    = get_template_and_user({template_name => "admin/classsources.tt",
                  query => $input,
                  type => "intranet",
                  authnotrequired => 0,
diff --git a/admin/clone-rules.pl b/admin/clone-rules.pl
index c9e4665a4a..c2343106a0 100755
--- a/admin/clone-rules.pl
+++ b/admin/clone-rules.pl
@@ -39,7 +39,7 @@ my $input = new CGI;
 my $dbh = C4::Context->dbh;
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "admin/clone-rules.tmpl",
+    = get_template_and_user({template_name => "admin/clone-rules.tt",
                             query => $input,
                             type => "intranet",
                             authnotrequired => 0,
diff --git a/admin/currency.pl b/admin/currency.pl
index abbdca2831..4849d31e9c 100755
--- a/admin/currency.pl
+++ b/admin/currency.pl
@@ -54,7 +54,7 @@ my $script_name = '/cgi-bin/koha/admin/currency.pl';
 our $pagesize = 20;
 
 our ($template, $loggedinuser, $cookie) = get_template_and_user({
-    template_name => 'admin/currency.tmpl',
+    template_name => 'admin/currency.tt',
     query => $input,
     type => 'intranet',
     flagsrequired => {parameters => 'parameters_remaining_permissions'},
diff --git a/admin/env_tz_test.pl b/admin/env_tz_test.pl
index f549cd0e69..eb6a4b11ff 100755
--- a/admin/env_tz_test.pl
+++ b/admin/env_tz_test.pl
@@ -9,14 +9,16 @@ use C4::Context;
 use C4::Auth;
 
 my $q = CGI->new();
-my ($template, $loggedinuser, $cookie) = get_template_and_user({
-	   template_name => "admin/admin-home.tmpl",	# whatever, we don't really use the template anyway.
-			   query => $q,
-			 	type => "intranet",
-	 authnotrequired => 0,
-       flagsrequired => {parameters => 'parameters_remaining_permissions'},
-		       debug => 1,
-});
+my ($template, $loggedinuser, $cookie) = get_template_and_user(
+    {
+        template_name   => "admin/admin-home.tt", # whatever, we don't really use the template anyway.
+        query           => $q,
+        type            => "intranet",
+        authnotrequired => 0,
+        flagsrequired   => {parameters => 'parameters_remaining_permissions'},
+        debug           => 1,
+    }
+);
 
 my $dbh = C4::Context->dbh;
 my  $tz_sth = $dbh->prepare("SHOW VARIABLES LIKE 'time_zone'");
diff --git a/admin/fieldmapping.pl b/admin/fieldmapping.pl
index 1552010530..65ab938794 100755
--- a/admin/fieldmapping.pl
+++ b/admin/fieldmapping.pl
@@ -35,7 +35,7 @@ my $op            = $query->param('op') || q{};
 my $id            = $query->param('id');
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "admin/fieldmapping.tmpl",
+    = get_template_and_user({template_name => "admin/fieldmapping.tt",
 			     query => $query,
 			     type => "intranet",
 			     authnotrequired => 0,
diff --git a/admin/item_circulation_alerts.pl b/admin/item_circulation_alerts.pl
index 2bfb496cc1..f5370b8b4c 100755
--- a/admin/item_circulation_alerts.pl
+++ b/admin/item_circulation_alerts.pl
@@ -61,7 +61,7 @@ sub show {
     my $dbh = C4::Context->dbh;
     my ($template, $user, $cookie) = get_template_and_user(
         {
-            template_name   => "admin/item_circulation_alerts.tmpl",
+            template_name   => "admin/item_circulation_alerts.tt",
             query           => $input,
             type            => "intranet",
             authnotrequired => 0,
diff --git a/admin/itemtypes.pl b/admin/itemtypes.pl
index 87af801ce9..bfaa44c786 100755
--- a/admin/itemtypes.pl
+++ b/admin/itemtypes.pl
@@ -73,7 +73,7 @@ my $op          = $input->param('op');
 $searchfield =~ s/\,//g;
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {
-        template_name   => "admin/itemtypes.tmpl",
+        template_name   => "admin/itemtypes.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/admin/koha2marclinks.pl b/admin/koha2marclinks.pl
index fc320ad5bb..7ea4f20aae 100755
--- a/admin/koha2marclinks.pl
+++ b/admin/koha2marclinks.pl
@@ -35,7 +35,7 @@ my $script_name = 'koha2marclinks.pl';
 
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user (
     {
-        template_name   => "admin/koha2marclinks.tmpl",
+        template_name   => "admin/koha2marclinks.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/admin/marc_subfields_structure.pl b/admin/marc_subfields_structure.pl
index 0589968e76..552bb894f7 100755
--- a/admin/marc_subfields_structure.pl
+++ b/admin/marc_subfields_structure.pl
@@ -67,7 +67,7 @@ my $script_name   = "/cgi-bin/koha/admin/marc_subfields_structure.pl";
 
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {
-        template_name   => "admin/marc_subfields_structure.tmpl",
+        template_name   => "admin/marc_subfields_structure.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/admin/marctagstructure.pl b/admin/marctagstructure.pl
index d3b227d7c1..3ff48b442e 100755
--- a/admin/marctagstructure.pl
+++ b/admin/marctagstructure.pl
@@ -48,7 +48,7 @@ my $dbh = C4::Context->dbh;
 
 # open template
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "admin/marctagstructure.tmpl",
+    = get_template_and_user({template_name => "admin/marctagstructure.tt",
 			     query => $input,
 			     type => "intranet",
 			     authnotrequired => 0,
diff --git a/admin/matching-rules.pl b/admin/matching-rules.pl
index ea86c480fb..1afb564969 100755
--- a/admin/matching-rules.pl
+++ b/admin/matching-rules.pl
@@ -35,7 +35,7 @@ my $op = $input->param('op') || '';
 
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "admin/matching-rules.tmpl",
+    = get_template_and_user({template_name => "admin/matching-rules.tt",
                  query => $input,
                  type => "intranet",
                  authnotrequired => 0,
diff --git a/admin/patron-attr-types.pl b/admin/patron-attr-types.pl
index 3935f40f37..6ae1b74438 100755
--- a/admin/patron-attr-types.pl
+++ b/admin/patron-attr-types.pl
@@ -39,7 +39,7 @@ my $op = $input->param('op') || '';
 
 
 our ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "admin/patron-attr-types.tmpl",
+    = get_template_and_user({template_name => "admin/patron-attr-types.tt",
                  query => $input,
                  type => "intranet",
                  authnotrequired => 0,
diff --git a/admin/preferences.pl b/admin/preferences.pl
index 1513adc5c6..2d0bac5711 100755
--- a/admin/preferences.pl
+++ b/admin/preferences.pl
@@ -264,7 +264,7 @@ my $dbh = C4::Context->dbh;
 our $input = new CGI;
 
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
-    {   template_name   => "admin/preferences.tmpl",
+    {   template_name   => "admin/preferences.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/admin/printers.pl b/admin/printers.pl
index c7e7492eda..04f73d9bb4 100755
--- a/admin/printers.pl
+++ b/admin/printers.pl
@@ -67,14 +67,16 @@ my $pagesize=20;
 my $op = $input->param('op');
 $searchfield=~ s/\,//g;
 
-my ($template, $loggedinuser, $cookie) = get_template_and_user({
-	   template_name => "admin/printers.tmpl",
-			   query => $input,
-			 	type => "intranet",
-	 authnotrequired => 0,
-       flagsrequired => {parameters => 'parameters_remaining_permissions'},
-		       debug => 1,
-});
+my ($template, $loggedinuser, $cookie) = get_template_and_user(
+    {
+        template_name   => "admin/printers.tt",
+        query           => $input,
+        type            => "intranet",
+        authnotrequired => 0,
+        flagsrequired   => {parameters => 'parameters_remaining_permissions'},
+        debug           => 1,
+    }
+);
 
 $template->param(searchfield => $searchfield,
 		 script_name => $script_name);
diff --git a/admin/smart-rules.pl b/admin/smart-rules.pl
index b3c0727cac..5feba9fd43 100755
--- a/admin/smart-rules.pl
+++ b/admin/smart-rules.pl
@@ -34,7 +34,7 @@ my $dbh = C4::Context->dbh;
 # my $flagsrequired;
 # $flagsrequired->{circulation}=1;
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "admin/smart-rules.tmpl",
+    = get_template_and_user({template_name => "admin/smart-rules.tt",
                             query => $input,
                             type => "intranet",
                             authnotrequired => 0,
diff --git a/admin/stopwords.pl b/admin/stopwords.pl
index a64745f594..8c3f00d3f6 100755
--- a/admin/stopwords.pl
+++ b/admin/stopwords.pl
@@ -45,7 +45,7 @@ my $pagesize = 20;
 my $op = $input->param('op') || '';
 
 my ($template, $loggedinuser, $cookie) 
-    = get_template_and_user({template_name => "admin/stopwords.tmpl",
+    = get_template_and_user({template_name => "admin/stopwords.tt",
     query => $input,
     type => "intranet",
     flagsrequired => {parameters => 'parameters_remaining_permissions'},
diff --git a/admin/systempreferences.pl b/admin/systempreferences.pl
index d41f2a7a67..f41fe76c96 100755
--- a/admin/systempreferences.pl
+++ b/admin/systempreferences.pl
@@ -207,7 +207,7 @@ my $offset      = $input->param('offset') || 0;
 my $script_name = "/cgi-bin/koha/admin/systempreferences.pl";
 
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
-    {   template_name   => "admin/systempreferences.tmpl",
+    {   template_name   => "admin/systempreferences.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/admin/transport-cost-matrix.pl b/admin/transport-cost-matrix.pl
index faff6ec8ca..91f01d6108 100755
--- a/admin/transport-cost-matrix.pl
+++ b/admin/transport-cost-matrix.pl
@@ -33,7 +33,7 @@ use Data::Dumper;
 my $input = new CGI;
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "admin/transport-cost-matrix.tmpl",
+    = get_template_and_user({template_name => "admin/transport-cost-matrix.tt",
                             query => $input,
                             type => "intranet",
                             authnotrequired => 0,
diff --git a/admin/z3950servers.pl b/admin/z3950servers.pl
index edfcf5c441..c13c95f5eb 100755
--- a/admin/z3950servers.pl
+++ b/admin/z3950servers.pl
@@ -39,7 +39,7 @@ my $id = $input->param('id') || 0;
 my $searchfield = '';
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( {
-    template_name => "admin/z3950servers.tmpl",
+    template_name => "admin/z3950servers.tt",
     query => $input,
     type => "intranet",
     authnotrequired => 0,
diff --git a/authorities/authorities-home.pl b/authorities/authorities-home.pl
index 8128e0cb79..d499508eeb 100755
--- a/authorities/authorities-home.pl
+++ b/authorities/authorities-home.pl
@@ -61,7 +61,7 @@ foreach my $thisauthtype (
 if ( $op eq "delete" ) {
     ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         {
-            template_name   => "authorities/authorities-home.tmpl",
+            template_name   => "authorities/authorities-home.tt",
             query           => $query,
             type            => 'intranet',
             authnotrequired => 0,
@@ -101,7 +101,7 @@ if ( $op eq "do_search" ) {
 
     ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         {
-            template_name   => "authorities/searchresultlist.tmpl",
+            template_name   => "authorities/searchresultlist.tt",
             query           => $query,
             type            => 'intranet',
             authnotrequired => 0,
@@ -189,7 +189,7 @@ if ( $op eq "do_search" ) {
 if ( $op eq '' ) {
     ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         {
-            template_name   => "authorities/authorities-home.tmpl",
+            template_name   => "authorities/authorities-home.tt",
             query           => $query,
             type            => 'intranet',
             authnotrequired => 0,
diff --git a/authorities/authorities.pl b/authorities/authorities.pl
index de8bbf8875..60a9343d8c 100755
--- a/authorities/authorities.pl
+++ b/authorities/authorities.pl
@@ -570,7 +570,7 @@ if(!$authtypecode) {
 }
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "authorities/authorities.tmpl",
+    = get_template_and_user({template_name => "authorities/authorities.tt",
                             query => $input,
                             type => "intranet",
                             authnotrequired => 0,
diff --git a/authorities/blinddetail-biblio-search.pl b/authorities/blinddetail-biblio-search.pl
index c6a3042836..a196396469 100755
--- a/authorities/blinddetail-biblio-search.pl
+++ b/authorities/blinddetail-biblio-search.pl
@@ -67,7 +67,7 @@ if ($authid) {
 # open template
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "authorities/blinddetail-biblio-search.tmpl",
+        template_name   => "authorities/blinddetail-biblio-search.tt",
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/authorities/detail-biblio-search.pl b/authorities/detail-biblio-search.pl
index d4dc693664..8a4b1c11f2 100755
--- a/authorities/detail-biblio-search.pl
+++ b/authorities/detail-biblio-search.pl
@@ -63,7 +63,7 @@ my $tagslib = &GetTagsLabels(1,$authtypecode);
 my $record =GetAuthority($authid);
 # open template
 my ($template, $loggedinuser, $cookie)
-		= get_template_and_user({template_name => "authorities/detail-biblio-search.tmpl",
+		= get_template_and_user({template_name => "authorities/detail-biblio-search.tt",
 			     query => $query,
 			     type => "intranet",
 			     authnotrequired => 0,
diff --git a/authorities/detail.pl b/authorities/detail.pl
index 64029615b5..a84a9f51fb 100755
--- a/authorities/detail.pl
+++ b/authorities/detail.pl
@@ -161,14 +161,16 @@ my $query=new CGI;
 my $dbh=C4::Context->dbh;
 
 # open template
-my ($template, $loggedinuser, $cookie)
-		= get_template_and_user({template_name => "authorities/detail.tmpl",
-			     query => $query,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {catalogue => 1},
-			     debug => 1,
-			     });
+my ($template, $loggedinuser, $cookie) = get_template_and_user(
+    {
+        template_name   => "authorities/detail.tt",
+        query           => $query,
+        type            => "intranet",
+        authnotrequired => 0,
+        flagsrequired   => { catalogue => 1 },
+        debug           => 1,
+    }
+);
 
 my $authid = $query->param('authid');
 
diff --git a/basket/basket.pl b/basket/basket.pl
index 04f28de1a0..b30174e7ab 100755
--- a/basket/basket.pl
+++ b/basket/basket.pl
@@ -30,7 +30,7 @@ my $query = new CGI;
 
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user (
     {
-        template_name   => "basket/basket.tmpl",
+        template_name   => "basket/basket.tt",
         query           => $query,
         type            => "intranet",
         flagsrequired   => { borrow => 1 },
diff --git a/basket/downloadcart.pl b/basket/downloadcart.pl
index ca64c60199..569335886a 100755
--- a/basket/downloadcart.pl
+++ b/basket/downloadcart.pl
@@ -36,7 +36,7 @@ my $query = new CGI;
 
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user (
     {
-        template_name   => "basket/downloadcart.tmpl",
+        template_name   => "basket/downloadcart.tt",
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/basket/sendbasket.pl b/basket/sendbasket.pl
index 40547f0bc9..3ac41708a7 100755
--- a/basket/sendbasket.pl
+++ b/basket/sendbasket.pl
@@ -35,7 +35,7 @@ my $query = new CGI;
 
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user (
     {
-        template_name   => "basket/sendbasketform.tmpl",
+        template_name   => "basket/sendbasketform.tt",
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,
@@ -59,7 +59,7 @@ if ( $email_add ) {
 
     my ( $template2, $borrowernumber, $cookie ) = get_template_and_user(
         {
-            template_name   => "basket/sendbasket.tmpl",
+            template_name   => "basket/sendbasket.tt",
             query           => $query,
             type            => "intranet",
             authnotrequired => 0,
diff --git a/catalogue/ISBDdetail.pl b/catalogue/ISBDdetail.pl
index 2fa76bdda0..28843032c9 100755
--- a/catalogue/ISBDdetail.pl
+++ b/catalogue/ISBDdetail.pl
@@ -61,7 +61,7 @@ my $biblionumber = $query->param('biblionumber');
 # open template
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name => "catalogue/ISBDdetail.tmpl",
+        template_name => "catalogue/ISBDdetail.tt",
         query         => $query,
         type          => "intranet",
 	authnotrequired => 0,
diff --git a/catalogue/MARCdetail.pl b/catalogue/MARCdetail.pl
index 2073ffd82a..5eb50e5b5d 100755
--- a/catalogue/MARCdetail.pl
+++ b/catalogue/MARCdetail.pl
@@ -33,7 +33,7 @@ This script needs a biblionumber as parameter
 It shows the biblio in a (nice) MARC format depending on MARC
 parameters tables.
 
-The template is in <templates_dir>/catalogue/MARCdetail.tmpl.
+The template is in <templates_dir>/catalogue/MARCdetail.tt.
 this template must be divided into 11 "tabs".
 
 The first 10 tabs present the biblio, the 11th one presents
@@ -73,7 +73,7 @@ my $subscriptionid = $query->param('subscriptionid');
 # open template
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "catalogue/MARCdetail.tmpl",
+        template_name   => "catalogue/MARCdetail.tt",
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/catalogue/detail.pl b/catalogue/detail.pl
index 3f71a875f7..967d71dd32 100755
--- a/catalogue/detail.pl
+++ b/catalogue/detail.pl
@@ -51,7 +51,7 @@ my $analyze = $query->param('analyze');
 
 my ( $template, $borrowernumber, $cookie, $flags ) = get_template_and_user(
     {
-    template_name   =>  'catalogue/detail.tmpl',
+    template_name   =>  'catalogue/detail.tt',
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/catalogue/imageviewer.pl b/catalogue/imageviewer.pl
index 6ecbc8da92..7c1ab1dd0c 100755
--- a/catalogue/imageviewer.pl
+++ b/catalogue/imageviewer.pl
@@ -32,7 +32,7 @@ use C4::Acquisition qw(GetOrdersByBiblionumber);
 my $query = new CGI;
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {
-        template_name   => "catalogue/imageviewer.tmpl",
+        template_name   => "catalogue/imageviewer.tt",
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/catalogue/issuehistory.pl b/catalogue/issuehistory.pl
index ffb8d0284d..ff22bc0eca 100755
--- a/catalogue/issuehistory.pl
+++ b/catalogue/issuehistory.pl
@@ -30,7 +30,7 @@ use C4::Search;		# enabled_staff_search_views
 my $query = new CGI;
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {
-        template_name   => "catalogue/issuehistory.tmpl",
+        template_name   => "catalogue/issuehistory.tt",
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/catalogue/labeledMARCdetail.pl b/catalogue/labeledMARCdetail.pl
index 37cae1c38a..66c0f745fa 100755
--- a/catalogue/labeledMARCdetail.pl
+++ b/catalogue/labeledMARCdetail.pl
@@ -42,7 +42,7 @@ my $popup        =
 # open template
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "catalogue/labeledMARCdetail.tmpl",
+        template_name   => "catalogue/labeledMARCdetail.tt",
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/catalogue/moredetail.pl b/catalogue/moredetail.pl
index 86adb7260b..eed1f68cd5 100755
--- a/catalogue/moredetail.pl
+++ b/catalogue/moredetail.pl
@@ -43,15 +43,18 @@ my $query=new CGI;
 # FIXME  subject is not exported to the template?
 my $subject=$query->param('subject');
 
-# if its a subject we need to use the subject.tmpl
-my ($template, $loggedinuser, $cookie) = get_template_and_user({
-    template_name   => ($subject? 'catalogue/subject.tmpl':
-                      'catalogue/moredetail.tmpl'),
-    query           => $query,
-    type            => "intranet",
-    authnotrequired => 0,
-    flagsrequired   => {catalogue => 1},
-    });
+# if its a subject we need to use the subject.tt
+my ($template, $loggedinuser, $cookie) = get_template_and_user(
+    {
+        template_name   => ( $subject
+                                ? 'catalogue/subject.tt'
+                                : 'catalogue/moredetail.tt'),
+        query           => $query,
+        type            => "intranet",
+        authnotrequired => 0,
+        flagsrequired   => { catalogue => 1 },
+    }
+);
 
 if($query->cookie("holdfor")){ 
     my $holdfor_patron = GetMember('borrowernumber' => $query->cookie("holdfor"));
diff --git a/catalogue/search.pl b/catalogue/search.pl
index 629a317c3c..dbb75caab6 100755
--- a/catalogue/search.pl
+++ b/catalogue/search.pl
@@ -168,10 +168,10 @@ my $template_name;
 my $template_type;
 my @params = $cgi->param("limit");
 if ((@params>=1) || ($cgi->param("q")) || ($cgi->param('multibranchlimit')) || ($cgi->param('limit-yr')) ) {
-    $template_name = 'catalogue/results.tmpl';
+    $template_name = 'catalogue/results.tt';
 }
 else {
-    $template_name = 'catalogue/advsearch.tmpl';
+    $template_name = 'catalogue/advsearch.tt';
     $template_type = 'advsearch';
 }
 # load the template
diff --git a/catalogue/showmarc.pl b/catalogue/showmarc.pl
index 28d43e4381..2c690fcd7d 100755
--- a/catalogue/showmarc.pl
+++ b/catalogue/showmarc.pl
@@ -68,7 +68,7 @@ if($view eq 'card') {
 else {
     my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
       {
-        template_name   => "catalogue/showmarc.tmpl",
+        template_name   => "catalogue/showmarc.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/cataloguing/addbooks.pl b/cataloguing/addbooks.pl
index 0cfd7e89de..a9cd6e8703 100755
--- a/cataloguing/addbooks.pl
+++ b/cataloguing/addbooks.pl
@@ -45,7 +45,7 @@ my $results_per_page = 20;
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "cataloguing/addbooks.tmpl",
+        template_name   => "cataloguing/addbooks.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/cataloguing/linkitem.pl b/cataloguing/linkitem.pl
index 9b632f1af0..f7cd6b896e 100755
--- a/cataloguing/linkitem.pl
+++ b/cataloguing/linkitem.pl
@@ -35,14 +35,16 @@ my $query = CGI->new;
 my $biblionumber = $query->param('biblionumber');
 my $barcode	 = $query->param('barcode');
 
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "cataloguing/linkitem.tmpl",
-                 query => $query,
-                 type => "intranet",
-                 authnotrequired => 0,
-                 flagsrequired => {editcatalogue => 'edit_catalogue'},
-                 debug => 1,
-                 });
+my ($template, $loggedinuser, $cookie) = get_template_and_user(
+    {
+        template_name   => "cataloguing/linkitem.tt",
+        query           => $query,
+        type            => "intranet",
+        authnotrequired => 0,
+        flagsrequired   => { editcatalogue => 'edit_catalogue' },
+        debug           => 1,
+    }
+);
 
 my $biblio = GetMarcBiblio($biblionumber);
 my $marcflavour = C4::Context->preference("marcflavour");
diff --git a/cataloguing/merge.pl b/cataloguing/merge.pl
index e24b76771c..fdac609799 100755
--- a/cataloguing/merge.pl
+++ b/cataloguing/merge.pl
@@ -40,7 +40,7 @@ my @errors;
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "cataloguing/merge.tmpl",
+        template_name   => "cataloguing/merge.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/cataloguing/moveitem.pl b/cataloguing/moveitem.pl
index 2622c36449..e108637bbd 100755
--- a/cataloguing/moveitem.pl
+++ b/cataloguing/moveitem.pl
@@ -43,14 +43,16 @@ my $biblionumber = $query->param('biblionumber');
 # The barcode of the item to move
 my $barcode	 = $query->param('barcode');
 
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "cataloguing/moveitem.tmpl",
-                 query => $query,
-                 type => "intranet",
-                 authnotrequired => 0,
+my ($template, $loggedinuser, $cookie) = get_template_and_user(
+    {
+        template_name   => "cataloguing/moveitem.tt",
+        query           => $query,
+        type            => "intranet",
+        authnotrequired => 0,
         flagsrequired   => { editcatalogue => 'edit_items' },
-                 debug => 1,
-                 });
+        debug           => 1,
+    }
+);
 
 
 
diff --git a/cataloguing/value_builder/callnumber-KU.pl b/cataloguing/value_builder/callnumber-KU.pl
index 0d1b539444..f858de48a4 100755
--- a/cataloguing/value_builder/callnumber-KU.pl
+++ b/cataloguing/value_builder/callnumber-KU.pl
@@ -76,7 +76,7 @@ sub plugin {
     my $code = $input->param('code');
 
     my ($template, $loggedinuser, $cookie) = get_template_and_user({
-        template_name   => "cataloguing/value_builder/ajax.tmpl",
+        template_name   => "cataloguing/value_builder/ajax.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/cataloguing/value_builder/callnumber.pl b/cataloguing/value_builder/callnumber.pl
index 56ef1746fa..17b313fd0d 100755
--- a/cataloguing/value_builder/callnumber.pl
+++ b/cataloguing/value_builder/callnumber.pl
@@ -72,7 +72,7 @@ sub plugin {
     my $code = $input->param('code');
 
     my ($template, $loggedinuser, $cookie) = get_template_and_user({
-        template_name   => "cataloguing/value_builder/ajax.tmpl",
+        template_name   => "cataloguing/value_builder/ajax.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/cataloguing/value_builder/labs_theses.pl b/cataloguing/value_builder/labs_theses.pl
index d4866495ed..f7338cb563 100755
--- a/cataloguing/value_builder/labs_theses.pl
+++ b/cataloguing/value_builder/labs_theses.pl
@@ -104,13 +104,15 @@ sub plugin {
 			$total++;
 		}
 
-		($template, $loggedinuser, $cookie)
-			= get_template_and_user({template_name => "value_builder/labs_theses.tmpl",
-					query => $query,
-					type => 'intranet',
-					authnotrequired => 0,
-					debug => 1,
-					});
+        ($template, $loggedinuser, $cookie) = get_template_and_user(
+            {
+                template_name   => "value_builder/labs_theses.tt",
+                query           => $query,
+                type            => 'intranet',
+                authnotrequired => 0,
+                debug           => 1,
+            }
+        );
 
 		# multi page display gestion
 		my $displaynext=0;
@@ -161,12 +163,14 @@ sub plugin {
 								);
 
 	} else {
-		($template, $loggedinuser, $cookie)
-			= get_template_and_user({template_name => "value_builder/labs_theses.tmpl",
-						query => $query,
-						type => "intranet",
-						authnotrequired => 0,
-					});
+        ($template, $loggedinuser, $cookie) = get_template_and_user(
+            {
+                template_name   => "value_builder/labs_theses.tt",
+                query           => $query,
+                type            => "intranet",
+                authnotrequired => 0,
+            }
+        );
 
 		$template->param(
 						'search'=>$query->param('search'),
diff --git a/cataloguing/value_builder/macles.pl b/cataloguing/value_builder/macles.pl
index c99508ec36..6644e65ef7 100755
--- a/cataloguing/value_builder/macles.pl
+++ b/cataloguing/value_builder/macles.pl
@@ -195,7 +195,7 @@ my ($input) = @_;
     }
 #     warn "BIGLOOP OUT".Dumper(@BIGLOOP);
     my ($template, $loggedinuser, $cookie)
-        = get_template_and_user({template_name => "cataloguing/value_builder/macles.tmpl",
+        = get_template_and_user({template_name => "cataloguing/value_builder/macles.tt",
                     query => $input,
                     type => "intranet",
                     authnotrequired => 0,
diff --git a/cataloguing/value_builder/marc21_field_006.pl b/cataloguing/value_builder/marc21_field_006.pl
index bba0c5fb90..a4a577071d 100755
--- a/cataloguing/value_builder/marc21_field_006.pl
+++ b/cataloguing/value_builder/marc21_field_006.pl
@@ -74,7 +74,7 @@ sub plugin {
     my $dbh = C4::Context->dbh;
 
     my ($template, $loggedinuser, $cookie) = get_template_and_user(
-        {   template_name   => "cataloguing/value_builder/marc21_field_006.tmpl",
+        {   template_name   => "cataloguing/value_builder/marc21_field_006.tt",
             query           => $input,
             type            => "intranet",
             authnotrequired => 0,
diff --git a/cataloguing/value_builder/marc21_field_007.pl b/cataloguing/value_builder/marc21_field_007.pl
index 74e559dd9f..3f5f663275 100755
--- a/cataloguing/value_builder/marc21_field_007.pl
+++ b/cataloguing/value_builder/marc21_field_007.pl
@@ -73,7 +73,7 @@ my ($input) = @_;
 	my $dbh = C4::Context->dbh;
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "cataloguing/value_builder/marc21_field_007.tmpl",
+    = get_template_and_user({template_name => "cataloguing/value_builder/marc21_field_007.tt",
 			     query => $input,
 			     type => "intranet",
 			     authnotrequired => 0,
diff --git a/cataloguing/value_builder/marc21_field_008.pl b/cataloguing/value_builder/marc21_field_008.pl
index ab30454718..9a2753b30f 100755
--- a/cataloguing/value_builder/marc21_field_008.pl
+++ b/cataloguing/value_builder/marc21_field_008.pl
@@ -149,7 +149,7 @@ sub plugin {
     my $dbh = C4::Context->dbh;
 
     my ($template, $loggedinuser, $cookie) = get_template_and_user(
-        {   template_name   => "cataloguing/value_builder/marc21_field_008.tmpl",
+        {   template_name   => "cataloguing/value_builder/marc21_field_008.tt",
             query           => $input,
             type            => "intranet",
             authnotrequired => 0,
diff --git a/cataloguing/value_builder/marc21_field_008_authorities.pl b/cataloguing/value_builder/marc21_field_008_authorities.pl
index d5b5484363..f9a824a496 100755
--- a/cataloguing/value_builder/marc21_field_008_authorities.pl
+++ b/cataloguing/value_builder/marc21_field_008_authorities.pl
@@ -93,7 +93,7 @@ sub plugin {
     my $dbh = C4::Context->dbh;
 
     my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "cataloguing/value_builder/marc21_field_008_authorities.tmpl",
+    = get_template_and_user({template_name => "cataloguing/value_builder/marc21_field_008_authorities.tt",
                  query => $input,
                  type => "intranet",
                  authnotrequired => 0,
diff --git a/cataloguing/value_builder/marc21_leader.pl b/cataloguing/value_builder/marc21_leader.pl
index 69b79d0e7a..93a143377c 100755
--- a/cataloguing/value_builder/marc21_leader.pl
+++ b/cataloguing/value_builder/marc21_leader.pl
@@ -76,7 +76,7 @@ my ($input) = @_;
 	my $dbh = C4::Context->dbh;
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "cataloguing/value_builder/marc21_leader.tmpl",
+    = get_template_and_user({template_name => "cataloguing/value_builder/marc21_leader.tt",
 			     query => $input,
 			     type => "intranet",
 			     authnotrequired => 0,
diff --git a/cataloguing/value_builder/marc21_leader_authorities.pl b/cataloguing/value_builder/marc21_leader_authorities.pl
index b9cbe8b503..0b08c2539d 100755
--- a/cataloguing/value_builder/marc21_leader_authorities.pl
+++ b/cataloguing/value_builder/marc21_leader_authorities.pl
@@ -76,7 +76,7 @@ my ($input) = @_;
 	my $dbh = C4::Context->dbh;
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "cataloguing/value_builder/marc21_leader_authorities.tmpl",
+    = get_template_and_user({template_name => "cataloguing/value_builder/marc21_leader_authorities.tt",
 			     query => $input,
 			     type => "intranet",
 			     authnotrequired => 0,
diff --git a/cataloguing/value_builder/marc21_leader_book.pl b/cataloguing/value_builder/marc21_leader_book.pl
index 005ea9731b..134c473269 100755
--- a/cataloguing/value_builder/marc21_leader_book.pl
+++ b/cataloguing/value_builder/marc21_leader_book.pl
@@ -73,7 +73,7 @@ my ($input) = @_;
 	my $dbh = C4::Context->dbh;
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "cataloguing/value_builder/marc21_leader.tmpl",
+    = get_template_and_user({template_name => "cataloguing/value_builder/marc21_leader.tt",
 			     query => $input,
 			     type => "intranet",
 			     authnotrequired => 0,
diff --git a/cataloguing/value_builder/marc21_leader_computerfile.pl b/cataloguing/value_builder/marc21_leader_computerfile.pl
index 800b4458b3..813556aba1 100755
--- a/cataloguing/value_builder/marc21_leader_computerfile.pl
+++ b/cataloguing/value_builder/marc21_leader_computerfile.pl
@@ -73,7 +73,7 @@ my ($input) = @_;
 	my $dbh = C4::Context->dbh;
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "cataloguing/value_builder/marc21_leader_computerfile.tmpl",
+    = get_template_and_user({template_name => "cataloguing/value_builder/marc21_leader_computerfile.tt",
 			     query => $input,
 			     type => "intranet",
 			     authnotrequired => 0,
diff --git a/cataloguing/value_builder/marc21_leader_video.pl b/cataloguing/value_builder/marc21_leader_video.pl
index 3e72ad9d30..fb21e9d00d 100755
--- a/cataloguing/value_builder/marc21_leader_video.pl
+++ b/cataloguing/value_builder/marc21_leader_video.pl
@@ -73,7 +73,7 @@ my ($input) = @_;
 	my $dbh = C4::Context->dbh;
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "cataloguing/value_builder/marc21_leader.tmpl",
+    = get_template_and_user({template_name => "cataloguing/value_builder/marc21_leader.tt",
 			     query => $input,
 			     type => "intranet",
 			     authnotrequired => 0,
diff --git a/cataloguing/value_builder/normarc_field_007.pl b/cataloguing/value_builder/normarc_field_007.pl
index 51181e076b..3148bad816 100755
--- a/cataloguing/value_builder/normarc_field_007.pl
+++ b/cataloguing/value_builder/normarc_field_007.pl
@@ -71,7 +71,7 @@ my ($input) = @_;
 	my $dbh = C4::Context->dbh;
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "cataloguing/value_builder/normarc_field_007.tmpl",
+    = get_template_and_user({template_name => "cataloguing/value_builder/normarc_field_007.tt",
 			     query => $input,
 			     type => "intranet",
 			     authnotrequired => 0,
diff --git a/cataloguing/value_builder/normarc_field_008.pl b/cataloguing/value_builder/normarc_field_008.pl
index 98ca163273..7f45c19a15 100755
--- a/cataloguing/value_builder/normarc_field_008.pl
+++ b/cataloguing/value_builder/normarc_field_008.pl
@@ -91,7 +91,7 @@ sub plugin {
     my $dbh = C4::Context->dbh;
 
     my ($template, $loggedinuser, $cookie) = get_template_and_user(
-        {   template_name   => "cataloguing/value_builder/normarc_field_008.tmpl",
+        {   template_name   => "cataloguing/value_builder/normarc_field_008.tt",
             query           => $input,
             type            => "intranet",
             authnotrequired => 0,
diff --git a/cataloguing/value_builder/normarc_leader.pl b/cataloguing/value_builder/normarc_leader.pl
index 260d34658c..020b24f405 100755
--- a/cataloguing/value_builder/normarc_leader.pl
+++ b/cataloguing/value_builder/normarc_leader.pl
@@ -74,7 +74,7 @@ my ($input) = @_;
 	my $dbh = C4::Context->dbh;
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "cataloguing/value_builder/normarc_leader.tmpl",
+    = get_template_and_user({template_name => "cataloguing/value_builder/normarc_leader.tt",
 			     query => $input,
 			     type => "intranet",
 			     authnotrequired => 0,
diff --git a/cataloguing/value_builder/stocknumberAV.pl b/cataloguing/value_builder/stocknumberAV.pl
index 0578d44f88..677008b78b 100755
--- a/cataloguing/value_builder/stocknumberAV.pl
+++ b/cataloguing/value_builder/stocknumberAV.pl
@@ -78,7 +78,7 @@ sub plugin {
     my $code = $input->param('code');
 
     my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
-        {   template_name   => "cataloguing/value_builder/ajax.tmpl",
+        {   template_name   => "cataloguing/value_builder/ajax.tt",
             query           => $input,
             type            => "intranet",
             authnotrequired => 0,
diff --git a/cataloguing/value_builder/stocknumberam123.pl b/cataloguing/value_builder/stocknumberam123.pl
index 6357822a6a..6c0e24f42b 100755
--- a/cataloguing/value_builder/stocknumberam123.pl
+++ b/cataloguing/value_builder/stocknumberam123.pl
@@ -73,7 +73,7 @@ sub plugin {
     my $code = $input->param('code');
 
     my ($template, $loggedinuser, $cookie) = get_template_and_user({
-        template_name   => "cataloguing/value_builder/ajax.tmpl",
+        template_name   => "cataloguing/value_builder/ajax.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/cataloguing/value_builder/unimarc_field_010.pl b/cataloguing/value_builder/unimarc_field_010.pl
index b48c9ae6af..1675e53b89 100755
--- a/cataloguing/value_builder/unimarc_field_010.pl
+++ b/cataloguing/value_builder/unimarc_field_010.pl
@@ -77,7 +77,7 @@ sub plugin {
     my $isbn = $input->param('isbn');
 
     my ($template, $loggedinuser, $cookie)
-            = get_template_and_user({template_name => "cataloguing/value_builder/ajax.tmpl",
+            = get_template_and_user({template_name => "cataloguing/value_builder/ajax.tt",
                                     query => $input,
                                     type => "intranet",
                                     authnotrequired => 0,
diff --git a/cataloguing/value_builder/unimarc_field_100.pl b/cataloguing/value_builder/unimarc_field_100.pl
index 0ecf8443be..6a660d3945 100755
--- a/cataloguing/value_builder/unimarc_field_100.pl
+++ b/cataloguing/value_builder/unimarc_field_100.pl
@@ -87,7 +87,7 @@ sub plugin {
 
     my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         {
-            template_name => "cataloguing/value_builder/unimarc_field_100.tmpl",
+            template_name => "cataloguing/value_builder/unimarc_field_100.tt",
             query         => $input,
             type          => "intranet",
             authnotrequired => 0,
diff --git a/cataloguing/value_builder/unimarc_field_100_authorities.pl b/cataloguing/value_builder/unimarc_field_100_authorities.pl
index 45a8df6e4d..d929e885a9 100644
--- a/cataloguing/value_builder/unimarc_field_100_authorities.pl
+++ b/cataloguing/value_builder/unimarc_field_100_authorities.pl
@@ -85,7 +85,7 @@ sub plugin {
 
     my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         {
-            template_name => "cataloguing/value_builder/unimarc_field_100_authorities.tmpl",
+            template_name => "cataloguing/value_builder/unimarc_field_100_authorities.tt",
             query         => $input,
             type          => "intranet",
             authnotrequired => 0,
diff --git a/cataloguing/value_builder/unimarc_field_105.pl b/cataloguing/value_builder/unimarc_field_105.pl
index c84e826bdc..ec6d967db4 100755
--- a/cataloguing/value_builder/unimarc_field_105.pl
+++ b/cataloguing/value_builder/unimarc_field_105.pl
@@ -78,7 +78,7 @@ sub plugin {
 
     my $dbh = C4::Context->dbh;
     my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_105.tmpl",
+    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_105.tt",
 			     query => $input,
 			     type => "intranet",
 			     authnotrequired => 0,
diff --git a/cataloguing/value_builder/unimarc_field_106.pl b/cataloguing/value_builder/unimarc_field_106.pl
index 0b51a18878..21bd2f4ba6 100755
--- a/cataloguing/value_builder/unimarc_field_106.pl
+++ b/cataloguing/value_builder/unimarc_field_106.pl
@@ -70,7 +70,7 @@ my ($input) = @_;
 
 	my $dbh = C4::Context->dbh;
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_106.tmpl",
+    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_106.tt",
 			     query => $input,
 			     type => "intranet",
 			     authnotrequired => 0,
diff --git a/cataloguing/value_builder/unimarc_field_110.pl b/cataloguing/value_builder/unimarc_field_110.pl
index 2c301ae7a7..a2a866bc6b 100755
--- a/cataloguing/value_builder/unimarc_field_110.pl
+++ b/cataloguing/value_builder/unimarc_field_110.pl
@@ -77,7 +77,7 @@ my ($input) = @_;
 
 	my $dbh = C4::Context->dbh;
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_110.tmpl",
+    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_110.tt",
 			     query => $input,
 			     type => "intranet",
 			     authnotrequired => 0,
diff --git a/cataloguing/value_builder/unimarc_field_115a.pl b/cataloguing/value_builder/unimarc_field_115a.pl
index 2cd6806ea8..dda2e917e2 100755
--- a/cataloguing/value_builder/unimarc_field_115a.pl
+++ b/cataloguing/value_builder/unimarc_field_115a.pl
@@ -85,7 +85,7 @@ sub plugin {
     my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         {
             template_name =>
-              "cataloguing/value_builder/unimarc_field_115a.tmpl",
+              "cataloguing/value_builder/unimarc_field_115a.tt",
             query           => $input,
             type            => "intranet",
             authnotrequired => 0,
diff --git a/cataloguing/value_builder/unimarc_field_115b.pl b/cataloguing/value_builder/unimarc_field_115b.pl
index 919b1fa7d5..32cdfb18b1 100755
--- a/cataloguing/value_builder/unimarc_field_115b.pl
+++ b/cataloguing/value_builder/unimarc_field_115b.pl
@@ -79,7 +79,7 @@ sub plugin {
     my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         {
             template_name =>
-              "cataloguing/value_builder/unimarc_field_115b.tmpl",
+              "cataloguing/value_builder/unimarc_field_115b.tt",
             query           => $input,
             type            => "intranet",
             authnotrequired => 0,
diff --git a/cataloguing/value_builder/unimarc_field_116.pl b/cataloguing/value_builder/unimarc_field_116.pl
index 67f6875de8..389ee2108a 100755
--- a/cataloguing/value_builder/unimarc_field_116.pl
+++ b/cataloguing/value_builder/unimarc_field_116.pl
@@ -80,7 +80,7 @@ sub plugin {
     my $dbh = C4::Context->dbh;
     my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         {
-            template_name => "cataloguing/value_builder/unimarc_field_116.tmpl",
+            template_name => "cataloguing/value_builder/unimarc_field_116.tt",
             query         => $input,
             type          => "intranet",
             authnotrequired => 0,
diff --git a/cataloguing/value_builder/unimarc_field_117.pl b/cataloguing/value_builder/unimarc_field_117.pl
index fcbb18f71a..cc558cf724 100755
--- a/cataloguing/value_builder/unimarc_field_117.pl
+++ b/cataloguing/value_builder/unimarc_field_117.pl
@@ -79,7 +79,7 @@ my ($input) = @_;
 
 	my $dbh = C4::Context->dbh;
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_117.tmpl",
+    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_117.tt",
 			     query => $input,
 			     type => "intranet",
 			     authnotrequired => 0,
diff --git a/cataloguing/value_builder/unimarc_field_120.pl b/cataloguing/value_builder/unimarc_field_120.pl
index f140fce9b3..26d9521492 100755
--- a/cataloguing/value_builder/unimarc_field_120.pl
+++ b/cataloguing/value_builder/unimarc_field_120.pl
@@ -81,7 +81,7 @@ my ($input) = @_;
 	my $dbh = C4::Context->dbh;
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_120.tmpl",
+    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_120.tt",
 			     query => $input,
 			     type => "intranet",
 			     authnotrequired => 0,
diff --git a/cataloguing/value_builder/unimarc_field_121a.pl b/cataloguing/value_builder/unimarc_field_121a.pl
index d40f49c2e7..9918697faa 100755
--- a/cataloguing/value_builder/unimarc_field_121a.pl
+++ b/cataloguing/value_builder/unimarc_field_121a.pl
@@ -80,7 +80,7 @@ my ($input) = @_;
 	my $dbh = C4::Context->dbh;
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_121a.tmpl",
+    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_121a.tt",
 			     query => $input,
 			     type => "intranet",
 			     authnotrequired => 0,
diff --git a/cataloguing/value_builder/unimarc_field_121b.pl b/cataloguing/value_builder/unimarc_field_121b.pl
index 2d570d70ab..6da8ba72e1 100755
--- a/cataloguing/value_builder/unimarc_field_121b.pl
+++ b/cataloguing/value_builder/unimarc_field_121b.pl
@@ -72,7 +72,7 @@ my ($input) = @_;
 	my $dbh = C4::Context->dbh;
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_121b.tmpl",
+    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_121b.tt",
 			     query => $input,
 			     type => "intranet",
 			     authnotrequired => 0,
diff --git a/cataloguing/value_builder/unimarc_field_122.pl b/cataloguing/value_builder/unimarc_field_122.pl
index 045bd66f8e..0c70341424 100755
--- a/cataloguing/value_builder/unimarc_field_122.pl
+++ b/cataloguing/value_builder/unimarc_field_122.pl
@@ -72,7 +72,7 @@ my ($input) = @_;
 	my $dbh = C4::Context->dbh;
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_122.tmpl",
+    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_122.tt",
 			     query => $input,
 			     type => "intranet",
 			     authnotrequired => 0,
diff --git a/cataloguing/value_builder/unimarc_field_123a.pl b/cataloguing/value_builder/unimarc_field_123a.pl
index 0fe85dc1f2..ce8e4e5ff1 100755
--- a/cataloguing/value_builder/unimarc_field_123a.pl
+++ b/cataloguing/value_builder/unimarc_field_123a.pl
@@ -72,7 +72,7 @@ my ($input) = @_;
 	my $dbh = C4::Context->dbh;
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_123a.tmpl",
+    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_123a.tt",
 			     query => $input,
 			     type => "intranet",
 			     authnotrequired => 0,
diff --git a/cataloguing/value_builder/unimarc_field_123d.pl b/cataloguing/value_builder/unimarc_field_123d.pl
index 1df7fbcb55..f74352cdc8 100755
--- a/cataloguing/value_builder/unimarc_field_123d.pl
+++ b/cataloguing/value_builder/unimarc_field_123d.pl
@@ -72,7 +72,7 @@ my ($input) = @_;
 	my $dbh = C4::Context->dbh;
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_123g.tmpl",
+    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_123g.tt",
 			     query => $input,
 			     type => "intranet",
 			     authnotrequired => 0,
diff --git a/cataloguing/value_builder/unimarc_field_123e.pl b/cataloguing/value_builder/unimarc_field_123e.pl
index 1df7fbcb55..f74352cdc8 100755
--- a/cataloguing/value_builder/unimarc_field_123e.pl
+++ b/cataloguing/value_builder/unimarc_field_123e.pl
@@ -72,7 +72,7 @@ my ($input) = @_;
 	my $dbh = C4::Context->dbh;
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_123g.tmpl",
+    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_123g.tt",
 			     query => $input,
 			     type => "intranet",
 			     authnotrequired => 0,
diff --git a/cataloguing/value_builder/unimarc_field_123f.pl b/cataloguing/value_builder/unimarc_field_123f.pl
index 5932db5985..0d7541c3e5 100755
--- a/cataloguing/value_builder/unimarc_field_123f.pl
+++ b/cataloguing/value_builder/unimarc_field_123f.pl
@@ -73,7 +73,7 @@ my ($input) = @_;
 	my $dbh = C4::Context->dbh;
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_123g.tmpl",
+    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_123g.tt",
 			     query => $input,
 			     type => "intranet",
 			     authnotrequired => 0,
diff --git a/cataloguing/value_builder/unimarc_field_123g.pl b/cataloguing/value_builder/unimarc_field_123g.pl
index 1df7fbcb55..f74352cdc8 100755
--- a/cataloguing/value_builder/unimarc_field_123g.pl
+++ b/cataloguing/value_builder/unimarc_field_123g.pl
@@ -72,7 +72,7 @@ my ($input) = @_;
 	my $dbh = C4::Context->dbh;
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_123g.tmpl",
+    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_123g.tt",
 			     query => $input,
 			     type => "intranet",
 			     authnotrequired => 0,
diff --git a/cataloguing/value_builder/unimarc_field_123i.pl b/cataloguing/value_builder/unimarc_field_123i.pl
index 159caae85b..d0d81b3f01 100755
--- a/cataloguing/value_builder/unimarc_field_123i.pl
+++ b/cataloguing/value_builder/unimarc_field_123i.pl
@@ -69,7 +69,7 @@ my ($input) = @_;
 	my $dbh = C4::Context->dbh;
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_123i.tmpl",
+    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_123i.tt",
 			     query => $input,
 			     type => "intranet",
 			     authnotrequired => 0,
diff --git a/cataloguing/value_builder/unimarc_field_123j.pl b/cataloguing/value_builder/unimarc_field_123j.pl
index 36bfee9ef0..1c8a2c13fe 100755
--- a/cataloguing/value_builder/unimarc_field_123j.pl
+++ b/cataloguing/value_builder/unimarc_field_123j.pl
@@ -73,7 +73,7 @@ sub plugin {
 	my ($template, $loggedinuser, $cookie)
     = get_template_and_user(
     	{
-    		template_name => "cataloguing/value_builder/unimarc_field_123j.tmpl",
+            template_name => "cataloguing/value_builder/unimarc_field_123j.tt",
 			query => $input,
 			type => "intranet",
 			authnotrequired => 0,
diff --git a/cataloguing/value_builder/unimarc_field_124.pl b/cataloguing/value_builder/unimarc_field_124.pl
index 917e6a5c97..be4dd23488 100755
--- a/cataloguing/value_builder/unimarc_field_124.pl
+++ b/cataloguing/value_builder/unimarc_field_124.pl
@@ -69,7 +69,7 @@ my ($input) = @_;
 	my $dbh = C4::Context->dbh;
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_100.tmpl",
+    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_100.tt",
 			     query => $input,
 			     type => "intranet",
 			     authnotrequired => 0,
diff --git a/cataloguing/value_builder/unimarc_field_124a.pl b/cataloguing/value_builder/unimarc_field_124a.pl
index f6ae5f33ba..2ac8a53efd 100755
--- a/cataloguing/value_builder/unimarc_field_124a.pl
+++ b/cataloguing/value_builder/unimarc_field_124a.pl
@@ -69,7 +69,7 @@ my ($input) = @_;
 	my $dbh = C4::Context->dbh;
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_124a.tmpl",
+    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_124a.tt",
 			     query => $input,
 			     type => "intranet",
 			     authnotrequired => 0,
diff --git a/cataloguing/value_builder/unimarc_field_124b.pl b/cataloguing/value_builder/unimarc_field_124b.pl
index 143e2262c6..62e8a8f9dc 100755
--- a/cataloguing/value_builder/unimarc_field_124b.pl
+++ b/cataloguing/value_builder/unimarc_field_124b.pl
@@ -69,7 +69,7 @@ my ($input) = @_;
 	my $dbh = C4::Context->dbh;
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_124b.tmpl",
+    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_124b.tt",
 			     query => $input,
 			     type => "intranet",
 			     authnotrequired => 0,
diff --git a/cataloguing/value_builder/unimarc_field_124c.pl b/cataloguing/value_builder/unimarc_field_124c.pl
index a1f12a43af..486ef218f0 100755
--- a/cataloguing/value_builder/unimarc_field_124c.pl
+++ b/cataloguing/value_builder/unimarc_field_124c.pl
@@ -70,7 +70,7 @@ my ($input) = @_;
 	my $dbh = C4::Context->dbh;
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_124c.tmpl",
+    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_124c.tt",
 			     query => $input,
 			     type => "intranet",
 			     authnotrequired => 0,
diff --git a/cataloguing/value_builder/unimarc_field_124d.pl b/cataloguing/value_builder/unimarc_field_124d.pl
index b4176ba392..2a29b0e930 100755
--- a/cataloguing/value_builder/unimarc_field_124d.pl
+++ b/cataloguing/value_builder/unimarc_field_124d.pl
@@ -69,7 +69,7 @@ my ($input) = @_;
 	my $dbh = C4::Context->dbh;
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_124d.tmpl",
+    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_124d.tt",
 			     query => $input,
 			     type => "intranet",
 			     authnotrequired => 0,
diff --git a/cataloguing/value_builder/unimarc_field_124e.pl b/cataloguing/value_builder/unimarc_field_124e.pl
index 1a82491390..c1a731a011 100755
--- a/cataloguing/value_builder/unimarc_field_124e.pl
+++ b/cataloguing/value_builder/unimarc_field_124e.pl
@@ -69,7 +69,7 @@ my ($input) = @_;
 	my $dbh = C4::Context->dbh;
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_124e.tmpl",
+    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_124e.tt",
 			     query => $input,
 			     type => "intranet",
 			     authnotrequired => 0,
diff --git a/cataloguing/value_builder/unimarc_field_124f.pl b/cataloguing/value_builder/unimarc_field_124f.pl
index eb0661f31c..21965f2856 100755
--- a/cataloguing/value_builder/unimarc_field_124f.pl
+++ b/cataloguing/value_builder/unimarc_field_124f.pl
@@ -69,7 +69,7 @@ my ($input) = @_;
 	my $dbh = C4::Context->dbh;
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_124f.tmpl",
+    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_124f.tt",
 			     query => $input,
 			     type => "intranet",
 			     authnotrequired => 0,
diff --git a/cataloguing/value_builder/unimarc_field_124g.pl b/cataloguing/value_builder/unimarc_field_124g.pl
index 83c19e6c52..feade5ba05 100755
--- a/cataloguing/value_builder/unimarc_field_124g.pl
+++ b/cataloguing/value_builder/unimarc_field_124g.pl
@@ -69,7 +69,7 @@ my ($input) = @_;
 	my $dbh = C4::Context->dbh;
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_124g.tmpl",
+    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_124g.tt",
 			     query => $input,
 			     type => "intranet",
 			     authnotrequired => 0,
diff --git a/cataloguing/value_builder/unimarc_field_125.pl b/cataloguing/value_builder/unimarc_field_125.pl
index 917e6a5c97..be4dd23488 100755
--- a/cataloguing/value_builder/unimarc_field_125.pl
+++ b/cataloguing/value_builder/unimarc_field_125.pl
@@ -69,7 +69,7 @@ my ($input) = @_;
 	my $dbh = C4::Context->dbh;
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_100.tmpl",
+    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_100.tt",
 			     query => $input,
 			     type => "intranet",
 			     authnotrequired => 0,
diff --git a/cataloguing/value_builder/unimarc_field_125a.pl b/cataloguing/value_builder/unimarc_field_125a.pl
index 2fcbc94972..045a1e21e0 100755
--- a/cataloguing/value_builder/unimarc_field_125a.pl
+++ b/cataloguing/value_builder/unimarc_field_125a.pl
@@ -69,7 +69,7 @@ my ($input) = @_;
 	my $dbh = C4::Context->dbh;
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_125a.tmpl",
+    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_125a.tt",
 			     query => $input,
 			     type => "intranet",
 			     authnotrequired => 0,
diff --git a/cataloguing/value_builder/unimarc_field_125b.pl b/cataloguing/value_builder/unimarc_field_125b.pl
index 8c661611a4..ea3efcb359 100755
--- a/cataloguing/value_builder/unimarc_field_125b.pl
+++ b/cataloguing/value_builder/unimarc_field_125b.pl
@@ -77,7 +77,7 @@ my ($input) = @_;
 	my $dbh = C4::Context->dbh;
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_125b.tmpl",
+    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_125b.tt",
 			     query => $input,
 			     type => "intranet",
 			     authnotrequired => 0,
diff --git a/cataloguing/value_builder/unimarc_field_126.pl b/cataloguing/value_builder/unimarc_field_126.pl
index 917e6a5c97..be4dd23488 100755
--- a/cataloguing/value_builder/unimarc_field_126.pl
+++ b/cataloguing/value_builder/unimarc_field_126.pl
@@ -69,7 +69,7 @@ my ($input) = @_;
 	my $dbh = C4::Context->dbh;
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_100.tmpl",
+    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_100.tt",
 			     query => $input,
 			     type => "intranet",
 			     authnotrequired => 0,
diff --git a/cataloguing/value_builder/unimarc_field_126a.pl b/cataloguing/value_builder/unimarc_field_126a.pl
index e3d47b55f2..17da533180 100755
--- a/cataloguing/value_builder/unimarc_field_126a.pl
+++ b/cataloguing/value_builder/unimarc_field_126a.pl
@@ -77,7 +77,7 @@ my ($input) = @_;
 	my $dbh = C4::Context->dbh;
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_126a.tmpl",
+    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_126a.tt",
 			     query => $input,
 			     type => "intranet",
 			     authnotrequired => 0,
diff --git a/cataloguing/value_builder/unimarc_field_126b.pl b/cataloguing/value_builder/unimarc_field_126b.pl
index 24507d10ff..79a8926bec 100755
--- a/cataloguing/value_builder/unimarc_field_126b.pl
+++ b/cataloguing/value_builder/unimarc_field_126b.pl
@@ -69,7 +69,7 @@ my ($input) = @_;
 	my $dbh = C4::Context->dbh;
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_126b.tmpl",
+    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_126b.tt",
 			     query => $input,
 			     type => "intranet",
 			     authnotrequired => 0,
diff --git a/cataloguing/value_builder/unimarc_field_127.pl b/cataloguing/value_builder/unimarc_field_127.pl
index 46521b9898..4dfeb745f4 100755
--- a/cataloguing/value_builder/unimarc_field_127.pl
+++ b/cataloguing/value_builder/unimarc_field_127.pl
@@ -69,7 +69,7 @@ my ($input) = @_;
 	my $dbh = C4::Context->dbh;
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_127.tmpl",
+    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_127.tt",
 			     query => $input,
 			     type => "intranet",
 			     authnotrequired => 0,
diff --git a/cataloguing/value_builder/unimarc_field_128a.pl b/cataloguing/value_builder/unimarc_field_128a.pl
index 025ef62991..4628781eac 100755
--- a/cataloguing/value_builder/unimarc_field_128a.pl
+++ b/cataloguing/value_builder/unimarc_field_128a.pl
@@ -69,7 +69,7 @@ my ($input) = @_;
 	my $dbh = C4::Context->dbh;
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_128a.tmpl",
+    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_128a.tt",
 			     query => $input,
 			     type => "intranet",
 			     authnotrequired => 0,
diff --git a/cataloguing/value_builder/unimarc_field_128b.pl b/cataloguing/value_builder/unimarc_field_128b.pl
index 1f196ac31b..94eafa03f3 100755
--- a/cataloguing/value_builder/unimarc_field_128b.pl
+++ b/cataloguing/value_builder/unimarc_field_128b.pl
@@ -76,7 +76,7 @@ my ($input) = @_;
 	my $dbh = C4::Context->dbh;
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_128b.tmpl",
+    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_128b.tt",
 			     query => $input,
 			     type => "intranet",
 			     authnotrequired => 0,
diff --git a/cataloguing/value_builder/unimarc_field_128c.pl b/cataloguing/value_builder/unimarc_field_128c.pl
index 2f8093c0c3..a4b129d055 100755
--- a/cataloguing/value_builder/unimarc_field_128c.pl
+++ b/cataloguing/value_builder/unimarc_field_128c.pl
@@ -70,7 +70,7 @@ my ($input) = @_;
 	my $dbh = C4::Context->dbh;
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_128c.tmpl",
+    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_128c.tt",
 			     query => $input,
 			     type => "intranet",
 			     authnotrequired => 0,
diff --git a/cataloguing/value_builder/unimarc_field_130.pl b/cataloguing/value_builder/unimarc_field_130.pl
index d0eb5c924c..6441ecdbb5 100755
--- a/cataloguing/value_builder/unimarc_field_130.pl
+++ b/cataloguing/value_builder/unimarc_field_130.pl
@@ -78,7 +78,7 @@ my ($input) = @_;
 	my $dbh = C4::Context->dbh;
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_130.tmpl",
+    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_130.tt",
 			     query => $input,
 			     type => "intranet",
 			     authnotrequired => 0,
diff --git a/cataloguing/value_builder/unimarc_field_135a.pl b/cataloguing/value_builder/unimarc_field_135a.pl
index 93454aadd7..ae17fd4a18 100755
--- a/cataloguing/value_builder/unimarc_field_135a.pl
+++ b/cataloguing/value_builder/unimarc_field_135a.pl
@@ -77,7 +77,7 @@ my ($input) = @_;
 	my $dbh = C4::Context->dbh;
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_135a.tmpl",
+    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_135a.tt",
 			     query => $input,
 			     type => "intranet",
 			     authnotrequired => 0,
diff --git a/cataloguing/value_builder/unimarc_field_140.pl b/cataloguing/value_builder/unimarc_field_140.pl
index 201e31afb2..1eecfab59b 100755
--- a/cataloguing/value_builder/unimarc_field_140.pl
+++ b/cataloguing/value_builder/unimarc_field_140.pl
@@ -78,7 +78,7 @@ my ($input) = @_;
 	my $dbh = C4::Context->dbh;
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_140.tmpl",
+    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_140.tt",
 			     query => $input,
 			     type => "intranet",
 			     authnotrequired => 0,
diff --git a/cataloguing/value_builder/unimarc_field_141.pl b/cataloguing/value_builder/unimarc_field_141.pl
index b83a479cdb..e0b7a38690 100755
--- a/cataloguing/value_builder/unimarc_field_141.pl
+++ b/cataloguing/value_builder/unimarc_field_141.pl
@@ -69,7 +69,7 @@ my ($input) = @_;
 	my $dbh = C4::Context->dbh;
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_141.tmpl",
+    = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_141.tt",
 			     query => $input,
 			     type => "intranet",
 			     authnotrequired => 0,
diff --git a/cataloguing/value_builder/unimarc_field_210c.pl b/cataloguing/value_builder/unimarc_field_210c.pl
index e3717ed3fb..474c41d812 100755
--- a/cataloguing/value_builder/unimarc_field_210c.pl
+++ b/cataloguing/value_builder/unimarc_field_210c.pl
@@ -149,7 +149,7 @@ my ($input) = @_;
  	}
 
         ($template, $loggedinuser, $cookie)
-            = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_210c.tmpl",
+            = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_210c.tt",
                     query => $query,
                     type => 'intranet',
                     authnotrequired => 0,
@@ -211,7 +211,7 @@ my ($input) = @_;
                                 );
     } else {
         ($template, $loggedinuser, $cookie)
-            = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_210c.tmpl",
+            = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_210c.tt",
                     query => $query,
                     type => 'intranet',
                     authnotrequired => 0,
diff --git a/cataloguing/value_builder/unimarc_field_210c_bis.pl b/cataloguing/value_builder/unimarc_field_210c_bis.pl
index d4014a8645..ab8d41adcf 100755
--- a/cataloguing/value_builder/unimarc_field_210c_bis.pl
+++ b/cataloguing/value_builder/unimarc_field_210c_bis.pl
@@ -92,7 +92,7 @@ sub plugin {
     warn Data::Dumper::Dumper $index;
 
     my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
-        {   template_name   => "cataloguing/value_builder/unimarc_field_210c_bis.tmpl",
+        {   template_name   => "cataloguing/value_builder/unimarc_field_210c_bis.tt",
             query           => $input,
             type            => "intranet",
             authnotrequired => 0,
diff --git a/cataloguing/value_builder/unimarc_field_225a.pl b/cataloguing/value_builder/unimarc_field_225a.pl
index 311bb9ff7b..454f213e31 100755
--- a/cataloguing/value_builder/unimarc_field_225a.pl
+++ b/cataloguing/value_builder/unimarc_field_225a.pl
@@ -113,7 +113,7 @@ sub plugin {
     my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         {
             template_name =>
-              "cataloguing/value_builder/unimarc_field_225a.tmpl",
+              "cataloguing/value_builder/unimarc_field_225a.tt",
             query           => $input,
             type            => "intranet",
             authnotrequired => 0,
diff --git a/cataloguing/value_builder/unimarc_field_4XX.pl b/cataloguing/value_builder/unimarc_field_4XX.pl
index 7d2fcbc81b..d08102af0d 100755
--- a/cataloguing/value_builder/unimarc_field_4XX.pl
+++ b/cataloguing/value_builder/unimarc_field_4XX.pl
@@ -92,7 +92,7 @@ sub plugin {
         ( $template, $loggedinuser, $cookie ) = get_template_and_user(
             {
                 template_name =>
-                  "cataloguing/value_builder/unimarc_field_4XX.tmpl",
+                  "cataloguing/value_builder/unimarc_field_4XX.tt",
                 query           => $query,
                 type            => "intranet",
                 authnotrequired => 0,
@@ -367,7 +367,7 @@ sub plugin {
         ( $template, $loggedinuser, $cookie ) = get_template_and_user(
             {
                 template_name =>
-                  "cataloguing/value_builder/unimarc_field_4XX.tmpl",
+                  "cataloguing/value_builder/unimarc_field_4XX.tt",
                 query           => $query,
                 type            => 'intranet',
                 authnotrequired => 0,
@@ -488,7 +488,7 @@ sub plugin {
         ( $template, $loggedinuser, $cookie ) = get_template_and_user(
             {
                 template_name =>
-                  "cataloguing/value_builder/unimarc_field_4XX.tmpl",
+                  "cataloguing/value_builder/unimarc_field_4XX.tt",
                 query           => $query,
                 type            => "intranet",
                 authnotrequired => 0,
diff --git a/cataloguing/value_builder/unimarc_field_686a.pl b/cataloguing/value_builder/unimarc_field_686a.pl
index d4b9653e08..2b44823fde 100755
--- a/cataloguing/value_builder/unimarc_field_686a.pl
+++ b/cataloguing/value_builder/unimarc_field_686a.pl
@@ -75,14 +75,16 @@ my ($input) = @_;
 
 	my $dbh = C4::Context->dbh;
 
-	my ($template, $loggedinuser, $cookie)
-	= get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_686a.tmpl",
-					query => $input,
-					type => "intranet",
-					authnotrequired => 0,
-					flagsrequired => {editcatalogue => '*'},
-					debug => 1,
-					});
+    my ($template, $loggedinuser, $cookie) = get_template_and_user(
+        {
+            template_name   => "cataloguing/value_builder/unimarc_field_686a.tt",
+            query           => $input,
+            type            => "intranet",
+            authnotrequired => 0,
+            flagsrequired   => { editcatalogue => '*' },
+            debug           => 1,
+        }
+    );
 	$template->param(index => $index,
 							index2 => $index2,
 							authtypecode => 'CLASSCD',
diff --git a/cataloguing/value_builder/unimarc_field_700-4.pl b/cataloguing/value_builder/unimarc_field_700-4.pl
index 823daf3275..ac99e4bbf3 100755
--- a/cataloguing/value_builder/unimarc_field_700-4.pl
+++ b/cataloguing/value_builder/unimarc_field_700-4.pl
@@ -83,14 +83,16 @@ my ($input) = @_;
 
 	my $dbh = C4::Context->dbh;
 
-	my ($template, $loggedinuser, $cookie)
-	= get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_700-4.tmpl",
-					query => $input,
-					type => "intranet",
-					authnotrequired => 0,
-					flagsrequired => {editcatalogue => '*'},
-					debug => 1,
-					});
+    my ($template, $loggedinuser, $cookie) = get_template_and_user(
+        {
+            template_name   => "cataloguing/value_builder/unimarc_field_700-4.tt",
+            query           => $input,
+            type            => "intranet",
+            authnotrequired => 0,
+            flagsrequired   => { editcatalogue => '*' },
+            debug           => 1,
+        }
+    );
 	$template->param(index => $index,
 							index2 => $index2,
 							"f1_$result" => "f1_".$result,
diff --git a/cataloguing/value_builder/unimarc_leader.pl b/cataloguing/value_builder/unimarc_leader.pl
index af4d808633..baf42f36b2 100755
--- a/cataloguing/value_builder/unimarc_leader.pl
+++ b/cataloguing/value_builder/unimarc_leader.pl
@@ -81,7 +81,7 @@ sub plugin {
 
     my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         {
-            template_name   => "cataloguing/value_builder/unimarc_leader.tmpl",
+            template_name   => "cataloguing/value_builder/unimarc_leader.tt",
             query           => $input,
             type            => "intranet",
             authnotrequired => 0,
diff --git a/cataloguing/z3950_auth_search.pl b/cataloguing/z3950_auth_search.pl
index f52630a4c4..8951b5cac0 100755
--- a/cataloguing/z3950_auth_search.pl
+++ b/cataloguing/z3950_auth_search.pl
@@ -44,7 +44,7 @@ my $page            = $input->param('current_page') || 1;
 $page = $input->param('goto_page') if $input->param('changepage_goto');
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user({
-        template_name   => "cataloguing/z3950_auth_search.tmpl",
+        template_name   => "cataloguing/z3950_auth_search.tt",
         query           => $input,
         type            => "intranet",
         flagsrequired   => { catalogue => 1 },
diff --git a/cataloguing/z3950_search.pl b/cataloguing/z3950_search.pl
index d3a3c53e19..9e05c6ea09 100755
--- a/cataloguing/z3950_search.pl
+++ b/cataloguing/z3950_search.pl
@@ -50,7 +50,7 @@ my $page            = $input->param('current_page') || 1;
 $page = $input->param('goto_page') if $input->param('changepage_goto');
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user({
-        template_name   => "cataloguing/z3950_search.tmpl",
+        template_name   => "cataloguing/z3950_search.tt",
         query           => $input,
         type            => "intranet",
         flagsrequired   => { catalogue => 1 },
diff --git a/circ/add_message.pl b/circ/add_message.pl
index 9c39dc98a6..053d197810 100755
--- a/circ/add_message.pl
+++ b/circ/add_message.pl
@@ -35,7 +35,7 @@ use C4::Branch;    # GetBranches
 my $input = new CGI;
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
-    {   template_name   => "circ/circulation.tmpl",
+    {   template_name   => "circ/circulation.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/circ/bookcount.pl b/circ/bookcount.pl
index 75bf319e1c..dcc1611723 100755
--- a/circ/bookcount.pl
+++ b/circ/bookcount.pl
@@ -60,7 +60,7 @@ if ( not $lastmove ) {
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "circ/bookcount.tmpl",
+        template_name   => "circ/bookcount.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/circ/branchoverdues.pl b/circ/branchoverdues.pl
index 31e2b44a43..c5a8743529 100755
--- a/circ/branchoverdues.pl
+++ b/circ/branchoverdues.pl
@@ -63,7 +63,7 @@ my $input       = new CGI;
 my $dbh = C4::Context->dbh;
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user({
-        template_name   => "circ/branchoverdues.tmpl",
+        template_name   => "circ/branchoverdues.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/circ/branchtransfers.pl b/circ/branchtransfers.pl
index 3be7bb4387..190ca71802 100755
--- a/circ/branchtransfers.pl
+++ b/circ/branchtransfers.pl
@@ -53,7 +53,7 @@ if (!C4::Context->userenv){
 # Make the page .....
 my ($template, $user, $cookie) = get_template_and_user(
     {
-        template_name   => "circ/branchtransfers.tmpl",
+        template_name   => "circ/branchtransfers.tt",
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/circ/circulation-home.pl b/circ/circulation-home.pl
index d10829f6d3..161158c5d8 100755
--- a/circ/circulation-home.pl
+++ b/circ/circulation-home.pl
@@ -25,13 +25,15 @@ use C4::Context;
 use C4::Koha;
 
 my $query = new CGI;
-my ($template, $loggedinuser, $cookie, $flags)
-= get_template_and_user({template_name => "circ/circulation-home.tmpl",
-				query => $query,
-				type => "intranet",
-				authnotrequired => 0,
-				flagsrequired => {circulate => "circulate_remaining_permissions"},
-				});
+my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user(
+    {
+        template_name   => "circ/circulation-home.tt",
+        query           => $query,
+        type            => "intranet",
+        authnotrequired => 0,
+        flagsrequired   => { circulate => "circulate_remaining_permissions" },
+    }
+);
 
 # Checking if there is a Fast Cataloging Framework
 my $fa = getframeworkinfo('FA');
diff --git a/circ/circulation.pl b/circ/circulation.pl
index 81737ee8e1..dce75e4978 100755
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -87,7 +87,7 @@ if (!C4::Context->userenv && !$branch){
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user (
     {
-        template_name   => 'circ/circulation.tmpl',
+        template_name   => 'circ/circulation.tt',
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/circ/del_message.pl b/circ/del_message.pl
index da13bdb70e..72293733dc 100755
--- a/circ/del_message.pl
+++ b/circ/del_message.pl
@@ -35,7 +35,7 @@ use C4::Branch;    # GetBranches
 my $input = new CGI;
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
-    {   template_name   => "circ/circulation.tmpl",
+    {   template_name   => "circ/circulation.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/circ/hold-transfer-slip.pl b/circ/hold-transfer-slip.pl
index 28de5e950f..525e25a400 100755
--- a/circ/hold-transfer-slip.pl
+++ b/circ/hold-transfer-slip.pl
@@ -42,7 +42,7 @@ my $transfer = $input->param('transfer');
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {   
-        template_name   => "circ/printslip.tmpl",
+        template_name   => "circ/printslip.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/circ/overdue.pl b/circ/overdue.pl
index 80a9d7f9b2..c2a0db1133 100755
--- a/circ/overdue.pl
+++ b/circ/overdue.pl
@@ -58,7 +58,7 @@ my $noreport        = C4::Context->preference('FilterBeforeOverdueReport') && !
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "circ/overdue.tmpl",
+        template_name   => "circ/overdue.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/circ/pendingreserves.pl b/circ/pendingreserves.pl
index 7370819326..2deb67b68b 100755
--- a/circ/pendingreserves.pl
+++ b/circ/pendingreserves.pl
@@ -46,7 +46,7 @@ my $theme = $input->param('theme');    # only used if allowthemeoverride is set
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "circ/pendingreserves.tmpl",
+        template_name   => "circ/pendingreserves.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/circ/renew.pl b/circ/renew.pl
index 26c7bf0c5b..38a76111b0 100755
--- a/circ/renew.pl
+++ b/circ/renew.pl
@@ -31,7 +31,7 @@ my $cgi = new CGI;
 
 my ( $template, $librarian, $cookie ) = get_template_and_user(
     {
-        template_name   => "circ/renew.tmpl",
+        template_name   => "circ/renew.tt",
         query           => $cgi,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/circ/reserveratios.pl b/circ/reserveratios.pl
index 216fb0b638..73c68f00ea 100755
--- a/circ/reserveratios.pl
+++ b/circ/reserveratios.pl
@@ -39,7 +39,7 @@ my $ratio     = $input->param('ratio');
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "circ/reserveratios.tmpl",
+        template_name   => "circ/reserveratios.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/circ/returns.pl b/circ/returns.pl
index 428edb1512..d99f58c0e1 100755
--- a/circ/returns.pl
+++ b/circ/returns.pl
@@ -52,7 +52,7 @@ my $query = new CGI;
 #getting the template
 my ( $template, $librarian, $cookie ) = get_template_and_user(
     {
-        template_name   => "circ/returns.tmpl",
+        template_name   => "circ/returns.tt",
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/circ/selectbranchprinter.pl b/circ/selectbranchprinter.pl
index b5adcfc9ce..4e5a8e468c 100755
--- a/circ/selectbranchprinter.pl
+++ b/circ/selectbranchprinter.pl
@@ -33,7 +33,7 @@ use C4::Branch; # GetBranches GetBranchesLoop
 my $query = CGI->new();
 
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user({
-    template_name   => "circ/selectbranchprinter.tmpl",
+    template_name   => "circ/selectbranchprinter.tt",
     query           => $query,
     type            => "intranet",
     debug           => 1,
diff --git a/circ/stats.pl b/circ/stats.pl
index 558a985c96..3fc8283aba 100755
--- a/circ/stats.pl
+++ b/circ/stats.pl
@@ -38,7 +38,7 @@ my $time  = $input->param('time') || '';
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "circ/stats.tmpl",
+        template_name   => "circ/stats.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/circ/transfer-slip.pl b/circ/transfer-slip.pl
index d9f22d302e..0abb417080 100755
--- a/circ/transfer-slip.pl
+++ b/circ/transfer-slip.pl
@@ -42,7 +42,7 @@ my $branchcode = $input->param('branchcode');
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "circ/printslip.tmpl",
+        template_name   => "circ/printslip.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/circ/transferstoreceive.pl b/circ/transferstoreceive.pl
index 365f20075d..522d922841 100755
--- a/circ/transferstoreceive.pl
+++ b/circ/transferstoreceive.pl
@@ -43,7 +43,7 @@ my $itemnumber = $input->param('itemnumber');
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "circ/transferstoreceive.tmpl",
+        template_name   => "circ/transferstoreceive.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/circ/view_holdsqueue.pl b/circ/view_holdsqueue.pl
index 41db32bce9..54fe66e27b 100755
--- a/circ/view_holdsqueue.pl
+++ b/circ/view_holdsqueue.pl
@@ -36,7 +36,7 @@ use C4::HoldsQueue qw(GetHoldsQueueItems);
 my $query = new CGI;
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "circ/view_holdsqueue.tmpl",
+        template_name   => "circ/view_holdsqueue.tt",
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/circ/waitingreserves.pl b/circ/waitingreserves.pl
index fb7a3d1c94..b7b890d385 100755
--- a/circ/waitingreserves.pl
+++ b/circ/waitingreserves.pl
@@ -52,7 +52,7 @@ my $cancel;
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "circ/waitingreserves.tmpl",
+        template_name   => "circ/waitingreserves.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/course_reserves/course-reserves.pl b/course_reserves/course-reserves.pl
index 95baf7bf8b..f7fbd8ed50 100755
--- a/course_reserves/course-reserves.pl
+++ b/course_reserves/course-reserves.pl
@@ -31,7 +31,7 @@ my $cgi = new CGI;
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "course_reserves/course-reserves.tmpl",
+        template_name   => "course_reserves/course-reserves.tt",
         query           => $cgi,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/course_reserves/mod_course.pl b/course_reserves/mod_course.pl
index 5b5d940d29..8f73203b2d 100755
--- a/course_reserves/mod_course.pl
+++ b/course_reserves/mod_course.pl
@@ -29,7 +29,7 @@ use C4::CourseReserves qw(DelCourse ModCourse ModCourseInstructors);
 
 my $cgi = new CGI;
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
-    {   template_name   => "about.tmpl",
+    {   template_name   => "about.tt",
         query           => $cgi,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/errors/400.pl b/errors/400.pl
index 122a1fe127..94da8ed39b 100755
--- a/errors/400.pl
+++ b/errors/400.pl
@@ -27,7 +27,7 @@ my $query = CGI->new;
 my $admin = C4::Context->preference('KohaAdminEmailAddress');
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => 'errors/400.tmpl',
+        template_name   => 'errors/400.tt',
         query           => $query,
         type            => 'intranet',
         authnotrequired => 1,
diff --git a/errors/401.pl b/errors/401.pl
index 02884f38a1..d9622c0f7f 100755
--- a/errors/401.pl
+++ b/errors/401.pl
@@ -26,7 +26,7 @@ my $query = CGI->new;
 my $admin = C4::Context->preference('KohaAdminEmailAddress');
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => 'errors/401.tmpl',
+        template_name   => 'errors/401.tt',
         query           => $query,
         type            => 'intranet',
         authnotrequired => 1,
diff --git a/errors/402.pl b/errors/402.pl
index bd6ddd42ef..946eeae06f 100755
--- a/errors/402.pl
+++ b/errors/402.pl
@@ -27,7 +27,7 @@ my $query = CGI->new;
 my $admin = C4::Context->preference('KohaAdminEmailAddress');
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => 'errors/402.tmpl',
+        template_name   => 'errors/402.tt',
         query           => $query,
         type            => 'intranet',
         authnotrequired => 1,
diff --git a/errors/403.pl b/errors/403.pl
index 5208c17e95..e3b7b88485 100755
--- a/errors/403.pl
+++ b/errors/403.pl
@@ -27,7 +27,7 @@ my $query = CGI->new;
 my $admin = C4::Context->preference('KohaAdminEmailAddress');
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => 'errors/403.tmpl',
+        template_name   => 'errors/403.tt',
         query           => $query,
         type            => 'intranet',
         authnotrequired => 1,
diff --git a/errors/404.pl b/errors/404.pl
index 6f4cfcc3e0..d72548945a 100755
--- a/errors/404.pl
+++ b/errors/404.pl
@@ -27,7 +27,7 @@ my $query = CGI->new;
 my $admin = C4::Context->preference('KohaAdminEmailAddress');
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => 'errors/404.tmpl',
+        template_name   => 'errors/404.tt',
         query           => $query,
         type            => 'intranet',
         authnotrequired => 1,
diff --git a/errors/500.pl b/errors/500.pl
index f2880f7d3a..bc2997d852 100755
--- a/errors/500.pl
+++ b/errors/500.pl
@@ -27,7 +27,7 @@ my $query = CGI->new;
 my $admin = C4::Context->preference('KohaAdminEmailAddress');
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => 'errors/500.tmpl',
+        template_name   => 'errors/500.tt',
         query           => $query,
         type            => 'intranet',
         authnotrequired => 1,
diff --git a/installer/install.pl b/installer/install.pl
index 389dabd3b6..dc01dc64c7 100755
--- a/installer/install.pl
+++ b/installer/install.pl
@@ -27,7 +27,7 @@ if ( defined($language) ) {
 }
 ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name => "installer/step" . ( $step ? $step : 1 ) . ".tmpl",
+        template_name => "installer/step" . ( $step ? $step : 1 ) . ".tt",
         query         => $query,
         type          => "intranet",
         authnotrequired => 0,
diff --git a/labels/label-edit-batch.pl b/labels/label-edit-batch.pl
index aea4742034..4bd58ff85e 100755
--- a/labels/label-edit-batch.pl
+++ b/labels/label-edit-batch.pl
@@ -33,7 +33,7 @@ use C4::Labels;
 my $cgi = new CGI;
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "labels/label-edit-batch.tmpl",
+        template_name   => "labels/label-edit-batch.tt",
         query           => $cgi,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/labels/label-edit-layout.pl b/labels/label-edit-layout.pl
index e814e3b795..2dd7612764 100755
--- a/labels/label-edit-layout.pl
+++ b/labels/label-edit-layout.pl
@@ -32,7 +32,7 @@ use C4::Labels;
 my $cgi = new CGI;
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "labels/label-edit-layout.tmpl",
+        template_name   => "labels/label-edit-layout.tt",
         query           => $cgi,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/labels/label-edit-profile.pl b/labels/label-edit-profile.pl
index 59c6abcfd5..c1b25aedd4 100755
--- a/labels/label-edit-profile.pl
+++ b/labels/label-edit-profile.pl
@@ -31,7 +31,7 @@ use C4::Labels;
 my $cgi = new CGI;
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "labels/label-edit-profile.tmpl",
+        template_name   => "labels/label-edit-profile.tt",
         query           => $cgi,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/labels/label-edit-template.pl b/labels/label-edit-template.pl
index f367a65eca..f527d282df 100755
--- a/labels/label-edit-template.pl
+++ b/labels/label-edit-template.pl
@@ -31,7 +31,7 @@ use C4::Labels;
 my $cgi = new CGI;
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "labels/label-edit-template.tmpl",
+        template_name   => "labels/label-edit-template.tt",
         query           => $cgi,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/labels/label-home.pl b/labels/label-home.pl
index 28acd1dc3b..44f3ed3df1 100755
--- a/labels/label-home.pl
+++ b/labels/label-home.pl
@@ -29,7 +29,7 @@ use C4::Output qw(output_html_with_http_headers);
 my $cgi = new CGI;
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "labels/label-home.tmpl",
+        template_name   => "labels/label-home.tt",
         query           => $cgi,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/labels/label-item-search.pl b/labels/label-item-search.pl
index 6d7db6f519..04db4d0ce6 100755
--- a/labels/label-item-search.pl
+++ b/labels/label-item-search.pl
@@ -158,7 +158,7 @@ if ($show_results) {
 
     ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         {
-            template_name   => "labels/result.tmpl",
+            template_name   => "labels/result.tt",
             query           => $query,
             type            => "intranet",
             authnotrequired => 0,
@@ -237,7 +237,7 @@ if ($show_results) {
 else {
     ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         {
-            template_name   => "labels/search.tmpl",
+            template_name   => "labels/search.tt",
             query           => $query,
             type            => "intranet",
             authnotrequired => 0,
diff --git a/labels/label-manage.pl b/labels/label-manage.pl
index 871780d932..b92046c4f3 100755
--- a/labels/label-manage.pl
+++ b/labels/label-manage.pl
@@ -33,7 +33,7 @@ use C4::Labels;
 my $cgi = new CGI;
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "labels/label-manage.tmpl",
+        template_name   => "labels/label-manage.tt",
         query           => $cgi,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/labels/label-print.pl b/labels/label-print.pl
index dd895fbbbc..7d53c74c2f 100755
--- a/labels/label-print.pl
+++ b/labels/label-print.pl
@@ -31,7 +31,7 @@ use C4::Labels::Batch;
 my $cgi = new CGI;
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "labels/label-print.tmpl",
+        template_name   => "labels/label-print.tt",
         query           => $cgi,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/labels/spinelabel-home.pl b/labels/spinelabel-home.pl
index bf61b9cb93..576b399a41 100755
--- a/labels/spinelabel-home.pl
+++ b/labels/spinelabel-home.pl
@@ -26,7 +26,7 @@ use C4::Context;
 
 my $query = new CGI;
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
-    {   template_name   => "labels/spinelabel-home.tmpl",
+    {   template_name   => "labels/spinelabel-home.tt",
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/labels/spinelabel-print.pl b/labels/spinelabel-print.pl
index 7076a08f18..f88a6a118e 100755
--- a/labels/spinelabel-print.pl
+++ b/labels/spinelabel-print.pl
@@ -24,7 +24,7 @@ use C4::Output;
 my $scheme = C4::Context->preference('SpineLabelFormat');
 my $query  = new CGI;
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
-    {   template_name   => "labels/spinelabel-print.tmpl",
+    {   template_name   => "labels/spinelabel-print.tt",
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/mainpage.pl b/mainpage.pl
index a0de15366a..ab3a7abbe9 100755
--- a/mainpage.pl
+++ b/mainpage.pl
@@ -34,7 +34,7 @@ my $query = new CGI;
 
 my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
     {
-        template_name   => "intranet-main.tmpl",
+        template_name   => "intranet-main.tt",
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/members/boraccount.pl b/members/boraccount.pl
index 518aa3c01d..6e1b51f4b5 100755
--- a/members/boraccount.pl
+++ b/members/boraccount.pl
@@ -37,14 +37,17 @@ use C4::Members::Attributes qw(GetBorrowerAttributes);
 my $input=new CGI;
 
 
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "members/boraccount.tmpl",
-                            query => $input,
-                            type => "intranet",
-                            authnotrequired => 0,
-                            flagsrequired => {borrowers => 1, updatecharges => 'remaining_permissions'},
-                            debug => 1,
-                            });
+my ($template, $loggedinuser, $cookie) = get_template_and_user(
+    {
+        template_name   => "members/boraccount.tt",
+        query           => $input,
+        type            => "intranet",
+        authnotrequired => 0,
+        flagsrequired   => { borrowers     => 1,
+                             updatecharges => 'remaining_permissions'},
+        debug           => 1,
+    }
+);
 
 my $borrowernumber=$input->param('borrowernumber');
 my $action = $input->param('action') || '';
diff --git a/members/deletemem.pl b/members/deletemem.pl
index a6143b12b7..32801e05dc 100755
--- a/members/deletemem.pl
+++ b/members/deletemem.pl
@@ -35,7 +35,7 @@ use C4::VirtualShelves (); #no import
 my $input = new CGI;
 
 my ($template, $borrowernumber, $cookie)
-                = get_template_and_user({template_name => "members/deletemem.tmpl",
+                = get_template_and_user({template_name => "members/deletemem.tt",
                                         query => $input,
                                         type => "intranet",
                                         authnotrequired => 0,
diff --git a/members/files.pl b/members/files.pl
index dc08751228..90f0dbc646 100755
--- a/members/files.pl
+++ b/members/files.pl
@@ -36,7 +36,7 @@ my $cgi = CGI->new;
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "members/files.tmpl",
+        template_name   => "members/files.tt",
         query           => $cgi,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/members/guarantor_search.pl b/members/guarantor_search.pl
index e71374eeb5..e5b39df7a8 100755
--- a/members/guarantor_search.pl
+++ b/members/guarantor_search.pl
@@ -33,7 +33,7 @@ my ( $template, $loggedinuser, $cookie );
 
 ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "members/guarantor_search.tmpl",
+        template_name   => "members/guarantor_search.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/members/mancredit.pl b/members/mancredit.pl
index ccb739e043..5179c3421f 100755
--- a/members/mancredit.pl
+++ b/members/mancredit.pl
@@ -60,14 +60,17 @@ if ($add){
         print $input->redirect("/cgi-bin/koha/members/boraccount.pl?borrowernumber=$borrowernumber");
     }
 } else {
-	my ($template, $loggedinuser, $cookie)
-	  = get_template_and_user({template_name => "members/mancredit.tmpl",
-					  query => $input,
-					  type => "intranet",
-					  authnotrequired => 0,
-                      flagsrequired => { borrowers => 1, updatecharges => 'remaining_permissions' },
-					  debug => 1,
-					  });
+	my ($template, $loggedinuser, $cookie) = get_template_and_user(
+        {
+            template_name   => "members/mancredit.tt",
+            query           => $input,
+            type            => "intranet",
+            authnotrequired => 0,
+            flagsrequired   => { borrowers     => 1,
+                                 updatecharges => 'remaining_permissions' },
+            debug           => 1,
+        }
+    );
 					  
     if ( $data->{'category_type'} eq 'C') {
         my  ( $catcodes, $labels ) =  GetborCatFromCatType( 'A', 'WHERE category_type = ?' );
diff --git a/members/maninvoice.pl b/members/maninvoice.pl
index cfd3878b97..cf7876e598 100755
--- a/members/maninvoice.pl
+++ b/members/maninvoice.pl
@@ -58,7 +58,7 @@ if ($add){
         my $error   = manualinvoice( $borrowernumber, $itemnum, $desc, $type, $amount, $note );
         if ($error) {
             my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
-                {   template_name   => "members/maninvoice.tmpl",
+                {   template_name   => "members/maninvoice.tt",
                     query           => $input,
                     type            => "intranet",
                     authnotrequired => 0,
@@ -78,14 +78,15 @@ if ($add){
     }
 } else {
 
-	my ($template, $loggedinuser, $cookie)
-	= get_template_and_user({template_name => "members/maninvoice.tmpl",
-					query => $input,
-					type => "intranet",
-					authnotrequired => 0,
-                                      flagsrequired => {borrowers => 1, updatecharges => 'remaining_permissions'},
-					debug => 1,
-					});
+    my ($template, $loggedinuser, $cookie) = get_template_and_user({
+        template_name   => "members/maninvoice.tt",
+        query           => $input,
+        type            => "intranet",
+        authnotrequired => 0,
+        flagsrequired   => { borrowers => 1,
+                             updatecharges => 'remaining_permissions' },
+        debug           => 1,
+    });
 					
   # get authorised values with type of MANUAL_INV
   my @invoice_types;
diff --git a/members/member-flags.pl b/members/member-flags.pl
index 7b0810800e..82c9bc202f 100755
--- a/members/member-flags.pl
+++ b/members/member-flags.pl
@@ -26,14 +26,14 @@ my $bor = GetMemberDetails( $member,'');
 if( $bor->{'category_type'} eq 'S' )  {
 	$flagsrequired->{'staffaccess'} = 1;
 }
-my ($template, $loggedinuser, $cookie)
-	= get_template_and_user({template_name => "members/member-flags.tmpl",
-				query => $input,
-				type => "intranet",
-				authnotrequired => 0,
-				flagsrequired => $flagsrequired,
-				debug => 1,
-				});
+my ($template, $loggedinuser, $cookie) = get_template_and_user({
+        template_name   => "members/member-flags.tt",
+        query           => $input,
+        type            => "intranet",
+        authnotrequired => 0,
+        flagsrequired   => $flagsrequired,
+        debug           => 1,
+});
 
 
 my %member2;
diff --git a/members/member-password.pl b/members/member-password.pl
index ac25da5ce7..937852cf9c 100755
--- a/members/member-password.pl
+++ b/members/member-password.pl
@@ -25,7 +25,7 @@ my $theme = $input->param('theme') || "default";
 			# only used if allowthemeoverride is set
 
 my ($template, $loggedinuser, $cookie, $staffflags)
-    = get_template_and_user({template_name => "members/member-password.tmpl",
+    = get_template_and_user({template_name => "members/member-password.tt",
 			     query => $input,
 			     type => "intranet",
 			     authnotrequired => 0,
diff --git a/members/memberentry.pl b/members/memberentry.pl
index dee53c5988..959a79544e 100755
--- a/members/memberentry.pl
+++ b/members/memberentry.pl
@@ -57,7 +57,7 @@ my %data;
 my $dbh = C4::Context->dbh;
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "members/memberentrygen.tmpl",
+    = get_template_and_user({template_name => "members/memberentrygen.tt",
            query => $input,
            type => "intranet",
            authnotrequired => 0,
diff --git a/members/members-home.pl b/members/members-home.pl
index 584c3879be..c758ff209d 100755
--- a/members/members-home.pl
+++ b/members/members-home.pl
@@ -34,7 +34,7 @@ my $branch = $query->param('branchcode');
 $branch = q{} unless defined $branch;
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "members/member.tmpl",
+    = get_template_and_user({template_name => "members/member.tt",
                  query => $query,
                  type => "intranet",
                  authnotrequired => 0,
diff --git a/members/members-update-do.pl b/members/members-update-do.pl
index e7b7b2872b..68fec225cb 100755
--- a/members/members-update-do.pl
+++ b/members/members-update-do.pl
@@ -32,7 +32,7 @@ my $query = new CGI;
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "about.tmpl",
+        template_name   => "about.tt",
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/members/members-update.pl b/members/members-update.pl
index 0b39552607..03cd89fd57 100755
--- a/members/members-update.pl
+++ b/members/members-update.pl
@@ -32,7 +32,7 @@ my $query = new CGI;
 
 my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
     {
-        template_name   => "members/members-update.tmpl",
+        template_name   => "members/members-update.tt",
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/members/moremember.pl b/members/moremember.pl
index 72e97b1e5a..53ccae3193 100755
--- a/members/moremember.pl
+++ b/members/moremember.pl
@@ -76,24 +76,24 @@ my $quickslip = 0;
 
 my $flagsrequired;
 if (defined $print and $print eq "page") {
-    $template_name = "members/moremember-print.tmpl";
+    $template_name = "members/moremember-print.tt";
     # circ staff who process checkouts but can't edit
     # patrons still need to be able to access print view
     $flagsrequired = { circulate => "circulate_remaining_permissions" };
 } elsif (defined $print and $print eq "slip") {
-    $template_name = "members/moremember-receipt.tmpl";
+    $template_name = "members/moremember-receipt.tt";
     # circ staff who process checkouts but can't edit
     # patrons still need to be able to print receipts
     $flagsrequired =  { circulate => "circulate_remaining_permissions" };
 } elsif (defined $print and $print eq "qslip") {
-    $template_name = "members/moremember-receipt.tmpl";
+    $template_name = "members/moremember-receipt.tt";
     $quickslip = 1;
     $flagsrequired =  { circulate => "circulate_remaining_permissions" };
 } elsif (defined $print and $print eq "brief") {
-    $template_name = "members/moremember-brief.tmpl";
+    $template_name = "members/moremember-brief.tt";
     $flagsrequired = { borrowers => 1 };
 } else {
-    $template_name = "members/moremember.tmpl";
+    $template_name = "members/moremember.tt";
     $flagsrequired = { borrowers => 1 };
 }
 
diff --git a/members/notices.pl b/members/notices.pl
index aca4514319..4b67a9bb94 100755
--- a/members/notices.pl
+++ b/members/notices.pl
@@ -38,7 +38,7 @@ my $borrowernumber = $input->param('borrowernumber');
 my $borrower = GetMember(borrowernumber => $borrowernumber);
 
 my ($template, $loggedinuser, $cookie)
-= get_template_and_user({template_name => "members/notices.tmpl",
+= get_template_and_user({template_name => "members/notices.tt",
 				query => $input,
 				type => "intranet",
 				authnotrequired => 0,
diff --git a/members/pay.pl b/members/pay.pl
index 14607b0160..ce432e63ea 100755
--- a/members/pay.pl
+++ b/members/pay.pl
@@ -46,7 +46,7 @@ our $input = CGI->new;
 
 my $updatecharges_permissions = $input->param('woall') ? 'writeoff' : 'remaining_permissions';
 our ( $template, $loggedinuser, $cookie ) = get_template_and_user(
-    {   template_name   => 'members/pay.tmpl',
+    {   template_name   => 'members/pay.tt',
         query           => $input,
         type            => 'intranet',
         authnotrequired => 0,
diff --git a/members/paycollect.pl b/members/paycollect.pl
index 2e88efcf6c..37b771345f 100755
--- a/members/paycollect.pl
+++ b/members/paycollect.pl
@@ -33,7 +33,7 @@ my $input = CGI->new();
 
 my $updatecharges_permissions = $input->param('writeoff_individual') ? 'writeoff' : 'remaining_permissions';
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
-    {   template_name   => 'members/paycollect.tmpl',
+    {   template_name   => 'members/paycollect.tt',
         query           => $input,
         type            => 'intranet',
         authnotrequired => 0,
diff --git a/members/printfeercpt.pl b/members/printfeercpt.pl
index b94fe7f29f..cf1426443d 100755
--- a/members/printfeercpt.pl
+++ b/members/printfeercpt.pl
@@ -37,7 +37,7 @@ my $input=new CGI;
 
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "members/printfeercpt.tmpl",
+    = get_template_and_user({template_name => "members/printfeercpt.tt",
                             query => $input,
                             type => "intranet",
                             authnotrequired => 0,
diff --git a/members/printinvoice.pl b/members/printinvoice.pl
index c8cf66dbb4..58eb7b20b8 100755
--- a/members/printinvoice.pl
+++ b/members/printinvoice.pl
@@ -34,7 +34,7 @@ use C4::Accounts;
 my $input = new CGI;
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
-    {   template_name   => "members/printinvoice.tmpl",
+    {   template_name   => "members/printinvoice.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/members/printslip.pl b/members/printslip.pl
index 7085d3846f..cae8e433ef 100755
--- a/members/printslip.pl
+++ b/members/printslip.pl
@@ -64,7 +64,7 @@ my $flagsrequired = { circulate => "circulate_remaining_permissions" };
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "circ/printslip.tmpl",
+        template_name   => "circ/printslip.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/members/readingrec.pl b/members/readingrec.pl
index 2cb9437591..85ac4d8c6a 100755
--- a/members/readingrec.pl
+++ b/members/readingrec.pl
@@ -42,7 +42,7 @@ my $data = undef;
 my $borrowernumber = undef;
 my $cardnumber = undef;
 
-my ($template, $loggedinuser, $cookie)= get_template_and_user({template_name => "members/readingrec.tmpl",
+my ($template, $loggedinuser, $cookie)= get_template_and_user({template_name => "members/readingrec.tt",
 				query => $input,
 				type => "intranet",
 				authnotrequired => 0,
diff --git a/members/statistics.pl b/members/statistics.pl
index 0914364f31..c46287165d 100755
--- a/members/statistics.pl
+++ b/members/statistics.pl
@@ -34,7 +34,7 @@ use C4::Output;
 my $input = new CGI;
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
-    {   template_name   => "members/statistics.tmpl",
+    {   template_name   => "members/statistics.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/members/update-child.pl b/members/update-child.pl
index 6e7b1da9b8..25e80ca4c9 100755
--- a/members/update-child.pl
+++ b/members/update-child.pl
@@ -41,7 +41,7 @@ my $input = new CGI;
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "members/update-child.tmpl",
+        template_name   => "members/update-child.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/misc/cronjobs/gather_print_notices.pl b/misc/cronjobs/gather_print_notices.pl
index 248716e339..59036591c1 100755
--- a/misc/cronjobs/gather_print_notices.pl
+++ b/misc/cronjobs/gather_print_notices.pl
@@ -93,7 +93,7 @@ if ($split) {
             or die "Could not open $output_file: $!";
 
         my $template =
-          C4::Templates::gettemplate( 'batch/print-notices.tmpl', 'intranet',
+          C4::Templates::gettemplate( 'batch/print-notices.tt', 'intranet',
             new CGI );
 
         $template->param(
@@ -120,7 +120,7 @@ else {
 
 
     my $template =
-      C4::Templates::gettemplate( 'batch/print-notices.tmpl', 'intranet',
+      C4::Templates::gettemplate( 'batch/print-notices.tt', 'intranet',
         new CGI );
 
     $template->param(
diff --git a/misc/translator/text-extract2.pl b/misc/translator/text-extract2.pl
index 79bf5ad2b3..cfcd027651 100755
--- a/misc/translator/text-extract2.pl
+++ b/misc/translator/text-extract2.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
 # Test filter partially based on Ambrose's hideous subst.pl code
-# The idea is that the .tmpl files are not valid HTML, and as a result
+# The idea is that the .tt files are not valid HTML, and as a result
 # HTML::Parse would be completely confused by these templates.
 # This is just a simple scanner (not a parser) & should give better results.
 
diff --git a/misc/translator/xgettext.pl b/misc/translator/xgettext.pl
index 5b4c15a683..976ab4769c 100755
--- a/misc/translator/xgettext.pl
+++ b/misc/translator/xgettext.pl
@@ -2,7 +2,7 @@
 
 =head1 NAME
 
-xgettext.pl - xgettext(1)-like interface for .tmpl strings extraction
+xgettext.pl - xgettext(1)-like interface for .tt strings extraction
 
 =cut
 
@@ -398,7 +398,7 @@ A gettext-like format provides the following advantages:
 
 Translation to non-English-like languages with different word
 order:  gettext's c-format strings can theoretically be
-emulated if we are able to do some analysis on the .tmpl input
+emulated if we are able to do some analysis on the .tt input
 and treat <TMPL_VAR> in a way similar to %s.
 
 =item - 
@@ -429,10 +429,10 @@ details.
 If you want to generate GNOME-style POTFILES.in files, such
 files (passed to -f) can be generated thus:
 
-	(cd ../.. && find koha-tmpl/opac-tmpl/default/en \
-		-name \*.inc -o -name \*.tmpl) > opac/POTFILES.in
-	(cd ../.. && find koha-tmpl/intranet-tmpl/default/en \
-		-name \*.inc -o -name \*.tmpl) > intranet/POTFILES.in
+    (cd ../.. && find koha-tmpl/opac-tmpl/default/en \
+        -name \*.inc -o -name \*.tt) > opac/POTFILES.in
+    (cd ../.. && find koha-tmpl/intranet-tmpl/default/en \
+        -name \*.inc -o -name \*.tt) > intranet/POTFILES.in
 
 This is, however, quite pointless, because the "create" and
 "update" actions have already been implemented in tmpl_process3.pl.
diff --git a/offline_circ/enqueue_koc.pl b/offline_circ/enqueue_koc.pl
index bfc1e35ddb..995d2dbfb4 100755
--- a/offline_circ/enqueue_koc.pl
+++ b/offline_circ/enqueue_koc.pl
@@ -45,7 +45,7 @@ my $query = CGI->new;
 my @output;
 
 my ($template, $loggedinuser, $cookie) = get_template_and_user({
-    template_name => "offline_circ/enqueue_koc.tmpl",
+    template_name => "offline_circ/enqueue_koc.tt",
     query => $query,
     type => "intranet",
     authnotrequired => 0,
diff --git a/offline_circ/list.pl b/offline_circ/list.pl
index c503948a94..73a2f78727 100755
--- a/offline_circ/list.pl
+++ b/offline_circ/list.pl
@@ -34,7 +34,7 @@ use C4::Biblio;
 my $query = CGI->new;
 
 my ($template, $loggedinuser, $cookie) = get_template_and_user({
-    template_name => "offline_circ/list.tmpl",
+    template_name => "offline_circ/list.tt",
     query => $query,
     type => "intranet",
     authnotrequired => 0,
diff --git a/offline_circ/process.pl b/offline_circ/process.pl
index 86b5fdaa3b..e54ee5bd10 100755
--- a/offline_circ/process.pl
+++ b/offline_circ/process.pl
@@ -28,7 +28,7 @@ use C4::Circulation;
 my $query = CGI->new;
 
 my ($template, $loggedinuser, $cookie) = get_template_and_user({
-    template_name => "offline_circ/list.tmpl",
+    template_name => "offline_circ/list.tt",
     query => $query,
     type => "intranet",
     authnotrequired => 0,
diff --git a/offline_circ/process_koc.pl b/offline_circ/process_koc.pl
index 75ff31950b..2ce4f9791e 100755
--- a/offline_circ/process_koc.pl
+++ b/offline_circ/process_koc.pl
@@ -45,7 +45,7 @@ my $FILE_VERSION = '1.0';
 our $query = CGI->new;
 
 my ($template, $loggedinuser, $cookie) = get_template_and_user({
-    template_name => "offline_circ/process_koc.tmpl",
+    template_name => "offline_circ/process_koc.tt",
     query => $query,
     type => "intranet",
     authnotrequired => 0,
diff --git a/opac/errors/400.pl b/opac/errors/400.pl
index 1972c46c4c..bf2426071c 100755
--- a/opac/errors/400.pl
+++ b/opac/errors/400.pl
@@ -28,7 +28,7 @@ my $query = new CGI;
 my $admin = C4::Context->preference('KohaAdminEmailAddress');
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "errors/400.tmpl",
+        template_name   => "errors/400.tt",
         query           => $query,
         type            => "opac",
         authnotrequired => 1,
diff --git a/opac/errors/401.pl b/opac/errors/401.pl
index d4f00e887e..4f42ecea81 100755
--- a/opac/errors/401.pl
+++ b/opac/errors/401.pl
@@ -28,7 +28,7 @@ my $query = new CGI;
 my $admin = C4::Context->preference('KohaAdminEmailAddress');
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "errors/401.tmpl",
+        template_name   => "errors/401.tt",
         query           => $query,
         type            => "opac",
         authnotrequired => 1,
diff --git a/opac/errors/402.pl b/opac/errors/402.pl
index bafe144f5f..2c0077fb18 100755
--- a/opac/errors/402.pl
+++ b/opac/errors/402.pl
@@ -28,7 +28,7 @@ my $query = new CGI;
 my $admin = C4::Context->preference('KohaAdminEmailAddress');
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "errors/402.tmpl",
+        template_name   => "errors/402.tt",
         query           => $query,
         type            => "opac",
         authnotrequired => 1,
diff --git a/opac/errors/403.pl b/opac/errors/403.pl
index 02c17907c4..ca834f0079 100755
--- a/opac/errors/403.pl
+++ b/opac/errors/403.pl
@@ -28,7 +28,7 @@ my $query = new CGI;
 my $admin = C4::Context->preference('KohaAdminEmailAddress');
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "errors/403.tmpl",
+        template_name   => "errors/403.tt",
         query           => $query,
         type            => "opac",
         authnotrequired => 1,
diff --git a/opac/errors/404.pl b/opac/errors/404.pl
index a617c2210a..5aa3f09967 100755
--- a/opac/errors/404.pl
+++ b/opac/errors/404.pl
@@ -28,7 +28,7 @@ my $query = new CGI;
 my $admin = C4::Context->preference('KohaAdminEmailAddress');
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "errors/404.tmpl",
+        template_name   => "errors/404.tt",
         query           => $query,
         type            => "opac",
         authnotrequired => 1,
diff --git a/opac/errors/500.pl b/opac/errors/500.pl
index 7a8ea2b8ef..af1b22834d 100755
--- a/opac/errors/500.pl
+++ b/opac/errors/500.pl
@@ -28,7 +28,7 @@ my $query = new CGI;
 my $admin = C4::Context->preference('KohaAdminEmailAddress');
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "errors/500.tmpl",
+        template_name   => "errors/500.tt",
         query           => $query,
         type            => "opac",
         authnotrequired => 1,
diff --git a/opac/ilsdi.pl b/opac/ilsdi.pl
index d68f09af84..a8cc47d5fc 100755
--- a/opac/ilsdi.pl
+++ b/opac/ilsdi.pl
@@ -117,7 +117,7 @@ my %optional = (
 # If no service is requested, display the online documentation
 unless ( $cgi->param('service') ) {
     my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
-        {   template_name   => "ilsdi.tmpl",
+        {   template_name   => "ilsdi.tt",
             query           => $cgi,
             type            => "opac",
             authnotrequired => 1,
@@ -131,7 +131,7 @@ unless ( $cgi->param('service') ) {
 # If user requested a service description, then display it
 if ( $cgi->param('service') eq "Describe" and any { $cgi->param('verb') eq $_ } @services ) {
     my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
-        {   template_name   => "ilsdi.tmpl",
+        {   template_name   => "ilsdi.tt",
             query           => $cgi,
             type            => "opac",
             authnotrequired => 1,
diff --git a/opac/maintenance.pl b/opac/maintenance.pl
index d106098edb..9c2d9b0fe5 100755
--- a/opac/maintenance.pl
+++ b/opac/maintenance.pl
@@ -28,7 +28,7 @@ my $input = new CGI;
 
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {
-        template_name   => "maintenance.tmpl",
+        template_name   => "maintenance.tt",
         type            => "opac",
         query           => $input,
         authnotrequired => 1,
diff --git a/opac/opac-ISBDdetail.pl b/opac/opac-ISBDdetail.pl
index 2579a8bc1c..c3c03c1a77 100755
--- a/opac/opac-ISBDdetail.pl
+++ b/opac/opac-ISBDdetail.pl
@@ -29,7 +29,7 @@ This script needs a biblionumber as parameter
 
 It shows the biblio
 
-The template is in <templates_dir>/catalogue/ISBDdetail.tmpl.
+The template is in <templates_dir>/catalogue/ISBDdetail.tt.
 this template must be divided into 11 "tabs".
 
 The first 10 tabs present the biblio, the 11th one presents
@@ -58,7 +58,7 @@ use C4::Members;    # GetMember
 my $query = CGI->new();
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "opac-ISBDdetail.tmpl",
+        template_name   => "opac-ISBDdetail.tt",
         query           => $query,
         type            => "opac",
         authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ),
diff --git a/opac/opac-MARCdetail.pl b/opac/opac-MARCdetail.pl
index aaa565d219..f8fab90a6d 100755
--- a/opac/opac-MARCdetail.pl
+++ b/opac/opac-MARCdetail.pl
@@ -35,7 +35,7 @@ This script needs a biblionumber as  parameter
 It shows the biblio in a (nice) MARC format depending on MARC
 parameters tables.
 
-The template is in <templates_dir>/catalogue/MARCdetail.tmpl.
+The template is in <templates_dir>/catalogue/MARCdetail.tt.
 this template must be divided into 11 "tabs".
 
 The first 10 tabs present the biblio, the 11th one presents
@@ -90,7 +90,7 @@ if ( ! $record ) {
 # open template
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "opac-MARCdetail.tmpl",
+        template_name   => "opac-MARCdetail.tt",
         query           => $query,
         type            => "opac",
         authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ),
diff --git a/opac/opac-account.pl b/opac/opac-account.pl
index c3cb9b4202..3907001bbb 100755
--- a/opac/opac-account.pl
+++ b/opac/opac-account.pl
@@ -30,7 +30,7 @@ use warnings;
 my $query = new CGI;
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {
-        template_name   => "opac-account.tmpl",
+        template_name   => "opac-account.tt",
         query           => $query,
         type            => "opac",
         authnotrequired => 0,
diff --git a/opac/opac-addbybiblionumber.pl b/opac/opac-addbybiblionumber.pl
index 004577d313..4d8cf6a086 100755
--- a/opac/opac-addbybiblionumber.pl
+++ b/opac/opac-addbybiblionumber.pl
@@ -44,7 +44,7 @@ our @biblios;
 
 our ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "opac-addbybiblionumber.tmpl",
+        template_name   => "opac-addbybiblionumber.tt",
         query           => $query,
         type            => "opac",
         authnotrequired => 0,
diff --git a/opac/opac-alert-subscribe.pl b/opac/opac-alert-subscribe.pl
index caeb123eeb..f177878b5d 100755
--- a/opac/opac-alert-subscribe.pl
+++ b/opac/opac-alert-subscribe.pl
@@ -43,7 +43,7 @@ my $biblionumber = $query->param('biblionumber');
 
 ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "opac-alert-subscribe.tmpl",
+        template_name   => "opac-alert-subscribe.tt",
         query           => $query,
         type            => "opac",
         authnotrequired => 0, # user must logged in to request
diff --git a/opac/opac-authorities-home.pl b/opac/opac-authorities-home.pl
index 5a674ce697..1810c1c58b 100755
--- a/opac/opac-authorities-home.pl
+++ b/opac/opac-authorities-home.pl
@@ -76,7 +76,7 @@ if ( $op eq "do_search" ) {
         $resultsperpage, $authtypecode, $orderby );
     ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         {
-            template_name   => "opac-authoritiessearchresultlist.tmpl",
+            template_name   => "opac-authoritiessearchresultlist.tt",
             query           => $query,
             type            => 'opac',
             authnotrequired => 1,
@@ -188,7 +188,7 @@ if ( $op eq "do_search" ) {
 else {
     ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         {
-            template_name   => "opac-authorities-home.tmpl",
+            template_name   => "opac-authorities-home.tt",
             query           => $query,
             type            => 'opac',
             authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ),
diff --git a/opac/opac-basket.pl b/opac/opac-basket.pl
index 7b3a90afa4..690fc3c53d 100755
--- a/opac/opac-basket.pl
+++ b/opac/opac-basket.pl
@@ -31,7 +31,7 @@ my $query = new CGI;
 
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user (
     {
-        template_name   => "opac-basket.tmpl",
+        template_name   => "opac-basket.tt",
         query           => $query,
         type            => "opac",
         authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ),
diff --git a/opac/opac-browser.pl b/opac/opac-browser.pl
index 0e9a632633..0ff2c021ec 100755
--- a/opac/opac-browser.pl
+++ b/opac/opac-browser.pl
@@ -41,7 +41,7 @@ my $dbh = C4::Context->dbh;
 # open template
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "opac-browser.tmpl",
+        template_name   => "opac-browser.tt",
         query           => $query,
         type            => "opac",
         authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ),
diff --git a/opac/opac-course-details.pl b/opac/opac-course-details.pl
index 7281652706..9741359c10 100755
--- a/opac/opac-course-details.pl
+++ b/opac/opac-course-details.pl
@@ -31,7 +31,7 @@ use C4::CourseReserves qw(GetCourse GetCourseReserves);
 my $cgi = new CGI;
 
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
-    {   template_name   => "opac-course-details.tmpl",
+    {   template_name   => "opac-course-details.tt",
         query           => $cgi,
         type            => "opac",
         authnotrequired => 1,
diff --git a/opac/opac-course-reserves.pl b/opac/opac-course-reserves.pl
index 83852c4460..6518ef461c 100755
--- a/opac/opac-course-reserves.pl
+++ b/opac/opac-course-reserves.pl
@@ -30,7 +30,7 @@ use C4::CourseReserves qw(SearchCourses);
 my $cgi = new CGI;
 
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
-    {   template_name   => "opac-course-reserves.tmpl",
+    {   template_name   => "opac-course-reserves.tt",
         query           => $cgi,
         type            => "opac",
         authnotrequired => 1,
diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl
index 224bf82427..e4b1cd27d5 100755
--- a/opac/opac-detail.pl
+++ b/opac/opac-detail.pl
@@ -63,7 +63,7 @@ BEGIN {
 my $query = new CGI;
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {
-        template_name   => "opac-detail.tmpl",
+        template_name   => "opac-detail.tt",
         query           => $query,
         type            => "opac",
         authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ),
diff --git a/opac/opac-downloadcart.pl b/opac/opac-downloadcart.pl
index 12d6777c57..2d4fb1b437 100755
--- a/opac/opac-downloadcart.pl
+++ b/opac/opac-downloadcart.pl
@@ -36,7 +36,7 @@ my $query = new CGI;
 
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user (
     {
-        template_name   => "opac-downloadcart.tmpl",
+        template_name   => "opac-downloadcart.tt",
         query           => $query,
         type            => "opac",
         authnotrequired => 1,
diff --git a/opac/opac-downloadshelf.pl b/opac/opac-downloadshelf.pl
index e94b76c505..17ee166da8 100755
--- a/opac/opac-downloadshelf.pl
+++ b/opac/opac-downloadshelf.pl
@@ -36,7 +36,7 @@ my $query = new CGI;
 
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user (
     {
-        template_name   => "opac-downloadshelf.tmpl",
+        template_name   => "opac-downloadshelf.tt",
         query           => $query,
         type            => "opac",
         authnotrequired => 1,
diff --git a/opac/opac-ics.pl b/opac/opac-ics.pl
index d9d90a6711..dace1b136a 100755
--- a/opac/opac-ics.pl
+++ b/opac/opac-ics.pl
@@ -40,7 +40,7 @@ use C4::Dates;
 my $query = new CGI;
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {
-        template_name   => "opac-user.tmpl",
+        template_name   => "opac-user.tt",
         query           => $query,
         type            => "opac",
         authnotrequired => 0,
diff --git a/opac/opac-imageviewer.pl b/opac/opac-imageviewer.pl
index 1870321a6e..226997146f 100755
--- a/opac/opac-imageviewer.pl
+++ b/opac/opac-imageviewer.pl
@@ -29,7 +29,7 @@ use C4::Images;
 my $query = new CGI;
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {
-        template_name   => "opac-imageviewer.tmpl",
+        template_name   => "opac-imageviewer.tt",
         query           => $query,
         type            => "opac",
         authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ),
diff --git a/opac/opac-main.pl b/opac/opac-main.pl
index a58659cd69..355c892159 100755
--- a/opac/opac-main.pl
+++ b/opac/opac-main.pl
@@ -31,7 +31,7 @@ my $dbh   = C4::Context->dbh;
 
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {
-        template_name   => "opac-main.tmpl",
+        template_name   => "opac-main.tt",
         type            => "opac",
         query           => $input,
         authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ),
diff --git a/opac/opac-memberentry.pl b/opac/opac-memberentry.pl
index 76fd32b453..ba9eca4709 100755
--- a/opac/opac-memberentry.pl
+++ b/opac/opac-memberentry.pl
@@ -33,7 +33,7 @@ my $dbh = C4::Context->dbh;
 
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {
-        template_name   => "opac-memberentry.tmpl",
+        template_name   => "opac-memberentry.tt",
         type            => "opac",
         query           => $cgi,
         authnotrequired => 1,
@@ -95,7 +95,7 @@ if ( $action eq 'create' ) {
         {
             ( $template, $borrowernumber, $cookie ) = get_template_and_user(
                 {
-                    template_name   => "opac-registration-email-sent.tmpl",
+                    template_name   => "opac-registration-email-sent.tt",
                     type            => "opac",
                     query           => $cgi,
                     authnotrequired => 1,
@@ -133,7 +133,7 @@ if ( $action eq 'create' ) {
         else {
             ( $template, $borrowernumber, $cookie ) = get_template_and_user(
                 {
-                    template_name   => "opac-registration-confirmation.tmpl",
+                    template_name   => "opac-registration-confirmation.tt",
                     type            => "opac",
                     query           => $cgi,
                     authnotrequired => 1,
@@ -175,7 +175,7 @@ elsif ( $action eq 'update' ) {
     else {
         ( $template, $borrowernumber, $cookie ) = get_template_and_user(
             {
-                template_name   => "opac-memberentry-update-submitted.tmpl",
+                template_name   => "opac-memberentry-update-submitted.tt",
                 type            => "opac",
                 query           => $cgi,
                 authnotrequired => 1,
diff --git a/opac/opac-messaging.pl b/opac/opac-messaging.pl
index dc244db539..096dbffbfe 100755
--- a/opac/opac-messaging.pl
+++ b/opac/opac-messaging.pl
@@ -37,7 +37,7 @@ my $query = CGI->new();
 
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {
-        template_name   => 'opac-messaging.tmpl',
+        template_name   => 'opac-messaging.tt',
         query           => $query,
         type            => 'opac',
         authnotrequired => 0,
diff --git a/opac/opac-modrequest-suspend.pl b/opac/opac-modrequest-suspend.pl
index e1535385c2..41ee5ad3f1 100755
--- a/opac/opac-modrequest-suspend.pl
+++ b/opac/opac-modrequest-suspend.pl
@@ -25,7 +25,7 @@ use C4::Auth;
 my $query = new CGI;
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {
-        template_name   => "opac-account.tmpl",
+        template_name   => "opac-account.tt",
         query           => $query,
         type            => "opac",
         authnotrequired => 0,
diff --git a/opac/opac-modrequest.pl b/opac/opac-modrequest.pl
index 7ec11eb789..cc1e3b39fa 100755
--- a/opac/opac-modrequest.pl
+++ b/opac/opac-modrequest.pl
@@ -33,7 +33,7 @@ my $query = new CGI;
 
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {   
-        template_name   => "opac-account.tmpl",
+        template_name   => "opac-account.tt",
         query           => $query,
         type            => "opac",
         authnotrequired => 0,
diff --git a/opac/opac-mymessages.pl b/opac/opac-mymessages.pl
index 8df73ac816..a7ccf251db 100755
--- a/opac/opac-mymessages.pl
+++ b/opac/opac-mymessages.pl
@@ -32,7 +32,7 @@ my $query = CGI->new();
 
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {
-        template_name   => 'opac-mymessages.tmpl',
+        template_name   => 'opac-mymessages.tt',
         query           => $query,
         type            => 'opac',
         authnotrequired => 0,
diff --git a/opac/opac-overdrive-search.pl b/opac/opac-overdrive-search.pl
index efac9a33d7..1e07b9f3ff 100755
--- a/opac/opac-overdrive-search.pl
+++ b/opac/opac-overdrive-search.pl
@@ -29,7 +29,7 @@ my $cgi = new CGI;
 
 # Getting the template and auth
 my ($template, $loggedinuser, $cookie)
-= get_template_and_user({template_name => "opac-overdrive-search.tmpl",
+= get_template_and_user({template_name => "opac-overdrive-search.tt",
                                 query => $cgi,
                                 type => "opac",
                                 authnotrequired => 1,
diff --git a/opac/opac-passwd.pl b/opac/opac-passwd.pl
index 440f9a23ef..2948eb3633 100755
--- a/opac/opac-passwd.pl
+++ b/opac/opac-passwd.pl
@@ -36,7 +36,7 @@ my $dbh   = C4::Context->dbh;
 
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {
-        template_name   => "opac-passwd.tmpl",
+        template_name   => "opac-passwd.tt",
         query           => $query,
         type            => "opac",
         authnotrequired => 0,
diff --git a/opac/opac-privacy.pl b/opac/opac-privacy.pl
index 22fe694e58..7b56e5d981 100755
--- a/opac/opac-privacy.pl
+++ b/opac/opac-privacy.pl
@@ -31,7 +31,7 @@ my $dbh   = C4::Context->dbh;
 
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {
-        template_name   => "opac-privacy.tmpl",
+        template_name   => "opac-privacy.tt",
         query           => $query,
         type            => "opac",
         authnotrequired => 0,
diff --git a/opac/opac-readingrecord.pl b/opac/opac-readingrecord.pl
index 4f16c66398..6d9e2fc70e 100755
--- a/opac/opac-readingrecord.pl
+++ b/opac/opac-readingrecord.pl
@@ -35,7 +35,7 @@ use C4::Charset qw(StripNonXmlChars);
 my $query = new CGI;
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {
-        template_name   => "opac-readingrecord.tmpl",
+        template_name   => "opac-readingrecord.tt",
         query           => $query,
         type            => "opac",
         authnotrequired => 0,
diff --git a/opac/opac-registration-verify.pl b/opac/opac-registration-verify.pl
index a45b5340a4..05b258f58a 100755
--- a/opac/opac-registration-verify.pl
+++ b/opac/opac-registration-verify.pl
@@ -39,7 +39,7 @@ my ( $template, $borrowernumber, $cookie );
 if ( $m->Verify() ) {
     ( $template, $borrowernumber, $cookie ) = get_template_and_user(
         {
-            template_name   => "opac-registration-confirmation.tmpl",
+            template_name   => "opac-registration-confirmation.tt",
             type            => "opac",
             query           => $cgi,
             authnotrequired => 1,
@@ -71,7 +71,7 @@ if ( $m->Verify() ) {
 else {
     ( $template, $borrowernumber, $cookie ) = get_template_and_user(
         {
-            template_name   => "opac-registration-invalid.tmpl",
+            template_name   => "opac-registration-invalid.tt",
             type            => "opac",
             query           => $cgi,
             authnotrequired => 1,
diff --git a/opac/opac-renew.pl b/opac/opac-renew.pl
index ca58f3ded8..34b7527da6 100755
--- a/opac/opac-renew.pl
+++ b/opac/opac-renew.pl
@@ -35,12 +35,12 @@ my $query = new CGI;
 
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
 	{
-		  template_name   => "opac-user.tmpl",
-		  query           => $query,
-		  type            => "opac",
-		  authnotrequired => 0,
-		  flagsrequired   => { borrow => 1 },
-		  debug           => 1,
+        template_name   => "opac-user.tt",
+        query           => $query,
+        type            => "opac",
+        authnotrequired => 0,
+        flagsrequired   => { borrow => 1 },
+        debug           => 1,
 	}
 ); 
 my @items          = $query->param('item');
diff --git a/opac/opac-reserve.pl b/opac/opac-reserve.pl
index a842869b28..94ff1bd9f6 100755
--- a/opac/opac-reserve.pl
+++ b/opac/opac-reserve.pl
@@ -43,7 +43,7 @@ my $MAXIMUM_NUMBER_OF_RESERVES = C4::Context->preference("maxreserves");
 my $query = new CGI;
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {
-        template_name   => "opac-reserve.tmpl",
+        template_name   => "opac-reserve.tt",
         query           => $query,
         type            => "opac",
         authnotrequired => 0,
diff --git a/opac/opac-review.pl b/opac/opac-review.pl
index 16ed56af96..39b8f8fa41 100755
--- a/opac/opac-review.pl
+++ b/opac/opac-review.pl
@@ -33,7 +33,7 @@ my $biblionumber = $query->param('biblionumber');
 my $review       = $query->param('review');
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {
-        template_name   => "opac-review.tmpl",
+        template_name   => "opac-review.tt",
         query           => $query,
         type            => "opac",
         authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ),
diff --git a/opac/opac-search-history.pl b/opac/opac-search-history.pl
index 55426a2a36..5b5a66d754 100755
--- a/opac/opac-search-history.pl
+++ b/opac/opac-search-history.pl
@@ -37,7 +37,7 @@ my $cgi = new CGI;
 # Getting the template and auth
 my ($template, $loggedinuser, $cookie) = get_template_and_user(
     {
-        template_name => "opac-search-history.tmpl",
+        template_name => "opac-search-history.tt",
         query => $cgi,
         type => "opac",
         authnotrequired => 1,
diff --git a/opac/opac-search.pl b/opac/opac-search.pl
index cc6beb7b19..3b37b4375f 100755
--- a/opac/opac-search.pl
+++ b/opac/opac-search.pl
@@ -97,16 +97,16 @@ my @params = $cgi->param("limit");
 my $format = $cgi->param("format") || '';
 my $build_grouped_results = C4::Context->preference('OPACGroupResults');
 if ($format =~ /(rss|atom|opensearchdescription)/) {
-    $template_name = 'opac-opensearch.tmpl';
+    $template_name = 'opac-opensearch.tt';
 }
 elsif (@params && $build_grouped_results) {
-    $template_name = 'opac-results-grouped.tmpl';
+    $template_name = 'opac-results-grouped.tt';
 }
 elsif ((@params>=1) || ($cgi->param("q")) || ($cgi->param('multibranchlimit')) || ($cgi->param('limit-yr')) ) {
-    $template_name = 'opac-results.tmpl';
+    $template_name = 'opac-results.tt';
 }
 else {
-    $template_name = 'opac-advsearch.tmpl';
+    $template_name = 'opac-advsearch.tt';
     $template_type = 'advsearch';
 }
 # load the template
@@ -120,7 +120,7 @@ else {
 
 my $lang = C4::Languages::getlanguage($cgi);
 
-if ($template_name eq 'opac-results.tmpl') {
+if ($template_name eq 'opac-results.tt') {
    $template->param('COinSinOPACResults' => C4::Context->preference('COinSinOPACResults'));
 }
 
diff --git a/opac/opac-sendbasket.pl b/opac/opac-sendbasket.pl
index 5821bea9fe..3cd81b10e9 100755
--- a/opac/opac-sendbasket.pl
+++ b/opac/opac-sendbasket.pl
@@ -38,7 +38,7 @@ my $query = new CGI;
 
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user (
     {
-        template_name   => "opac-sendbasketform.tmpl",
+        template_name   => "opac-sendbasketform.tt",
         query           => $query,
         type            => "opac",
         authnotrequired => 0,
@@ -71,7 +71,7 @@ if ( $email_add ) {
 
     my ( $template2, $borrowernumber, $cookie ) = get_template_and_user(
         {
-            template_name   => "opac-sendbasket.tmpl",
+            template_name   => "opac-sendbasket.tt",
             query           => $query,
             type            => "opac",
             authnotrequired => 0,
diff --git a/opac/opac-sendshelf.pl b/opac/opac-sendshelf.pl
index 852ef8d4b4..38fb544a98 100755
--- a/opac/opac-sendshelf.pl
+++ b/opac/opac-sendshelf.pl
@@ -38,7 +38,7 @@ my $query = new CGI;
 
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user (
     {
-        template_name   => "opac-sendshelfform.tmpl",
+        template_name   => "opac-sendshelfform.tt",
         query           => $query,
         type            => "opac",
         authnotrequired => 0,
@@ -64,7 +64,7 @@ if ( $email ) {
 
     my ( $template2, $borrowernumber, $cookie ) = get_template_and_user(
         {
-            template_name   => "opac-sendshelf.tmpl",
+            template_name   => "opac-sendshelf.tt",
             query           => $query,
             type            => "opac",
             authnotrequired => 1,
diff --git a/opac/opac-serial-issues.pl b/opac/opac-serial-issues.pl
index edc6248b64..d27695264f 100755
--- a/opac/opac-serial-issues.pl
+++ b/opac/opac-serial-issues.pl
@@ -45,7 +45,7 @@ my $biblionumber = $query->param('biblionumber');
 if ( $selectview eq "full" ) {
     ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         {
-            template_name   => "opac-full-serial-issues.tmpl",
+            template_name   => "opac-full-serial-issues.tt",
             query           => $query,
             type            => "opac",
             authnotrequired => 1,
@@ -92,7 +92,7 @@ if ( $selectview eq "full" ) {
 else {
     ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         {
-            template_name   => "opac-serial-issues.tmpl",
+            template_name   => "opac-serial-issues.tt",
             query           => $query,
             type            => "opac",
             authnotrequired => 1,
diff --git a/opac/opac-shareshelf.pl b/opac/opac-shareshelf.pl
index b12765bfd6..669629b9cf 100755
--- a/opac/opac-shareshelf.pl
+++ b/opac/opac-shareshelf.pl
@@ -20,7 +20,7 @@
 use Modern::Perl;
 
 use constant KEYLENGTH     => 10;
-use constant TEMPLATE_NAME => 'opac-shareshelf.tmpl';
+use constant TEMPLATE_NAME => 'opac-shareshelf.tt';
 use constant SHELVES_URL =>
   '/cgi-bin/koha/opac-shelves.pl?display=privateshelves&viewshelf=';
 
diff --git a/opac/opac-shelves.pl b/opac/opac-shelves.pl
index e17e95f604..0cdd0c487f 100755
--- a/opac/opac-shelves.pl
+++ b/opac/opac-shelves.pl
@@ -26,7 +26,7 @@ use C4::Auth;
 my $query = CGI->new();
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user({
-        template_name   => "opac-shelves.tmpl",
+        template_name   => "opac-shelves.tt",
         query           => $query,
         type            => "opac",
         authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ),
diff --git a/opac/opac-showmarc.pl b/opac/opac-showmarc.pl
index 9b75ae7cac..702fb1b178 100755
--- a/opac/opac-showmarc.pl
+++ b/opac/opac-showmarc.pl
@@ -75,7 +75,7 @@ if ($view eq 'card' || $view eq 'html') {
 }
 else { #view eq marc
     my ( $template, $loggedinuser, $cookie ) = get_template_and_user({
-        template_name   => "opac-showmarc.tmpl",
+        template_name   => "opac-showmarc.tt",
         query           => $input,
         type            => "opac",
         authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ),
diff --git a/opac/opac-showreviews.pl b/opac/opac-showreviews.pl
index 151c101fe3..cf493d5986 100755
--- a/opac/opac-showreviews.pl
+++ b/opac/opac-showreviews.pl
@@ -42,9 +42,9 @@ my $page = $query->param('page') || 1;
 $offset = ($page-1)*$results_per_page if $page>1;
 
 if ($format eq "rss") {
-    $template_name = "opac-showreviews-rss.tmpl";
+    $template_name = "opac-showreviews-rss.tt";
 } else {
-    $template_name = "opac-showreviews.tmpl",
+    $template_name = "opac-showreviews.tt",
 }
 
 my ( $template, $borrowernumber, $cookie ) = &get_template_and_user(
diff --git a/opac/opac-suggestions.pl b/opac/opac-suggestions.pl
index ac6172d4cc..2801233a15 100755
--- a/opac/opac-suggestions.pl
+++ b/opac/opac-suggestions.pl
@@ -51,7 +51,7 @@ my $submitted = $input->param('submitted');
 if ( C4::Context->preference("AnonSuggestions") ) {
     ( $template, $borrowernumber, $cookie ) = get_template_and_user(
         {
-            template_name   => "opac-suggestions.tmpl",
+            template_name   => "opac-suggestions.tt",
             query           => $input,
             type            => "opac",
             authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ),
@@ -64,7 +64,7 @@ if ( C4::Context->preference("AnonSuggestions") ) {
 else {
     ( $template, $borrowernumber, $cookie ) = get_template_and_user(
         {
-            template_name   => "opac-suggestions.tmpl",
+            template_name   => "opac-suggestions.tt",
             query           => $input,
             type            => "opac",
             authnotrequired => 0,
diff --git a/opac/opac-tags.pl b/opac/opac-tags.pl
index d9f9f3c3fd..1810ed37f3 100755
--- a/opac/opac-tags.pl
+++ b/opac/opac-tags.pl
@@ -109,11 +109,11 @@ if ($is_ajax) {
 	$debug and print STDERR "op: $loggedinuser\n";
 } else {
 	($template, $loggedinuser, $cookie) = get_template_and_user({
-		template_name   => "opac-tags.tmpl",
-		query           => $query,
-		type            => "opac",
-		authnotrequired => ($add_op ? 0 : 1),	# auth required to add tags
-		debug           => 1,
+        template_name   => "opac-tags.tt",
+        query           => $query,
+        type            => "opac",
+        authnotrequired => ($add_op ? 0 : 1), # auth required to add tags
+        debug           => 1,
 	});
 }
 
diff --git a/opac/opac-tags_subject.pl b/opac/opac-tags_subject.pl
index a19f406db9..19322c52e4 100755
--- a/opac/opac-tags_subject.pl
+++ b/opac/opac-tags_subject.pl
@@ -41,7 +41,7 @@ my $dbh = C4::Context->dbh;
 # open template
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "opac-tags_subject.tmpl",
+        template_name   => "opac-tags_subject.tt",
         query           => $query,
         type            => "opac",
         authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ),
diff --git a/opac/opac-topissues.pl b/opac/opac-topissues.pl
index 0afc69221c..d14163bd63 100755
--- a/opac/opac-topissues.pl
+++ b/opac/opac-topissues.pl
@@ -50,13 +50,15 @@ if ( ! C4::Context->preference('OpacTopissue') ) {
 my $branches = GetBranches();
 my $itemtypes = GetItemTypes();
 
-my ($template, $borrowernumber, $cookie)
-	= get_template_and_user({template_name => 'opac-topissues.tmpl',
-				query => $input,
-				type => "opac",
-               authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ),
-				debug => 1,
-				});
+my ($template, $borrowernumber, $cookie) = get_template_and_user(
+    {
+        template_name   => 'opac-topissues.tt',
+        query           => $input,
+        type            => "opac",
+        authnotrequired => ( C4::Context->preference("OpacPublic") ? 1 : 0 ),
+        debug           => 1,
+    }
+);
 my $dbh = C4::Context->dbh;
 # Displaying results
 my $do_it = $input->param('do_it') || 0; # as form been posted
diff --git a/opac/opac-user.pl b/opac/opac-user.pl
index beba58076f..3284b3a339 100755
--- a/opac/opac-user.pl
+++ b/opac/opac-user.pl
@@ -55,7 +55,7 @@ BEGIN {
 
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {
-        template_name   => "opac-user.tmpl",
+        template_name   => "opac-user.tt",
         query           => $query,
         type            => "opac",
         authnotrequired => 0,
diff --git a/opac/sco/help.pl b/opac/sco/help.pl
index abcb396657..356d351d7c 100755
--- a/opac/sco/help.pl
+++ b/opac/sco/help.pl
@@ -30,7 +30,7 @@ use C4::Output qw(output_html_with_http_headers);
 
 my $query = new CGI;
 my ($template, $borrowernumber, $cookie) = get_template_and_user({
-    template_name => "sco/help.tmpl",
+    template_name => "sco/help.tt",
     query => $query,
      type => "opac",
     debug => 1,
diff --git a/opac/sco/printslip.pl b/opac/sco/printslip.pl
index 62a79bbe1f..09c6c6ae7e 100755
--- a/opac/sco/printslip.pl
+++ b/opac/sco/printslip.pl
@@ -45,7 +45,7 @@ my $error = $input->param('error');
 # patrons still need to be able to print receipts
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "/sco/printslip.tmpl",
+        template_name   => "/sco/printslip.tt",
         query           => $input,
         type            => "opac",
     }
diff --git a/opac/sco/sco-main.pl b/opac/sco/sco-main.pl
index 14f74b54d2..0d103ecb33 100755
--- a/opac/sco/sco-main.pl
+++ b/opac/sco/sco-main.pl
@@ -63,7 +63,7 @@ if (C4::Context->preference('AutoSelfCheckAllowed'))
     $query->param(-name=>'koha_login_context',-values=>['sco']);
 }
 my ($template, $loggedinuser, $cookie) = get_template_and_user({
-    template_name   => "sco/sco-main.tmpl",
+    template_name   => "sco/sco-main.tt",
     authnotrequired => 0,
     flagsrequired => { circulate => "circulate_remaining_permissions" },
     query => $query,
diff --git a/patroncards/card-print.pl b/patroncards/card-print.pl
index 1ca0c91332..482c15f287 100755
--- a/patroncards/card-print.pl
+++ b/patroncards/card-print.pl
@@ -31,7 +31,7 @@ use C4::Labels;
 my $cgi = new CGI;
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "patroncards/card-print.tmpl",
+        template_name   => "patroncards/card-print.tt",
         query           => $cgi,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/patroncards/edit-batch.pl b/patroncards/edit-batch.pl
index b0cd3b35d2..fb730a7053 100755
--- a/patroncards/edit-batch.pl
+++ b/patroncards/edit-batch.pl
@@ -33,7 +33,7 @@ use C4::Patroncards;
 my $cgi = new CGI;
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "patroncards/edit-batch.tmpl",
+        template_name   => "patroncards/edit-batch.tt",
         query           => $cgi,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/patroncards/edit-layout.pl b/patroncards/edit-layout.pl
index 0c4dfe47bb..dd5f46ad89 100755
--- a/patroncards/edit-layout.pl
+++ b/patroncards/edit-layout.pl
@@ -34,7 +34,7 @@ use C4::Patroncards;
 my $cgi = new CGI;
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "patroncards/edit-layout.tmpl",
+        template_name   => "patroncards/edit-layout.tt",
         query           => $cgi,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/patroncards/edit-profile.pl b/patroncards/edit-profile.pl
index 6189cb3f6c..0f03754bf1 100755
--- a/patroncards/edit-profile.pl
+++ b/patroncards/edit-profile.pl
@@ -31,7 +31,7 @@ use C4::Patroncards::Profile;
 my $cgi = new CGI;
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "patroncards/edit-profile.tmpl",
+        template_name   => "patroncards/edit-profile.tt",
         query           => $cgi,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/patroncards/edit-template.pl b/patroncards/edit-template.pl
index 8f60b9cf9d..0b1da553be 100755
--- a/patroncards/edit-template.pl
+++ b/patroncards/edit-template.pl
@@ -32,7 +32,7 @@ use C4::Patroncards;
 my $cgi = new CGI;
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "patroncards/edit-template.tmpl",
+        template_name   => "patroncards/edit-template.tt",
         query           => $cgi,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/patroncards/home.pl b/patroncards/home.pl
index 6121764b3d..cedfef2054 100755
--- a/patroncards/home.pl
+++ b/patroncards/home.pl
@@ -29,7 +29,7 @@ use C4::Output qw(output_html_with_http_headers);
 my $cgi = new CGI;
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "patroncards/home.tmpl",
+        template_name   => "patroncards/home.tt",
         query           => $cgi,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/patroncards/image-manage.pl b/patroncards/image-manage.pl
index cf5257aac7..0ec1b7b73d 100755
--- a/patroncards/image-manage.pl
+++ b/patroncards/image-manage.pl
@@ -18,7 +18,7 @@ use C4::Patroncards;
 my $cgi = CGI->new;
 
 my ($template, $loggedinuser, $cookie) = get_template_and_user({
-                    template_name       => "patroncards/image-manage.tmpl",
+                    template_name       => "patroncards/image-manage.tt",
                     query               => $cgi,
                     type                => "intranet",
                     authnotrequired     => 0,
diff --git a/patroncards/manage.pl b/patroncards/manage.pl
index 13b574b758..2c13a4e62a 100755
--- a/patroncards/manage.pl
+++ b/patroncards/manage.pl
@@ -34,7 +34,7 @@ use C4::Labels;
 my $cgi = new CGI;
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "patroncards/manage.tmpl",
+        template_name   => "patroncards/manage.tt",
         query           => $cgi,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/patroncards/members-search.pl b/patroncards/members-search.pl
index ef7a7760f1..ebc53d9b8c 100755
--- a/patroncards/members-search.pl
+++ b/patroncards/members-search.pl
@@ -48,7 +48,7 @@ foreach my $category (@categories) {
 }
 
 my ($template, $loggedinuser, $cookie) = get_template_and_user({
-                template_name => "patroncards/members-search.tmpl",
+                template_name => "patroncards/members-search.tt",
                 query => $cgi,
                 type => "intranet",
                 authnotrequired => 0,
diff --git a/patroncards/print.pl b/patroncards/print.pl
index fcd1dc153b..76ff2ebb3b 100755
--- a/patroncards/print.pl
+++ b/patroncards/print.pl
@@ -31,7 +31,7 @@ use C4::Patroncards;
 my $cgi = new CGI;
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "patroncards/print.tmpl",
+        template_name   => "patroncards/print.tt",
         query           => $cgi,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/plugins/plugins-uninstall.pl b/plugins/plugins-uninstall.pl
index 63240103e7..b7dad4103a 100755
--- a/plugins/plugins-uninstall.pl
+++ b/plugins/plugins-uninstall.pl
@@ -36,7 +36,7 @@ die("Koha plugins are disabled!")
 my $input = new CGI;
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
-    {   template_name   => "plugins/plugins-upload.tmpl",
+    {   template_name   => "plugins/plugins-upload.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/plugins/plugins-upload.pl b/plugins/plugins-upload.pl
index 28a647ae26..34805e8683 100755
--- a/plugins/plugins-upload.pl
+++ b/plugins/plugins-upload.pl
@@ -36,7 +36,7 @@ my $plugins_enabled = C4::Context->preference('UseKohaPlugins') && C4::Context->
 my $input = new CGI;
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
-    {   template_name => ($plugins_enabled) ? "plugins/plugins-upload.tmpl" : "plugins/plugins-disabled.tt",
+    {   template_name => ($plugins_enabled) ? "plugins/plugins-upload.tt" : "plugins/plugins-disabled.tt",
         query         => $input,
         type          => "intranet",
         authnotrequired => 0,
diff --git a/plugins/run.pl b/plugins/run.pl
index 6c462ed26d..50eb4dcb22 100755
--- a/plugins/run.pl
+++ b/plugins/run.pl
@@ -37,7 +37,7 @@ my $class  = $cgi->param('class');
 my $method = $cgi->param('method');
 
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
-    {   template_name   => "plugins/plugins-disabled.tmpl",
+    {   template_name   => "plugins/plugins-disabled.tt",
         query           => $cgi,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/reports/acquisitions_stats.pl b/reports/acquisitions_stats.pl
index 419959eb7c..56032c2c3e 100755
--- a/reports/acquisitions_stats.pl
+++ b/reports/acquisitions_stats.pl
@@ -45,7 +45,7 @@ plugin that shows a stats on borrowers
 
 my $input          = new CGI;
 my $do_it          = $input->param('do_it');
-my $fullreportname = "reports/acquisitions_stats.tmpl";
+my $fullreportname = "reports/acquisitions_stats.tt";
 my $line           = $input->param("Line");
 my $column         = $input->param("Column");
 my @filters        = $input->param("Filter");
diff --git a/reports/bor_issues_top.pl b/reports/bor_issues_top.pl
index 9618faf3a4..bdd58bab90 100755
--- a/reports/bor_issues_top.pl
+++ b/reports/bor_issues_top.pl
@@ -45,7 +45,7 @@ $debug = 1;
 $debug and open DEBUG, ">/tmp/bor_issues_top.debug.log";
 
 my $input = new CGI;
-my $fullreportname = "reports/bor_issues_top.tmpl";
+my $fullreportname = "reports/bor_issues_top.tt";
 my $do_it   = $input->param('do_it');
 my $limit   = $input->param("Limit");
 my $column  = $input->param("Criteria");
diff --git a/reports/borrowers_out.pl b/reports/borrowers_out.pl
index 55243b355a..14d59abdeb 100755
--- a/reports/borrowers_out.pl
+++ b/reports/borrowers_out.pl
@@ -42,7 +42,7 @@ plugin that shows a stats on borrowers
 
 my $input = new CGI;
 my $do_it=$input->param('do_it');
-my $fullreportname = "reports/borrowers_out.tmpl";
+my $fullreportname = "reports/borrowers_out.tt";
 my $limit = $input->param("Limit");
 my $column = $input->param("Criteria");
 my @filters = $input->param("Filter");
diff --git a/reports/borrowers_stats.pl b/reports/borrowers_stats.pl
index 82b9002602..53c30f5120 100755
--- a/reports/borrowers_stats.pl
+++ b/reports/borrowers_stats.pl
@@ -49,7 +49,7 @@ plugin that shows a stats on borrowers
 
 my $input = new CGI;
 my $do_it=$input->param('do_it');
-my $fullreportname = "reports/borrowers_stats.tmpl";
+my $fullreportname = "reports/borrowers_stats.tt";
 my $line = $input->param("Line");
 my $column = $input->param("Column");
 my @filters = $input->param("Filter");
diff --git a/reports/cat_issues_top.pl b/reports/cat_issues_top.pl
index 22b88ae017..9dcb39c1e9 100755
--- a/reports/cat_issues_top.pl
+++ b/reports/cat_issues_top.pl
@@ -43,7 +43,7 @@ plugin that shows a stats on borrowers
 
 my $input = new CGI;
 my $do_it=$input->param('do_it');
-my $fullreportname = "reports/cat_issues_top.tmpl";
+my $fullreportname = "reports/cat_issues_top.tt";
 my $limit = $input->param("Limit");
 my $column = $input->param("Criteria");
 my @filters = $input->param("Filter");
diff --git a/reports/catalogue_out.pl b/reports/catalogue_out.pl
index 45609a0dca..2637f98f1a 100755
--- a/reports/catalogue_out.pl
+++ b/reports/catalogue_out.pl
@@ -44,7 +44,7 @@ my @filters = $input->param("Filter");
 
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {
-        template_name   => "reports/catalogue_out.tmpl",
+        template_name   => "reports/catalogue_out.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/reports/catalogue_stats.pl b/reports/catalogue_stats.pl
index c8e21940f4..11f1ca1234 100755
--- a/reports/catalogue_stats.pl
+++ b/reports/catalogue_stats.pl
@@ -41,7 +41,7 @@ plugin that shows a stats on borrowers
 
 our $debug = 0;
 my $input = new CGI;
-my $fullreportname = "reports/catalogue_stats.tmpl";
+my $fullreportname = "reports/catalogue_stats.tt";
 my $do_it       = $input->param('do_it');
 my $line        = $input->param("Line");
 my $column      = $input->param("Column");
diff --git a/reports/dictionary.pl b/reports/dictionary.pl
index 96b71e9463..0ab6f24441 100755
--- a/reports/dictionary.pl
+++ b/reports/dictionary.pl
@@ -42,7 +42,7 @@ my $definition_description = $input->param('definition_description');
 my $area  = $input->param('area') || '';
 my $no_html = 0;    # this will be set if we dont want to print out an html::template
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
-    {   template_name   => "reports/dictionary.tmpl",
+    {   template_name   => "reports/dictionary.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/reports/guided_reports.pl b/reports/guided_reports.pl
index 9cb25eac2e..b6cb822163 100755
--- a/reports/guided_reports.pl
+++ b/reports/guided_reports.pl
@@ -57,7 +57,7 @@ elsif ( $phase eq 'Use saved' ) {
 
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {
-        template_name   => "reports/guided_reports_start.tmpl",
+        template_name   => "reports/guided_reports_start.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/reports/issues_avg_stats.pl b/reports/issues_avg_stats.pl
index b601a44c55..3781d37a7a 100755
--- a/reports/issues_avg_stats.pl
+++ b/reports/issues_avg_stats.pl
@@ -43,7 +43,7 @@ plugin that shows a stats on borrowers
 
 my $input = new CGI;
 my $do_it=$input->param('do_it');
-my $fullreportname = "reports/issues_avg_stats.tmpl";
+my $fullreportname = "reports/issues_avg_stats.tt";
 my $line = $input->param("Line");
 my $column = $input->param("Column");
 my @filters = $input->param("Filter");
diff --git a/reports/issues_stats.pl b/reports/issues_stats.pl
index ddc3740c26..0df99420cb 100755
--- a/reports/issues_stats.pl
+++ b/reports/issues_stats.pl
@@ -47,7 +47,7 @@ plugin that shows circulation stats
 
 # my $debug = 1;	# override for now.
 my $input = new CGI;
-my $fullreportname = "reports/issues_stats.tmpl";
+my $fullreportname = "reports/issues_stats.tt";
 my $do_it    = $input->param('do_it');
 my $line     = $input->param("Line");
 my $column   = $input->param("Column");
diff --git a/reports/itemslost.pl b/reports/itemslost.pl
index 9ecd5997ff..cb283d5aca 100755
--- a/reports/itemslost.pl
+++ b/reports/itemslost.pl
@@ -40,7 +40,7 @@ use C4::Dates qw/format_date/;
 my $query = new CGI;
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "reports/itemslost.tmpl",
+        template_name   => "reports/itemslost.tt",
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/reports/manager.pl b/reports/manager.pl
index 177c64ac8a..01b4deb183 100755
--- a/reports/manager.pl
+++ b/reports/manager.pl
@@ -29,7 +29,7 @@ use C4::Circulation;
 my $input = new CGI;
 my $report_name=$input->param("report_name");
 my $do_it=$input->param('do_it');
-my $fullreportname = "reports/".$report_name.".tmpl";
+my $fullreportname = "reports/".$report_name.".tt";
 my @values = $input->param("value");
 my ($template, $borrowernumber, $cookie)
 	= get_template_and_user({template_name => $fullreportname,
diff --git a/reports/reports-home.pl b/reports/reports-home.pl
index d536b01c1e..29d3617808 100755
--- a/reports/reports-home.pl
+++ b/reports/reports-home.pl
@@ -28,7 +28,7 @@ use C4::Context;
 
 my $query = new CGI;
 my ($template, $loggedinuser, $cookie)
-= get_template_and_user({template_name => "reports/reports-home.tmpl",
+= get_template_and_user({template_name => "reports/reports-home.tt",
 				query => $query,
 				type => "intranet",
 				authnotrequired => 0,
diff --git a/reports/reservereport.pl b/reports/reservereport.pl
index 42a1d2019d..bd5ee0cac5 100755
--- a/reports/reservereport.pl
+++ b/reports/reservereport.pl
@@ -48,7 +48,7 @@ my $branches=GetBranches();
 
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {
-        template_name   => "reports/reservereport.tmpl",
+        template_name   => "reports/reservereport.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/reports/reserves_stats.pl b/reports/reserves_stats.pl
index bfeaf8b8c5..7c33a637a2 100755
--- a/reports/reserves_stats.pl
+++ b/reports/reserves_stats.pl
@@ -48,7 +48,7 @@ plugin that shows circulation stats
 
 # my $debug = 1;	# override for now.
 my $input = new CGI;
-my $fullreportname = "reports/reserves_stats.tmpl";
+my $fullreportname = "reports/reserves_stats.tt";
 my $do_it    = $input->param('do_it');
 my $line     = $input->param("Line");
 my $column   = $input->param("Column");
diff --git a/reports/serials_stats.pl b/reports/serials_stats.pl
index d86c5b96bf..681ddf1416 100755
--- a/reports/serials_stats.pl
+++ b/reports/serials_stats.pl
@@ -40,7 +40,7 @@ plugin that shows a stats on serials
 =cut
 
 my $input      = new CGI;
-my $templatename   = "reports/serials_stats.tmpl";
+my $templatename   = "reports/serials_stats.tt";
 my $do_it      = $input->param("do_it");
 my $bookseller = $input->param("bookseller");
 my $branchcode = $input->param("branchcode");
diff --git a/reports/stats.screen.pl b/reports/stats.screen.pl
index 301cdd419f..0eef8d13b3 100755
--- a/reports/stats.screen.pl
+++ b/reports/stats.screen.pl
@@ -36,7 +36,7 @@ my $op    = $input->param('submit');
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "reports/stats_screen.tmpl",
+        template_name   => "reports/stats_screen.tt",
         query           => $input,
         type            => "intranet",
         flagsrequired   => { reports => '*' },
diff --git a/reserve/modrequest.pl b/reserve/modrequest.pl
index 2f0b8d3f28..183f52eb44 100755
--- a/reserve/modrequest.pl
+++ b/reserve/modrequest.pl
@@ -32,7 +32,7 @@ use C4::Auth;
 my $query = new CGI;
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {   
-        template_name   => "about.tmpl",
+        template_name   => "about.tt",
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/reserve/modrequest_suspendall.pl b/reserve/modrequest_suspendall.pl
index 48d5412734..a8662c7356 100755
--- a/reserve/modrequest_suspendall.pl
+++ b/reserve/modrequest_suspendall.pl
@@ -32,7 +32,7 @@ use C4::Auth;
 my $query = new CGI;
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "about.tmpl",
+        template_name   => "about.tt",
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/reserve/renewscript.pl b/reserve/renewscript.pl
index 9293cb53b3..2e01008ace 100755
--- a/reserve/renewscript.pl
+++ b/reserve/renewscript.pl
@@ -35,7 +35,7 @@ my $input = new CGI;
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "members/moremember.tmpl",
+        template_name   => "members/moremember.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/reserve/request.pl b/reserve/request.pl
index a86e0e78b4..5bd9128d07 100755
--- a/reserve/request.pl
+++ b/reserve/request.pl
@@ -49,7 +49,7 @@ my $sth;
 my $input = new CGI;
 my ( $template, $borrowernumber, $cookie, $flags ) = get_template_and_user(
     {
-        template_name   => "reserve/request.tmpl",
+        template_name   => "reserve/request.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/reviews/reviewswaiting.pl b/reviews/reviewswaiting.pl
index 71072160ed..206d63b9fb 100755
--- a/reviews/reviewswaiting.pl
+++ b/reviews/reviewswaiting.pl
@@ -29,7 +29,7 @@ use C4::Biblio;
 my $query = new CGI;
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "reviews/reviewswaiting.tmpl",
+        template_name   => "reviews/reviewswaiting.tt",
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/rotating_collections/addItems.pl b/rotating_collections/addItems.pl
index 06b6b3a8a7..36eac4c64d 100755
--- a/rotating_collections/addItems.pl
+++ b/rotating_collections/addItems.pl
@@ -30,7 +30,7 @@ use CGI;
 
 my $query = new CGI;
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "rotating_collections/addItems.tmpl",
+    = get_template_and_user({template_name => "rotating_collections/addItems.tt",
 			     query => $query,
 			     type => "intranet",
 			     authnotrequired => 0,
diff --git a/rotating_collections/editCollections.pl b/rotating_collections/editCollections.pl
index e38660864e..5b60047b5f 100755
--- a/rotating_collections/editCollections.pl
+++ b/rotating_collections/editCollections.pl
@@ -29,7 +29,7 @@ use C4::RotatingCollections;
 
 my $query = new CGI;
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "rotating_collections/editCollections.tmpl",
+    = get_template_and_user({template_name => "rotating_collections/editCollections.tt",
 			     query => $query,
 			     type => "intranet",
 			     authnotrequired => 0,
diff --git a/rotating_collections/rotatingCollections.pl b/rotating_collections/rotatingCollections.pl
index 35aea56977..cffd9a4794 100755
--- a/rotating_collections/rotatingCollections.pl
+++ b/rotating_collections/rotatingCollections.pl
@@ -29,7 +29,7 @@ use C4::RotatingCollections;
 
 my $query = new CGI;
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "rotating_collections/rotatingCollections.tmpl",
+    = get_template_and_user({template_name => "rotating_collections/rotatingCollections.tt",
 			     query => $query,
 			     type => "intranet",
 			     authnotrequired => 0,
diff --git a/rotating_collections/transferCollection.pl b/rotating_collections/transferCollection.pl
index 23eff46afd..c84d7e15e2 100755
--- a/rotating_collections/transferCollection.pl
+++ b/rotating_collections/transferCollection.pl
@@ -34,7 +34,7 @@ my $colId = $query->param('colId');
 my $toBranch = $query->param('toBranch');
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "rotating_collections/transferCollection.tmpl",
+    = get_template_and_user({template_name => "rotating_collections/transferCollection.tt",
 			     query => $query,
 			     type => "intranet",
 			     authnotrequired => 0,
diff --git a/serials/acqui-search-result.pl b/serials/acqui-search-result.pl
index e7d1e61e9a..8a2d7d99f4 100755
--- a/serials/acqui-search-result.pl
+++ b/serials/acqui-search-result.pl
@@ -51,7 +51,7 @@ use C4::Bookseller qw( GetBookSeller );
 
 my $query=new CGI;
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "serials/acqui-search-result.tmpl",
+    = get_template_and_user({template_name => "serials/acqui-search-result.tt",
                  query => $query,
                  type => "intranet",
                  authnotrequired => 0,
diff --git a/serials/acqui-search.pl b/serials/acqui-search.pl
index 1e5d917011..a8592fb584 100755
--- a/serials/acqui-search.pl
+++ b/serials/acqui-search.pl
@@ -28,7 +28,7 @@ my $query = new CGI;
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "serials/acqui-search.tmpl",
+        template_name   => "serials/acqui-search.tt",
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/serials/checkexpiration.pl b/serials/checkexpiration.pl
index 8dff415473..e24210f4c9 100755
--- a/serials/checkexpiration.pl
+++ b/serials/checkexpiration.pl
@@ -56,7 +56,7 @@ my $query = new CGI;
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user (
     {
-        template_name   => "serials/checkexpiration.tmpl",
+        template_name   => "serials/checkexpiration.tt",
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/serials/claims.pl b/serials/claims.pl
index 13167d727f..bfe5a0f376 100755
--- a/serials/claims.pl
+++ b/serials/claims.pl
@@ -41,7 +41,7 @@ my $order = $input->param('order');
 
 # open template first (security & userenv set here)
 my ($template, $loggedinuser, $cookie)
-= get_template_and_user({template_name => 'serials/claims.tmpl',
+= get_template_and_user({template_name => 'serials/claims.tt',
             query => $input,
             type => 'intranet',
             authnotrequired => 0,
diff --git a/serials/member-search.pl b/serials/member-search.pl
index 4fa88a0c05..dfeb373497 100755
--- a/serials/member-search.pl
+++ b/serials/member-search.pl
@@ -51,7 +51,7 @@ my $searchstring   = $cgi->param('member');
 my %categories_dislay;
 my ($template, $loggedinuser, $cookie);
     ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "serials/member-search.tmpl",
+    = get_template_and_user({template_name => "serials/member-search.tt",
                  query => $cgi,
                  type => "intranet",
                  authnotrequired => 0,
diff --git a/serials/routing-preview.pl b/serials/routing-preview.pl
index 1e0bd0971f..1eda74d1e7 100755
--- a/serials/routing-preview.pl
+++ b/serials/routing-preview.pl
@@ -101,7 +101,7 @@ if($ok){
 	}
 
     ($template, $loggedinuser, $cookie)
-= get_template_and_user({template_name => "serials/routing-preview-slip.tmpl",
+= get_template_and_user({template_name => "serials/routing-preview-slip.tt",
 				query => $query,
 				type => "intranet",
 				authnotrequired => 0,
@@ -111,7 +111,7 @@ if($ok){
     $template->param("libraryname"=>$branchname);
 } else {
     ($template, $loggedinuser, $cookie)
-= get_template_and_user({template_name => "serials/routing-preview.tmpl",
+= get_template_and_user({template_name => "serials/routing-preview.tt",
 				query => $query,
 				type => "intranet",
 				authnotrequired => 0,
diff --git a/serials/routing.pl b/serials/routing.pl
index 5f697ea4cb..f82251745a 100755
--- a/serials/routing.pl
+++ b/serials/routing.pl
@@ -86,7 +86,7 @@ foreach my $dateseq (@{$serialdates}) {
 }
 
 my ($template, $loggedinuser, $cookie)
-= get_template_and_user({template_name => 'serials/routing.tmpl',
+= get_template_and_user({template_name => 'serials/routing.tt',
 				query => $query,
 				type => 'intranet',
 				authnotrequired => 0,
diff --git a/serials/serial-issues.pl b/serials/serial-issues.pl
index 95156156b4..de5989bb66 100755
--- a/serials/serial-issues.pl
+++ b/serials/serial-issues.pl
@@ -67,7 +67,7 @@ if ($selectview eq "full"){
     my $yearmax=$subscriptions->[scalar(@$subscriptions)-1]{year};
 
     ($template, $loggedinuser, $cookie)
-     = get_template_and_user({template_name => "serials/serial-issues-full.tmpl",
+     = get_template_and_user({template_name => "serials/serial-issues-full.tt",
      query => $query,
      type => "intranet",
 	 flagsrequired => {serials => '*'},
@@ -89,7 +89,7 @@ if ($selectview eq "full"){
 } else {
     my $subscriptions = GetSubscriptionsFromBiblionumber($biblionumber);
     ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "serials/serial-issues.tmpl",
+    = get_template_and_user({template_name => "serials/serial-issues.tt",
         query => $query,
         type => "intranet",
 	    flagsrequired => {serials => '*'},
diff --git a/serials/serials-collection.pl b/serials/serials-collection.pl
index ba97163f55..2922c428f7 100755
--- a/serials/serials-collection.pl
+++ b/serials/serials-collection.pl
@@ -38,7 +38,7 @@ my $nbissues=$query->param('nbissues');
 my $dbh = C4::Context->dbh;
 
 my ($template, $loggedinuser, $cookie)
-  = get_template_and_user({template_name => "serials/serials-collection.tmpl",
+  = get_template_and_user({template_name => "serials/serials-collection.tt",
                             query => $query,
                             type => "intranet",
                             authnotrequired => 0,
diff --git a/serials/serials-edit.pl b/serials/serials-edit.pl
index 8fb2e60129..2eeed10923 100755
--- a/serials/serials-edit.pl
+++ b/serials/serials-edit.pl
@@ -112,7 +112,7 @@ unless ( @serialids ) {
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => 'serials/serials-edit.tmpl',
+        template_name   => 'serials/serials-edit.tt',
         query           => $query,
         type            => 'intranet',
         authnotrequired => 0,
diff --git a/serials/serials-home.pl b/serials/serials-home.pl
index 9ec03364ae..175321e6f0 100755
--- a/serials/serials-home.pl
+++ b/serials/serials-home.pl
@@ -41,7 +41,7 @@ my $routing = $query->param('routing') || C4::Context->preference("RoutingSerial
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "serials/serials-home.tmpl",
+        template_name   => "serials/serials-home.tt",
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/serials/serials-recieve.pl b/serials/serials-recieve.pl
index c14e4d075b..d5daa9ff55 100755
--- a/serials/serials-recieve.pl
+++ b/serials/serials-recieve.pl
@@ -174,7 +174,7 @@ if ($op eq 'serialchangestatus') {
     }
 }
 my ($template, $loggedinuser, $cookie)
-= get_template_and_user({template_name => "serials/serials-recieve.tmpl",
+= get_template_and_user({template_name => "serials/serials-recieve.tt",
                 query => $query,
                 type => "intranet",
                 authnotrequired => 0,
diff --git a/serials/subscription-bib-search.pl b/serials/subscription-bib-search.pl
index 089b31b07a..e47b1e72df 100755
--- a/serials/subscription-bib-search.pl
+++ b/serials/subscription-bib-search.pl
@@ -77,7 +77,7 @@ if ( $op eq "do_search" && $query ) {
 
     ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         {
-            template_name   => "serials/result.tmpl",
+            template_name   => "serials/result.tt",
             query           => $input,
             type            => "intranet",
             authnotrequired => 0,
@@ -182,7 +182,7 @@ if ( $op eq "do_search" && $query ) {
 else {
     ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         {
-            template_name   => "serials/subscription-bib-search.tmpl",
+            template_name   => "serials/subscription-bib-search.tt",
             query           => $input,
             type            => "intranet",
             authnotrequired => 0,
diff --git a/serials/subscription-detail.pl b/serials/subscription-detail.pl
index 0430aaf18e..0cceb34ebe 100755
--- a/serials/subscription-detail.pl
+++ b/serials/subscription-detail.pl
@@ -49,7 +49,7 @@ if ( $op and $op eq "close" ) {
 my $permission = ($op eq "del") ? "delete_subscription" : "*";
 
 my ($template, $loggedinuser, $cookie)
-= get_template_and_user({template_name => "serials/subscription-detail.tmpl",
+= get_template_and_user({template_name => "serials/subscription-detail.tt",
                 query => $query,
                 type => "intranet",
                 authnotrequired => 0,
diff --git a/serials/subscription-renew.pl b/serials/subscription-renew.pl
index 280b776357..df01dcccf8 100755
--- a/serials/subscription-renew.pl
+++ b/serials/subscription-renew.pl
@@ -65,7 +65,7 @@ my $subscriptionid = $query->param('subscriptionid');
 my $done = 0;    # for after form has been submitted
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "serials/subscription-renew.tmpl",
+        template_name   => "serials/subscription-renew.tt",
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/serials/viewalerts.pl b/serials/viewalerts.pl
index 5944ce1271..7d813e02e5 100755
--- a/serials/viewalerts.pl
+++ b/serials/viewalerts.pl
@@ -34,7 +34,7 @@ my $input = new CGI;
 my $print = $input->param('print');
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => 'serials/viewalerts.tmpl',
+    = get_template_and_user({template_name => 'serials/viewalerts.tt',
                  query => $input,
                  type => "intranet",
                  authnotrequired => 0,
diff --git a/services/itemrecorddisplay.pl b/services/itemrecorddisplay.pl
index b2a0a2940a..3d7aa89ede 100755
--- a/services/itemrecorddisplay.pl
+++ b/services/itemrecorddisplay.pl
@@ -37,7 +37,7 @@ use C4::Items;
 
 my $input = new CGI;
 my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user( {
-    template_name   => 'services/itemrecorddisplay.tmpl',
+    template_name   => 'services/itemrecorddisplay.tt',
     query           => $input,
     type            => 'intranet',
     flagsrequired   => {acquisition => '*'},
diff --git a/sms/sms.pl b/sms/sms.pl
index 02a0c6cded..22f630e255 100755
--- a/sms/sms.pl
+++ b/sms/sms.pl
@@ -14,7 +14,7 @@ my $operation = $query->param('operation');
 my $result;
 my $errorcode;
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "sms/sms-home.tmpl",
+    = get_template_and_user({template_name => "sms/sms-home.tt",
 		query => $query,
 		type => "intranet",
 		authnotrequired => 0,
diff --git a/suggestion/suggestion.pl b/suggestion/suggestion.pl
index fa5fe3ffe4..046e347d14 100755
--- a/suggestion/suggestion.pl
+++ b/suggestion/suggestion.pl
@@ -101,7 +101,7 @@ foreach (keys %$suggestion_ref){
 }
 my ( $template, $borrowernumber, $cookie, $userflags ) = get_template_and_user(
         {
-            template_name   => "suggestion/suggestion.tmpl",
+            template_name   => "suggestion/suggestion.tt",
             query           => $input,
             type            => "intranet",
             flagsrequired   => { catalogue => 1 },
diff --git a/svc/report b/svc/report
index 818e6a07a6..ca4fbea2b0 100755
--- a/svc/report
+++ b/svc/report
@@ -38,7 +38,7 @@ if (!$report_rec) { die "There is no such report.\n"; }
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "intranet-main.tmpl",
+        template_name   => "intranet-main.tt",
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/t/db_dependent/Auth.t b/t/db_dependent/Auth.t
index 6a100bc5dc..079779fdfc 100644
--- a/t/db_dependent/Auth.t
+++ b/t/db_dependent/Auth.t
@@ -74,7 +74,7 @@ $dbh->{RaiseError} = 1;
 
     my ( $template, $loggedinuser, $cookies ) = get_template_and_user(
         {
-            template_name   => "about.tmpl",
+            template_name   => "about.tt",
             query           => $query,
             type            => "opac",
             authnotrequired => 1,
@@ -91,7 +91,7 @@ $dbh->{RaiseError} = 1;
 
     ( $template, $loggedinuser, $cookies ) = get_template_and_user(
         {
-            template_name   => "about.tmpl",
+            template_name   => "about.tt",
             query           => $query,
             type            => "opac",
             authnotrequired => 1,
diff --git a/tags/list.pl b/tags/list.pl
index 91914b3495..5813c83b40 100755
--- a/tags/list.pl
+++ b/tags/list.pl
@@ -41,7 +41,7 @@ my $tag_id       = $query->param('tag_id');
 
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {
-        template_name   => "tags/list.tmpl",
+        template_name   => "tags/list.tt",
         query           => $query,
         type            => "intranet",
         debug           => 1,
diff --git a/tags/review.pl b/tags/review.pl
index 37d14121c2..b04c294442 100755
--- a/tags/review.pl
+++ b/tags/review.pl
@@ -79,14 +79,16 @@ if (is_ajax()) {
 ### Below is the sad, boring, necessary non-AJAX HTML code.
 
 my $input = CGI->new;
-my ($template, $borrowernumber, $cookie) = get_template_and_user({
-		template_name => "tags/review.tmpl",
-		query => $input,
-		 type => "intranet",
-		debug => 1,
-		authnotrequired => 0,
-	 	  flagsrequired => $needed_flags,
-});
+my ($template, $borrowernumber, $cookie) = get_template_and_user(
+    {
+        template_name   => "tags/review.tt",
+        query           => $input,
+        type            => "intranet",
+        debug           => 1,
+        authnotrequired => 0,
+        flagsrequired   => $needed_flags,
+    }
+);
 
 my ($op, @errors, @tags);
 
diff --git a/test/progressbar.pl b/test/progressbar.pl
index c994baa840..22853488f6 100755
--- a/test/progressbar.pl
+++ b/test/progressbar.pl
@@ -42,7 +42,7 @@ my $dbh = C4::Context->dbh;
 $dbh->{AutoCommit} = 0;
 
 my ($template, $loggedinuser, $cookie)
-	= get_template_and_user({template_name => "test/progressbar.tmpl",
+    = get_template_and_user({template_name => "test/progressbar.tt",
 					query => $input,
 					type => "intranet",
 					debug => 1,
diff --git a/test/progressbarsubmit.pl b/test/progressbarsubmit.pl
index 0982f58ca9..691947d0fe 100755
--- a/test/progressbarsubmit.pl
+++ b/test/progressbarsubmit.pl
@@ -45,7 +45,7 @@ my $jobID = $input->param('jobID');
 my $completedJobID = $input->param('completedJobID');
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "test/progressbar.tmpl",
+    = get_template_and_user({template_name => "test/progressbar.tt",
                     query => $input,
                     type => "intranet",
                     debug => 1,
diff --git a/tools/batchMod.pl b/tools/batchMod.pl
index bda2effe4d..e886642559 100755
--- a/tools/batchMod.pl
+++ b/tools/batchMod.pl
@@ -52,11 +52,11 @@ my $use_default_values = $input->param('use_default_values');
 my $template_name;
 my $template_flag;
 if (!defined $op) {
-    $template_name = "tools/batchMod.tmpl";
+    $template_name = "tools/batchMod.tt";
     $template_flag = { tools => '*' };
     $op = q{};
 } else {
-    $template_name = ($del) ? "tools/batchMod-del.tmpl" : "tools/batchMod-edit.tmpl";
+    $template_name = ($del) ? "tools/batchMod-del.tt" : "tools/batchMod-edit.tt";
     $template_flag = ($del) ? { tools => 'items_batchdel' }   : { tools => 'items_batchmod' };
 }
 
diff --git a/tools/cleanborrowers.pl b/tools/cleanborrowers.pl
index 10d5604c25..3563c9daa6 100755
--- a/tools/cleanborrowers.pl
+++ b/tools/cleanborrowers.pl
@@ -69,7 +69,7 @@ my $borrower_categorycode = $params->{'borrower_categorycode'} || q{};
 
 # getting the template
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
-    {   template_name   => "tools/cleanborrowers.tmpl",
+    {   template_name   => "tools/cleanborrowers.tt",
         query           => $cgi,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/tools/csv-profiles.pl b/tools/csv-profiles.pl
index 45b1285351..942452c839 100755
--- a/tools/csv-profiles.pl
+++ b/tools/csv-profiles.pl
@@ -51,7 +51,7 @@ my $dbh          = C4::Context->dbh;
 # open template
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "tools/csv-profiles.tmpl",
+        template_name   => "tools/csv-profiles.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/tools/export.pl b/tools/export.pl
index 601e8d55ad..8a5c2a5da3 100755
--- a/tools/export.pl
+++ b/tools/export.pl
@@ -116,7 +116,7 @@ else {
 
 my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
     {
-        template_name   => "tools/export.tmpl",
+        template_name   => "tools/export.tt",
         query           => $query,
         type            => "intranet",
         authnotrequired => $commandline,
diff --git a/tools/holidays.pl b/tools/holidays.pl
index 376de5f1d8..23468d167b 100755
--- a/tools/holidays.pl
+++ b/tools/holidays.pl
@@ -32,7 +32,7 @@ my $input = new CGI;
 my $dbh = C4::Context->dbh();
 # Get the template to use
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "tools/holidays.tmpl",
+    = get_template_and_user({template_name => "tools/holidays.tt",
                              type => "intranet",
                              query => $input,
                              authnotrequired => 0,
diff --git a/tools/import_borrowers.pl b/tools/import_borrowers.pl
index 3623684152..abbef70f5a 100755
--- a/tools/import_borrowers.pl
+++ b/tools/import_borrowers.pl
@@ -70,7 +70,7 @@ our $csv  = Text::CSV->new({binary => 1});  # binary needed for non-ASCII Unicod
 #push @feedback, {feedback=>1, name=>'backend', value=>$csv->backend, backend=>$csv->backend}; #XXX
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user({
-        template_name   => "tools/import_borrowers.tmpl",
+        template_name   => "tools/import_borrowers.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/tools/koha-news.pl b/tools/koha-news.pl
index aec9486c51..478308f75f 100755
--- a/tools/koha-news.pl
+++ b/tools/koha-news.pl
@@ -53,7 +53,7 @@ my $new_detail = get_opac_new($id);
 
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {
-        template_name   => "tools/koha-news.tmpl",
+        template_name   => "tools/koha-news.tt",
         query           => $cgi,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/tools/letter.pl b/tools/letter.pl
index c19d995d53..82c6f87fde 100755
--- a/tools/letter.pl
+++ b/tools/letter.pl
@@ -98,7 +98,7 @@ my $dbh = C4::Context->dbh;
 
 our ( $template, $borrowernumber, $cookie, $staffflags ) = get_template_and_user(
     {
-        template_name   => 'tools/letter.tmpl',
+        template_name   => 'tools/letter.tt',
         query           => $input,
         type            => 'intranet',
         authnotrequired => 0,
diff --git a/tools/manage-marc-import.pl b/tools/manage-marc-import.pl
index deaab7d1c7..961a327a56 100755
--- a/tools/manage-marc-import.pl
+++ b/tools/manage-marc-import.pl
@@ -50,7 +50,7 @@ my $offset = $input->param('offset') || 0;
 my $results_per_page = $input->param('results_per_page') || 25; 
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "tools/manage-marc-import.tmpl",
+    = get_template_and_user({template_name => "tools/manage-marc-import.tt",
                  query => $input,
                  type => "intranet",
                  authnotrequired => 0,
diff --git a/tools/modborrowers.pl b/tools/modborrowers.pl
index 5bd21033a4..e844a2b21b 100755
--- a/tools/modborrowers.pl
+++ b/tools/modborrowers.pl
@@ -39,7 +39,7 @@ use Koha::List::Patron;
 my $input = new CGI;
 my $op = $input->param('op') || 'show_form';
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
-    {   template_name   => "tools/modborrowers.tmpl",
+    {   template_name   => "tools/modborrowers.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/tools/overduerules.pl b/tools/overduerules.pl
index 11dd9bd0bc..24019a56a8 100755
--- a/tools/overduerules.pl
+++ b/tools/overduerules.pl
@@ -66,7 +66,7 @@ my $op = $input->param('op');
 $op ||= q{};
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "tools/overduerules.tmpl",
+    = get_template_and_user({template_name => "tools/overduerules.tt",
                             query => $input,
                             type => "intranet",
                             authnotrequired => 0,
diff --git a/tools/picture-upload.pl b/tools/picture-upload.pl
index b2aa18a89c..eae06cb4ac 100755
--- a/tools/picture-upload.pl
+++ b/tools/picture-upload.pl
@@ -35,7 +35,7 @@ use C4::Debug;
 my $input = new CGI;
 
 my ($template, $loggedinuser, $cookie)
-	= get_template_and_user({template_name => "tools/picture-upload.tmpl",
+    = get_template_and_user({template_name => "tools/picture-upload.tt",
 					query => $input,
 					type => "intranet",
 					authnotrequired => 0,
diff --git a/tools/scheduler.pl b/tools/scheduler.pl
index 99210ac409..87188a2f55 100755
--- a/tools/scheduler.pl
+++ b/tools/scheduler.pl
@@ -40,7 +40,7 @@ my $CONFIG_NAME = $ENV{'KOHA_CONF'};
 
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {
-        template_name   => "tools/scheduler.tmpl",
+        template_name   => "tools/scheduler.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/tools/stage-marc-import.pl b/tools/stage-marc-import.pl
index e9d982dbc4..a5f4d17ba8 100755
--- a/tools/stage-marc-import.pl
+++ b/tools/stage-marc-import.pl
@@ -59,7 +59,7 @@ my $encoding = $input->param('encoding');
 my $marc_modification_template = $input->param('marc_modification_template_id');
 
 my ($template, $loggedinuser, $cookie)
-	= get_template_and_user({template_name => "tools/stage-marc-import.tmpl",
+    = get_template_and_user({template_name => "tools/stage-marc-import.tt",
 					query => $input,
 					type => "intranet",
 					authnotrequired => 0,
diff --git a/tools/tools-home.pl b/tools/tools-home.pl
index 055f7f458b..b493f1fead 100755
--- a/tools/tools-home.pl
+++ b/tools/tools-home.pl
@@ -27,7 +27,7 @@ use C4::Tags qw/get_count_by_tag_status/;
 my $query = new CGI;
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "tools/tools-home.tmpl",
+        template_name   => "tools/tools-home.tt",
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/tools/upload-cover-image.pl b/tools/upload-cover-image.pl
index 8ca419c682..478c119177 100755
--- a/tools/upload-cover-image.pl
+++ b/tools/upload-cover-image.pl
@@ -57,7 +57,7 @@ my $input = new CGI;
 my $fileID = $input->param('uploadedfileid');
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "tools/upload-images.tmpl",
+        template_name   => "tools/upload-images.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/tools/viewlog.pl b/tools/viewlog.pl
index 1fbd6be100..6961ed7367 100755
--- a/tools/viewlog.pl
+++ b/tools/viewlog.pl
@@ -59,7 +59,7 @@ my $src      = $input->param("src");    # this param allows us to be told where
 
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {
-        template_name   => "tools/viewlog.tmpl",
+        template_name   => "tools/viewlog.tt",
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/virtualshelves/addbybiblionumber.pl b/virtualshelves/addbybiblionumber.pl
index 5fd82b3cd0..52685c119f 100755
--- a/virtualshelves/addbybiblionumber.pl
+++ b/virtualshelves/addbybiblionumber.pl
@@ -81,7 +81,7 @@ our $errcode	    = 0;
 
 our ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "virtualshelves/addbybiblionumber.tmpl",
+        template_name   => "virtualshelves/addbybiblionumber.tt",
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/virtualshelves/downloadshelf.pl b/virtualshelves/downloadshelf.pl
index 5c59f79293..caf01ac2db 100755
--- a/virtualshelves/downloadshelf.pl
+++ b/virtualshelves/downloadshelf.pl
@@ -36,7 +36,7 @@ my $query = new CGI;
 
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user (
     {
-        template_name   => "virtualshelves/downloadshelf.tmpl",
+        template_name   => "virtualshelves/downloadshelf.tt",
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/virtualshelves/sendshelf.pl b/virtualshelves/sendshelf.pl
index 9866671971..9439609bc9 100755
--- a/virtualshelves/sendshelf.pl
+++ b/virtualshelves/sendshelf.pl
@@ -37,7 +37,7 @@ my $query = new CGI;
 
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user (
     {
-        template_name   => "virtualshelves/sendshelfform.tmpl",
+        template_name   => "virtualshelves/sendshelfform.tt",
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,
@@ -61,11 +61,11 @@ if ( $email ) {
 
     my ( $template2, $borrowernumber, $cookie ) = get_template_and_user(
         {
-	    template_name   => "virtualshelves/sendshelf.tmpl",
-	    query           => $query,
-	    type            => "intranet",
-	    authnotrequired => 0,
-	    flagsrequired   => { catalogue => 1 },
+        template_name   => "virtualshelves/sendshelf.tt",
+        query           => $query,
+        type            => "intranet",
+        authnotrequired => 0,
+        flagsrequired   => { catalogue => 1 },
         }
     );
 
diff --git a/virtualshelves/shelves.pl b/virtualshelves/shelves.pl
index 0b208a9e6d..9f82e9d8e6 100755
--- a/virtualshelves/shelves.pl
+++ b/virtualshelves/shelves.pl
@@ -28,7 +28,7 @@ my $query = new CGI;
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "virtualshelves/shelves.tmpl",
+        template_name   => "virtualshelves/shelves.tt",
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,
diff --git a/xt/author/show-template-structure.pl b/xt/author/show-template-structure.pl
index 4ff00c5c20..0b24fa53f7 100755
--- a/xt/author/show-template-structure.pl
+++ b/xt/author/show-template-structure.pl
@@ -47,7 +47,7 @@ the following errors:
 
 =over 4
 
-xt/author/show-template-structure.pl path/to/template.tmpl
+xt/author/show-template-structure.pl path/to/template.tt
 
 =back
 
-- 
2.39.5