diff --git a/interface/web/themes/default-v2/templates/admin/server_config_web_edit.htm b/interface/web/themes/default-v2/templates/admin/server_config_web_edit.htm
index fecd3dcedb1345c198479c11b5773803de8135a4..c0c9b3b963778968925170ad7f31669d2ef40795 100644
--- a/interface/web/themes/default-v2/templates/admin/server_config_web_edit.htm
+++ b/interface/web/themes/default-v2/templates/admin/server_config_web_edit.htm
@@ -31,6 +31,10 @@
{tmpl_var name='website_symlinks_rel'}
+
+
+ {tmpl_var name='website_autoalias_note_txt'}
+
diff --git a/interface/web/themes/default-v2/templates/admin/system_config_mail_edit.htm b/interface/web/themes/default-v2/templates/admin/system_config_mail_edit.htm
index 18fdfccc9db23b2cda5247ce41df04beefee7c68..013c39ae069be0130107f897894b8ea3fa7a310f 100644
--- a/interface/web/themes/default-v2/templates/admin/system_config_mail_edit.htm
+++ b/interface/web/themes/default-v2/templates/admin/system_config_mail_edit.htm
@@ -39,6 +39,34 @@
+
+
{tmpl_var name='smtp_enabled_txt'}
+
+ {tmpl_var name='smtp_enabled'}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{tmpl_var name='smtp_crypt_txt'}
+
+ {tmpl_var name='smtp_crypt'}
+
+
diff --git a/interface/web/themes/default-v2/templates/admin/system_config_sites_edit.htm b/interface/web/themes/default-v2/templates/admin/system_config_sites_edit.htm
index 21bbf0ef151fdf9fa51668c02a6be60f57203fa2..121d607a38def87f3eafcb37df68596a22fdae93 100644
--- a/interface/web/themes/default-v2/templates/admin/system_config_sites_edit.htm
+++ b/interface/web/themes/default-v2/templates/admin/system_config_sites_edit.htm
@@ -39,6 +39,12 @@
+
+
{tmpl_var name='vhost_subdomains_txt'}
+
+ {tmpl_var name='vhost_subdomains'} {tmpl_var name='vhost_subdomains_note_txt'}
+
+
diff --git a/interface/web/themes/default-v2/templates/admin/tpl_default-v2_basic.htm b/interface/web/themes/default-v2/templates/admin/tpl_default-v2_basic.htm
index fa31547cc8e7a69968a24cc1055ab287bf93e943..31f3eda05c035cdf4a3a718070ca4a947f6368ab 100644
--- a/interface/web/themes/default-v2/templates/admin/tpl_default-v2_basic.htm
+++ b/interface/web/themes/default-v2/templates/admin/tpl_default-v2_basic.htm
@@ -12,6 +12,7 @@
+
+
+
{tmpl_var name='limit_cgi_txt'}
+
+ {tmpl_var name='limit_cgi'}
+
+
+
+
{tmpl_var name='limit_ssi_txt'}
+
+ {tmpl_var name='limit_ssi'}
+
+
+
+
{tmpl_var name='limit_perl_txt'}
+
+ {tmpl_var name='limit_perl'}
+
+
+
+
{tmpl_var name='limit_ruby_txt'}
+
+ {tmpl_var name='limit_ruby'}
+
+
+
+
{tmpl_var name='limit_python_txt'}
+
+ {tmpl_var name='limit_python'}
+
+
+
+
{tmpl_var name='force_suexec_txt'}
+
+ {tmpl_var name='force_suexec'}
+
+
+
+
{tmpl_var name='limit_hterror_txt'}
+
+ {tmpl_var name='limit_hterror'}
+
+
+
+
{tmpl_var name='limit_wildcard_txt'}
+
+ {tmpl_var name='limit_wildcard'}
+
+
+
+
{tmpl_var name='limit_ssl_txt'}
+
+ {tmpl_var name='limit_ssl'}
+
+
diff --git a/interface/web/themes/default-v2/templates/client/client_template_edit_limits.htm b/interface/web/themes/default-v2/templates/client/client_template_edit_limits.htm
index 81a2e595b32087d2a80f0b3300394bb397bd465b..91f9bd52d94c57dbf1a1be54d02f5dd008722138 100644
--- a/interface/web/themes/default-v2/templates/client/client_template_edit_limits.htm
+++ b/interface/web/themes/default-v2/templates/client/client_template_edit_limits.htm
@@ -25,6 +25,60 @@
{tmpl_var name='web_php_options'}
+
+
{tmpl_var name='limit_cgi_txt'}
+
+ {tmpl_var name='limit_cgi'}
+
+
+
+
{tmpl_var name='limit_ssi_txt'}
+
+ {tmpl_var name='limit_ssi'}
+
+
+
+
{tmpl_var name='limit_perl_txt'}
+
+ {tmpl_var name='limit_perl'}
+
+
+
+
{tmpl_var name='limit_ruby_txt'}
+
+ {tmpl_var name='limit_ruby'}
+
+
+
+
{tmpl_var name='limit_python_txt'}
+
+ {tmpl_var name='limit_python'}
+
+
+
+
{tmpl_var name='force_suexec_txt'}
+
+ {tmpl_var name='force_suexec'}
+
+
+
+
{tmpl_var name='limit_hterror_txt'}
+
+ {tmpl_var name='limit_hterror'}
+
+
+
+
{tmpl_var name='limit_wildcard_txt'}
+
+ {tmpl_var name='limit_wildcard'}
+
+
+
+
{tmpl_var name='limit_ssl_txt'}
+
+ {tmpl_var name='limit_ssl'}
+
+
diff --git a/interface/web/themes/default-v2/templates/domain/domain_list.htm b/interface/web/themes/default-v2/templates/client/domain_list.htm
similarity index 59%
rename from interface/web/themes/default-v2/templates/domain/domain_list.htm
rename to interface/web/themes/default-v2/templates/client/domain_list.htm
index d4a1e61818462e169e2c4bd9793453e27974a63c..3c6b1ce5b0bcbc5d14e8a1d767fcccdcb33df4d1 100644
--- a/interface/web/themes/default-v2/templates/domain/domain_list.htm
+++ b/interface/web/themes/default-v2/templates/client/domain_list.htm
@@ -7,11 +7,11 @@