35 files changed, 2 insertions, 2 deletions
diff --git a/etherpad/src/etherpad/utils.js b/etherpad/src/etherpad/utils.js
index 83bfc07..1d139ed 100644
--- a/etherpad/src/etherpad/utils.js
+++ b/etherpad/src/etherpad/utils.js
@@ -75,8 +75,8 @@ function findTemplate(filename, plugin) {
     files.push('/themes/' + appjet.config.theme + '/plugins/' + plugin + '/templates/' + filename);
     files.push('/themes/default/plugins/' + plugin + '/templates/' + filename);
   }
-  files.push('/themes/' + appjet.config.theme + '/' + filename);
-  files.push('/themes/default/' + filename);
+  files.push('/themes/' + appjet.config.theme + '/templates/' + filename);
+  files.push('/themes/default/templates/' + filename);
 
   return findExistsingFile(files);
 }
diff --git a/etherpad/src/themes/default/500_body.ejs b/etherpad/src/themes/default/templates/500_body.ejs
index 291e0fd..291e0fd 100644
--- a/etherpad/src/themes/default/500_body.ejs
+++ b/etherpad/src/themes/default/templates/500_body.ejs
diff --git a/etherpad/src/themes/default/admin/pluginmanager.ejs b/etherpad/src/themes/default/templates/admin/pluginmanager.ejs
index 077d10a..077d10a 100644
--- a/etherpad/src/themes/default/admin/pluginmanager.ejs
+++ b/etherpad/src/themes/default/templates/admin/pluginmanager.ejs
diff --git a/etherpad/src/themes/default/email/padinvite.ejs b/etherpad/src/themes/default/templates/email/padinvite.ejs
index c6467b8..c6467b8 100644
--- a/etherpad/src/themes/default/email/padinvite.ejs
+++ b/etherpad/src/themes/default/templates/email/padinvite.ejs
diff --git a/etherpad/src/themes/default/framed/framedfooter.ejs b/etherpad/src/themes/default/templates/framed/framedfooter.ejs
index 7994e38..7994e38 100644
--- a/etherpad/src/themes/default/framed/framedfooter.ejs
+++ b/etherpad/src/themes/default/templates/framed/framedfooter.ejs
diff --git a/etherpad/src/themes/default/framed/framedheader-pro.ejs b/etherpad/src/themes/default/templates/framed/framedheader-pro.ejs
index 73b0e99..73b0e99 100644
--- a/etherpad/src/themes/default/framed/framedheader-pro.ejs
+++ b/etherpad/src/themes/default/templates/framed/framedheader-pro.ejs
diff --git a/etherpad/src/themes/default/framed/framedheader.ejs b/etherpad/src/themes/default/templates/framed/framedheader.ejs
index d6c25cb..d6c25cb 100644
--- a/etherpad/src/themes/default/framed/framedheader.ejs
+++ b/etherpad/src/themes/default/templates/framed/framedheader.ejs
diff --git a/etherpad/src/themes/default/framed/framedpage-pro.ejs b/etherpad/src/themes/default/templates/framed/framedpage-pro.ejs
index b3acb07..b3acb07 100644
--- a/etherpad/src/themes/default/framed/framedpage-pro.ejs
+++ b/etherpad/src/themes/default/templates/framed/framedpage-pro.ejs
diff --git a/etherpad/src/themes/default/framed/framedpage.ejs b/etherpad/src/themes/default/templates/framed/framedpage.ejs
index b1590f8..b1590f8 100644
--- a/etherpad/src/themes/default/framed/framedpage.ejs
+++ b/etherpad/src/themes/default/templates/framed/framedpage.ejs
diff --git a/etherpad/src/themes/default/html.ejs b/etherpad/src/themes/default/templates/html.ejs
index 056d7a7..056d7a7 100644
--- a/etherpad/src/themes/default/html.ejs
+++ b/etherpad/src/themes/default/templates/html.ejs
diff --git a/etherpad/src/themes/default/main/home.ejs b/etherpad/src/themes/default/templates/main/home.ejs
index aa5d934..aa5d934 100644
--- a/etherpad/src/themes/default/main/home.ejs
+++ b/etherpad/src/themes/default/templates/main/home.ejs
diff --git a/etherpad/src/themes/default/main/pro_signup_body.ejs b/etherpad/src/themes/default/templates/main/pro_signup_body.ejs
index e984878..e984878 100644
--- a/etherpad/src/themes/default/main/pro_signup_body.ejs
+++ b/etherpad/src/themes/default/templates/main/pro_signup_body.ejs
diff --git a/etherpad/src/themes/default/misc/pad_default.ejs b/etherpad/src/themes/default/templates/misc/pad_default.ejs
index 96b7e25..96b7e25 100644
--- a/etherpad/src/themes/default/misc/pad_default.ejs
+++ b/etherpad/src/themes/default/templates/misc/pad_default.ejs
diff --git a/etherpad/src/themes/default/notice.ejs b/etherpad/src/themes/default/templates/notice.ejs
index 311694f..311694f 100644
--- a/etherpad/src/themes/default/notice.ejs
+++ b/etherpad/src/themes/default/templates/notice.ejs
diff --git a/etherpad/src/themes/default/pad/create_body.ejs b/etherpad/src/themes/default/templates/pad/create_body.ejs
index 5fec49a..5fec49a 100644
--- a/etherpad/src/themes/default/pad/create_body.ejs
+++ b/etherpad/src/themes/default/templates/pad/create_body.ejs
diff --git a/etherpad/src/themes/default/pad/pad_body2.ejs b/etherpad/src/themes/default/templates/pad/pad_body2.ejs
index a19e685..a19e685 100644
--- a/etherpad/src/themes/default/pad/pad_body2.ejs
+++ b/etherpad/src/themes/default/templates/pad/pad_body2.ejs
diff --git a/etherpad/src/themes/default/pad/pad_iphone_body.ejs b/etherpad/src/themes/default/templates/pad/pad_iphone_body.ejs
index 96279ce..96279ce 100644
--- a/etherpad/src/themes/default/pad/pad_iphone_body.ejs
+++ b/etherpad/src/themes/default/templates/pad/pad_iphone_body.ejs
diff --git a/etherpad/src/themes/default/pad/padview_body.ejs b/etherpad/src/themes/default/templates/pad/padview_body.ejs
index 75c38fe..75c38fe 100644
--- a/etherpad/src/themes/default/pad/padview_body.ejs
+++ b/etherpad/src/themes/default/templates/pad/padview_body.ejs
diff --git a/etherpad/src/themes/default/page.ejs b/etherpad/src/themes/default/templates/page.ejs
index 7dd36ad..7dd36ad 100644
--- a/etherpad/src/themes/default/page.ejs
+++ b/etherpad/src/themes/default/templates/page.ejs
diff --git a/etherpad/src/themes/default/pro-account/recover.ejs b/etherpad/src/themes/default/templates/pro-account/recover.ejs
index 686fe3b..686fe3b 100644
--- a/etherpad/src/themes/default/pro-account/recover.ejs
+++ b/etherpad/src/themes/default/templates/pro-account/recover.ejs
diff --git a/etherpad/src/themes/default/pro-account/sign-in.ejs b/etherpad/src/themes/default/templates/pro-account/sign-in.ejs
index 470bbc4..470bbc4 100644
--- a/etherpad/src/themes/default/pro-account/sign-in.ejs
+++ b/etherpad/src/themes/default/templates/pro-account/sign-in.ejs
diff --git a/etherpad/src/themes/default/pro-help/main.ejs b/etherpad/src/themes/default/templates/pro-help/main.ejs
index 428d7f7..428d7f7 100644
--- a/etherpad/src/themes/default/pro-help/main.ejs
+++ b/etherpad/src/themes/default/templates/pro-help/main.ejs
diff --git a/etherpad/src/themes/default/pro-help/pro-help-template.ejs b/etherpad/src/themes/default/templates/pro-help/pro-help-template.ejs
index 9cc8205..9cc8205 100644
--- a/etherpad/src/themes/default/pro-help/pro-help-template.ejs
+++ b/etherpad/src/themes/default/templates/pro-help/pro-help-template.ejs
diff --git a/etherpad/src/themes/default/pro/account/account-welcome-email.ejs b/etherpad/src/themes/default/templates/pro/account/account-welcome-email.ejs
index 25af6f8..25af6f8 100644
--- a/etherpad/src/themes/default/pro/account/account-welcome-email.ejs
+++ b/etherpad/src/themes/default/templates/pro/account/account-welcome-email.ejs
diff --git a/etherpad/src/themes/default/pro/account/forgot-password-email.ejs b/etherpad/src/themes/default/templates/pro/account/forgot-password-email.ejs
index 4595cee..4595cee 100644
--- a/etherpad/src/themes/default/pro/account/forgot-password-email.ejs
+++ b/etherpad/src/themes/default/templates/pro/account/forgot-password-email.ejs
diff --git a/etherpad/src/themes/default/pro/account/forgot-password.ejs b/etherpad/src/themes/default/templates/pro/account/forgot-password.ejs
index bbc78dd..bbc78dd 100644
--- a/etherpad/src/themes/default/pro/account/forgot-password.ejs
+++ b/etherpad/src/themes/default/templates/pro/account/forgot-password.ejs
diff --git a/etherpad/src/themes/default/pro/account/my-account.ejs b/etherpad/src/themes/default/templates/pro/account/my-account.ejs
index 9634285..9634285 100644
--- a/etherpad/src/themes/default/pro/account/my-account.ejs
+++ b/etherpad/src/themes/default/templates/pro/account/my-account.ejs
diff --git a/etherpad/src/themes/default/pro/account/signin.ejs b/etherpad/src/themes/default/templates/pro/account/signin.ejs
index c67bea6..c67bea6 100644
--- a/etherpad/src/themes/default/pro/account/signin.ejs
+++ b/etherpad/src/themes/default/templates/pro/account/signin.ejs
diff --git a/etherpad/src/themes/default/pro/admin/account-manager.ejs b/etherpad/src/themes/default/templates/pro/admin/account-manager.ejs
index f1b443f..f1b443f 100644
--- a/etherpad/src/themes/default/pro/admin/account-manager.ejs
+++ b/etherpad/src/themes/default/templates/pro/admin/account-manager.ejs
diff --git a/etherpad/src/themes/default/pro/admin/admin-template.ejs b/etherpad/src/themes/default/templates/pro/admin/admin-template.ejs
index 0964e33..0964e33 100644
--- a/etherpad/src/themes/default/pro/admin/admin-template.ejs
+++ b/etherpad/src/themes/default/templates/pro/admin/admin-template.ejs
diff --git a/etherpad/src/themes/default/pro/admin/delete-account.ejs b/etherpad/src/themes/default/templates/pro/admin/delete-account.ejs
index 3de2122..3de2122 100644
--- a/etherpad/src/themes/default/pro/admin/delete-account.ejs
+++ b/etherpad/src/themes/default/templates/pro/admin/delete-account.ejs
diff --git a/etherpad/src/themes/default/pro/admin/manage-account.ejs b/etherpad/src/themes/default/templates/pro/admin/manage-account.ejs
index 72529b4..72529b4 100644
--- a/etherpad/src/themes/default/pro/admin/manage-account.ejs
+++ b/etherpad/src/themes/default/templates/pro/admin/manage-account.ejs
diff --git a/etherpad/src/themes/default/pro/admin/new-account.ejs b/etherpad/src/themes/default/templates/pro/admin/new-account.ejs
index 2f2cccf..2f2cccf 100644
--- a/etherpad/src/themes/default/pro/admin/new-account.ejs
+++ b/etherpad/src/themes/default/templates/pro/admin/new-account.ejs
diff --git a/etherpad/src/themes/default/pro/padlist/pro-padlist.ejs b/etherpad/src/themes/default/templates/pro/padlist/pro-padlist.ejs
index b762679..b762679 100644
--- a/etherpad/src/themes/default/pro/padlist/pro-padlist.ejs
+++ b/etherpad/src/themes/default/templates/pro/padlist/pro-padlist.ejs
diff --git a/etherpad/src/themes/default/pro/pro_home.ejs b/etherpad/src/themes/default/templates/pro/pro_home.ejs
index 8d92139..8d92139 100644
--- a/etherpad/src/themes/default/pro/pro_home.ejs
+++ b/etherpad/src/themes/default/templates/pro/pro_home.ejs