diff --git a/share/templates/roundcubemail/acl.inc.php.tpl b/share/templates/roundcubemail/acl.inc.php.tpl
index f3c5244..aa6c968 100644
--- a/share/templates/roundcubemail/acl.inc.php.tpl
+++ b/share/templates/roundcubemail/acl.inc.php.tpl
@@ -1,14 +1,12 @@
 <?php
     \$config['acl_advanced_mode'] = false;
     \$config['acl_users_source'] = 'kolab_addressbook';
     \$config['acl_users_field'] = 'mail';
     \$config['acl_users_filter'] = 'objectClass=kolabInetOrgPerson';
 
     \$config['acl_groups'] = true;
     \$config['acl_group_prefix'] = 'group:';
 
     if (file_exists(RCUBE_CONFIG_DIR . '/' . (\$_SERVER["HTTP_HOST"] ?? null) . '/' . basename(__FILE__))) {
         include_once(RCUBE_CONFIG_DIR . '/' . (\$_SERVER["HTTP_HOST"] ?? null) . '/' . basename(__FILE__));
     }
-
-?>
diff --git a/share/templates/roundcubemail/calendar.inc.php.tpl b/share/templates/roundcubemail/calendar.inc.php.tpl
index 768007a..ad46b67 100644
--- a/share/templates/roundcubemail/calendar.inc.php.tpl
+++ b/share/templates/roundcubemail/calendar.inc.php.tpl
@@ -1,73 +1,71 @@
 <?php
     \$config['calendar_driver'] = "kolab";
     \$config['calendar_default_view'] = "agendaWeek";
     \$config['calendar_timeslots'] = 2;
     \$config['calendar_first_day'] = 1;
     \$config['calendar_first_hour'] = 6;
     \$config['calendar_work_start'] = 6;
     \$config['calendar_work_end'] = 18;
     \$config['calendar_event_coloring'] = 0;
     \$config['calendar_caldav_url'] = 'http://%h/iRony/calendars/%u/%i';
 
     \$config['calendar_itip_smtp_server'] = '';
     \$config['calendar_itip_smtp_user'] = '';
     \$config['calendar_itip_smtp_pass'] = '';
 
     \$config['calendar_itip_send_option'] = 3;
     \$config['calendar_itip_after_action'] = 0;
 
     \$config['calendar_freebusy_trigger'] = false;
 
     \$config['kolab_invitation_calendars'] = false;
 
     \$config['calendar_contact_birthdays'] = true;
 
     \$config['calendar_resources_driver'] = 'ldap';
 
-    \$config['calendar_resources_directory'] = array(
+    \$config['calendar_resources_directory'] = [
             'name'                  => 'Kolab Resources',
             'hosts'                 => 'localhost',
             'port'                  => 389,
             'use_tls'               => false,
             'base_dn'               => '$ldap_resource_base_dn',
             'user_specific'         => true,
             'bind_dn'               => '%dn',
             'bind_pass'             => '',
             'search_base_dn'        => '$ldap_user_base_dn',
             'search_bind_dn'        => '$ldap_service_bind_dn',
             'search_bind_pw'        => '$ldap_service_bind_pw',
             'search_filter'         => '(&(objectClass=inetOrgPerson)(mail=%fu))',
             'ldap_version'          => 3,
             'filter'                => '$ldap_resource_filter',
-            'search_fields'         => array('cn'),
-            'sort'                  => array('cn'),
+            'search_fields'         => ['cn'],
+            'sort'                  => ['cn'],
             'scope'                 => 'sub',
             'fuzzy_search'          => true,
-            'fieldmap'              => array(
+            'fieldmap'              => [
                     // Internal     => LDAP
                     'name'          => 'cn',
                     'email'         => 'mail',
                     'owner'         => 'owner',
                     'description'   => 'description',
                     'attributes'    => 'kolabdescattribute',
                     'members'       => 'uniquemember',
                     // these mappings are required for owner display
                     'phone'         => 'telephoneNumber',
                     'mobile'        => 'mobile',
-                ),
+            ],
 
-            'class_type_map'        => array(
+            'class_type_map'        => [
                     'kolabsharedfolder'     => 'resource',
                     'groupofuniquenames'    => 'collection',
-                ),
+            ],
 
-            'groups'                => array(
+            'groups'                => [
                     'name_attr'     => 'cn',
-                ),
-        );
+            ],
+    ];
 
-    if (file_exists(RCUBE_CONFIG_DIR . '/' . (\$_SERVER["HTTP_HOST"] ?? null) . '/' . basename(__FILE__))) {
-        include_once(RCUBE_CONFIG_DIR . '/' . (\$_SERVER["HTTP_HOST"] ?? null) . '/' . basename(__FILE__));
+    if (file_exists(RCUBE_CONFIG_DIR . '/' . (\$_SERVER['HTTP_HOST'] ?? '') . '/' . basename(__FILE__))) {
+        include_once(RCUBE_CONFIG_DIR . '/' . (\$_SERVER['HTTP_HOST'] ?? '') . '/' . basename(__FILE__));
     }
-
-?>
diff --git a/share/templates/roundcubemail/config.inc.php.tpl b/share/templates/roundcubemail/config.inc.php.tpl
index 1ecb95a..dcd944a 100644
--- a/share/templates/roundcubemail/config.inc.php.tpl
+++ b/share/templates/roundcubemail/config.inc.php.tpl
@@ -1,243 +1,243 @@
 <?php
-    \$config = array();
+    \$config = [];
 
     \$config['db_dsnw'] = '$mysql_uri';
 
     \$config['des_key'] = "$des_key";
     \$config['session_domain'] = '';
     \$config['username_domain'] = '$primary_domain';
     \$config['use_secure_urls'] = true;
     \$config['assets_path'] = '/roundcubemail/assets/';
     \$config['assets_dir'] = '/usr/share/roundcubemail/public_html/assets/';
 
     \$config['mail_domain'] = '';
 
     // IMAP Server Settings
     \$config['default_host'] = 'ssl://localhost';
     \$config['default_port'] = 9993;
     \$config['imap_delimiter'] = '/';
     \$config['imap_force_lsub'] = true;
 
     // IMAP Connection TLS settings, adjust for Production
     // Required for PHP >= 5.6
-    \$config['imap_conn_options'] = Array(
-            'ssl' => Array(
+    \$config['imap_conn_options'] = [
+            'ssl' => [
                     'verify_peer_name' => false,
                     'verify_peer' => false,
                     'allow_self_signed' => true
-            )
-    );
+            ]
+    ];
 
     // Caching and storage settings
     \$config['imap_cache'] = 'db';
     \$config['imap_cache_ttl'] = '10d';
     \$config['messages_cache'] = 'db';
     \$config['message_cache_ttl'] = '10d';
     \$config['session_storage'] = 'db';
 
     // SMTP Server Settings
     \$config['smtp_server'] = 'tls://localhost';
     \$config['smtp_port'] = 587;
     \$config['smtp_user'] = '%u';
     \$config['smtp_pass'] = '%p';
-    \$config['smtp_helo_host'] = \$_SERVER["HTTP_HOST"] ?? null;
+    \$config['smtp_helo_host'] = \$_SERVER['HTTP_HOST'] ?? null;
 
     // SMTP Connection TLS settings, adjust for Production
     // Required for PHP >= 5.6
-    \$config['smtp_conn_options'] = Array(
-            'ssl' => Array(
+    \$config['smtp_conn_options'] = [
+            'ssl' => [
                     'verify_peer_name' => false,
                     'verify_peer' => false,
                     'allow_self_signed' => true
-            )
-    );
+            ]
+    ];
 
     // LDAP Settings
     \$config['ldap_cache'] = 'db';
     \$config['ldap_cache_ttl'] = '1h';
 
     // Kolab specific defaults
     \$config['product_name'] = 'Kolab Groupware';
     \$config['quota_zero_as_unlimited'] = false;
     \$config['login_lc'] = 2;
     \$config['auto_create_user'] = true;
     \$config['enable_installer'] = false;
     // The SMTP server does not allow empty identities
     \$config['mdn_use_from'] = true;
 
     // Plugins
-    \$config['plugins'] = array(
+    \$config['plugins'] = [
             'kolab_auth',
             'acl',
             'archive',
             'calendar',
             'jqueryui',
             'kolab_activesync',
             'kolab_addressbook',
             'kolab_config',
             'kolab_delegation',
             'kolab_files',
             'kolab_folders',
             'kolab_notes',
             'kolab_tags',
             'managesieve',
             'newmail_notifier',
             'odfviewer',
             'password',
             'redundant_attachments',
             'tasklist',
             // contextmenu must be after kolab_addressbook (#444)
             'contextmenu',
-    );
+    ];
 
     // Do not show deleted messages, mark deleted messages as read,
     // and flag them as deleted instead of moving them to the Trash
     // folder.
     \$config['skip_deleted'] = true;
     \$config['read_when_deleted'] = true;
     \$config['flag_for_deletion'] = true;
     \$config['delete_always'] = true;
 
     \$config['session_lifetime'] = 180;
     \$config['password_charset'] = 'UTF-8';
     \$config['useragent'] = 'Kolab 16/Roundcube ' . RCUBE_VERSION;
 
     \$config['message_sort_col'] = 'date';
 
     \$config['spellcheck_engine'] = 'pspell';
     \$config['spellcheck_dictionary'] = true;
     \$config['spellcheck_ignore_caps'] = true;
     \$config['spellcheck_ignore_nums'] = true;
     \$config['spellcheck_ignore_syms'] = true;
-    \$config['spellcheck_languages'] = array(
+    \$config['spellcheck_languages'] = [
             'da' => 'Dansk',
             'de' => 'Deutsch',
             'en' => 'English',
             'es' => 'Español',
             'fr' => 'Français',
             'it' => 'Italiano',
             'nl' => 'Nederlands',
             'pt' => 'Português',
             'ru' => 'Русский',
             'sv' => 'Svenska'
-        );
+    ];
 
     \$config['undo_timeout'] = 10;
     \$config['address_template'] = '{street}<br/>{locality} {zipcode}<br/>{country} {region}';
     \$config['mail_read_time'] = 0;
 
     \$config['autoexpand_threads'] = 2;
     \$config['top_posting'] = 0;
     \$config['sig_above'] = false;
     \$config['mdn_requests'] = 0;
     \$config['mdn_default'] = false;
     \$config['dsn_default'] = false;
     \$config['reply_same_folder'] = false;
     \$config['htmleditor'] = 0;
 
-    if (file_exists(RCUBE_CONFIG_DIR . '/' . (\$_SERVER["HTTP_HOST"] ?? null) . '/' . basename(__FILE__))) {
-        include_once(RCUBE_CONFIG_DIR . '/' . (\$_SERVER["HTTP_HOST"] ?? null) . '/' . basename(__FILE__));
+    if (file_exists(RCUBE_CONFIG_DIR . '/' . (\$_SERVER['HTTP_HOST'] ?? '') . '/' . basename(__FILE__))) {
+        include_once(RCUBE_CONFIG_DIR . '/' . (\$_SERVER['HTTP_HOST'] ?? '') . '/' . basename(__FILE__));
     }
 
     // Re-apply mandatory settings here.
 
     \$config['devel_mode'] = false;
     \$config['log_driver'] = 'file';
     \$config['log_date_format'] = 'd-M-Y H:i:s,u O';
     \$config['syslog_id'] = 'roundcube';
     \$config['syslog_facility'] = LOG_USER;
 
     \$config['sql_debug'] = false;
     \$config['memcache_debug'] = false;
     \$config['imap_debug'] = false;
     \$config['ldap_debug'] = false;
     \$config['smtp_debug'] = false;
 
     \$config['smtp_log'] = false;
     \$config['log_logins'] = true;
     \$config['log_session'] = false;
 
     \$config['skin'] = '$skin';
     \$config['skin_include_php'] = false;
     \$config['mime_magic'] = null;
     \$config['im_identify_path'] = '/usr/bin/identify';
     \$config['im_convert_path'] = '/usr/bin/convert';
     \$config['log_dir'] = 'logs/';
     \$config['temp_dir'] = '/var/lib/roundcubemail/';
 
     // Some additional default folders (archive plugin)
     \$config['archive_mbox'] = 'Archive';
     // The Kolab daemon by default creates 'Spam'
     \$config['junk_mbox'] = 'Spam';
 
     \$config['address_book_type'] = 'ldap';
     \$config['autocomplete_min_length'] = 3;
     \$config['autocomplete_threads'] = 0;
     \$config['autocomplete_max'] = 15;
-    \$config['ldap_public'] = array(
-            'kolab_addressbook' => array(
+    \$config['ldap_public'] = [
+            'kolab_addressbook' => [
                     'name'                      => 'Global Address Book',
-                    'hosts'                     => Array('localhost'),
+                    'hosts'                     => ['localhost'],
                     'port'                      => 389,
                     'use_tls'                   => false,
                     'base_dn'                   => '$ldap_user_base_dn',
                     'user_specific'             => true,
                     'bind_dn'                   => '%dn',
                     'bind_pass'                 => '',
                     'search_base_dn'            => '$ldap_user_base_dn',
                     'search_bind_dn'            => '$ldap_service_bind_dn',
                     'search_bind_pw'            => '$ldap_service_bind_pw',
                     'search_filter'             => '(&(objectClass=inetOrgPerson)(mail=%fu))',
                     'writable'                  => false,
-                    'LDAP_Object_Classes'       => array("top", "inetOrgPerson"),
-                    'required_fields'           => array("cn", "sn", "mail"),
+                    'LDAP_Object_Classes'       => ["top", "inetOrgPerson"],
+                    'required_fields'           => ["cn", "sn", "mail"],
                     'LDAP_rdn'                  => 'uid',
-                    'ldap_version'              => 3,       // using LDAPv3
-                    'search_fields'             => array('displayname', 'mail'),
-                    'sort'                      => array('displayname', 'sn', 'givenname', 'cn'),
+                    'ldap_version'              => 3,
+                    'search_fields'             => ['displayname', 'mail'],
+                    'sort'                      => ['displayname', 'sn', 'givenname', 'cn'],
                     'scope'                     => 'sub',
                     'filter'                    => '(objectClass=inetOrgPerson)',
                     'vlv'                       => false,
                     'vlv_search'                => false,
                     'fuzzy_search'              => true,
                     'sizelimit'                 => '0',
                     'timelimit'                 => '0',
-                    'fieldmap'                  => Array(
-                            // Roundcube        => LDAP
-                            'name'              => 'displayName',
-                            'surname'           => 'sn',
-                            'firstname'         => 'givenName',
-                            'middlename'        => 'initials',
-                            'email:primary'     => 'mail',
-                            'email:alias'       => 'alias',
-                            'email:personal'    => 'mailalternateaddress',
-                            'phone:main'        => 'telephoneNumber',
-                            'phone:work'        => 'alternateTelephoneNumber',
-                            'phone:mobile'      => 'mobile',
-                            'phone:work2'       => 'blackberry',
-                            'jobtitle'          => 'title',
-                            'manager'           => 'manager',
-                            'assistant'         => 'secretary',
-                            'photo'             => 'jpegphoto'
-                        ),
-                    'groups'                    => Array(
-                            'base_dn'           => '$ldap_group_base_dn',
-                            'filter'            => '(&' . '$ldap_group_filter' . '(mail=*))',
-                            'object_classes'    => Array("top", "groupOfUniqueNames"),
-                            'member_attr'       => 'uniqueMember',
-                        ),
-                ),
-        );
-
-    \$config['autocomplete_addressbooks'] = Array(
+                    'fieldmap'                  => [
+                            // Roundcube => LDAP
+                            'name'           => 'displayName',
+                            'surname'        => 'sn',
+                            'firstname'      => 'givenName',
+                            'middlename'     => 'initials',
+                            'email:primary'  => 'mail',
+                            'email:alias'    => 'alias',
+                            'email:personal' => 'mailalternateaddress',
+                            'phone:main'     => 'telephoneNumber',
+                            'phone:work'     => 'alternateTelephoneNumber',
+                            'phone:mobile'   => 'mobile',
+                            'phone:work2'    => 'blackberry',
+                            'jobtitle'       => 'title',
+                            'manager'        => 'manager',
+                            'assistant'      => 'secretary',
+                            'photo'          => 'jpegphoto'
+                    ],
+                    'groups'                    => [
+                            'base_dn'        => '$ldap_group_base_dn',
+                            'filter'         => '(&' . '$ldap_group_filter' . '(mail=*))',
+                            'object_classes' => ["top", "groupOfUniqueNames"],
+                            'member_attr'    => 'uniqueMember',
+                    ],
+            ],
+    ];
+
+    \$config['autocomplete_addressbooks'] = [
             'kolab_addressbook'
-    );
+    ];
 
     \$config['autocomplete_single'] = true;
 
-    \$config['kolab_http_request'] = Array(
+    \$config['kolab_http_request'] = [
             'ssl_verify_host' => false,
             'ssl_verify_peer' => false,
-    );
+    ];
 
     @include('/etc/roundcubemail/kolab_syncroton.inc.php');
diff --git a/share/templates/roundcubemail/kolab_addressbook.inc.php.tpl b/share/templates/roundcubemail/kolab_addressbook.inc.php.tpl
index f19c86a..d8a856d 100644
--- a/share/templates/roundcubemail/kolab_addressbook.inc.php.tpl
+++ b/share/templates/roundcubemail/kolab_addressbook.inc.php.tpl
@@ -1,20 +1,18 @@
 <?php
 
 
 // This option allows to set addressbooks priority or to disable some
 // of them. Disabled addressbooks will be not shown in the UI. Default: 0.
 // 0 - "Global address book(s) first". Use all address books, starting with the global (LDAP)
 // 1 - "Personal address book(s) first". Use all address books, starting with the personal (Kolab)
 // 2 - "Global address book(s) only". Use the global (LDAP) addressbook. Disable the personal.
 // 3 - "Personal address book(s) only". Use the personal (Kolab) addressbook(s). Disable the global.
 \$config['kolab_addressbook_prio'] = 0;
 
 // Base URL to build fully qualified URIs to access address books via CardDAV
 // The following replacement variables are supported:
 // %h - Current HTTP host
 // %u - Current webmail user name
 // %n - Folder name
 // %i - Folder UUID
 \$config['kolab_addressbook_carddav_url'] = 'http://%h/iRony/addressbooks/%u/%i';
-
-?>
diff --git a/share/templates/roundcubemail/kolab_auth.inc.php.tpl b/share/templates/roundcubemail/kolab_auth.inc.php.tpl
index f558bd5..7cda66a 100644
--- a/share/templates/roundcubemail/kolab_auth.inc.php.tpl
+++ b/share/templates/roundcubemail/kolab_auth.inc.php.tpl
@@ -1,70 +1,68 @@
 <?php
 
     // The id of the LDAP address book (which refers to the rcmail_config['ldap_public'])
     // or complete addressbook definition array.
-    \$config['kolab_auth_addressbook'] = Array(
-        'name'                      => 'Kolab Auth',
-        'hosts'                     => Array('localhost'),
-        'port'                      => 389,
-        'use_tls'                   => false,
-        'user_specific'             => false,
-        'base_dn'                   => '$ldap_user_base_dn',
-        'bind_dn'                   => '$ldap_service_bind_dn',
-        'bind_pass'                 => '$ldap_service_bind_pw',
-        'writable'                  => false,
-        'ldap_version'              => 3,       // using LDAPv3
-        'fieldmap'                  => Array(
-                'name'              => 'displayname',
-                'email'             => 'mail',
-                'email:alias'       => 'alias',
-                'role'              => 'nsroledn',
-            ),
-        'sort'                      => 'displayname',
-        'scope'                     => 'sub',
-        'filter'                    => '(objectClass=*)',
-        'fuzzy_search'              => true,
-        'sizelimit'                 => '0',
-        'timelimit'                 => '0',
-        'groups'                    => Array(
-                'base_dn'           => '$ldap_group_base_dn',
-                'filter'            => '$ldap_group_filter',
-                'object_classes'    => Array('top', 'groupOfUniqueNames'),
-                'member_attr'       => 'uniqueMember',
-            ),
-    );
+    \$config['kolab_auth_addressbook'] = [
+        'name'              => 'Kolab Auth',
+        'hosts'             => ['localhost'],
+        'port'              => 389,
+        'use_tls'           => false,
+        'user_specific'     => false,
+        'base_dn'           => '$ldap_user_base_dn',
+        'bind_dn'           => '$ldap_service_bind_dn',
+        'bind_pass'         => '$ldap_service_bind_pw',
+        'writable'          => false,
+        'ldap_version'      => 3,
+        'fieldmap'          => [
+                'name'          => 'displayname',
+                'email'         => 'mail',
+                'email:alias'   => 'alias',
+                'role'          => 'nsroledn',
+        ],
+        'sort'              => 'displayname',
+        'scope'             => 'sub',
+        'filter'            => '(objectClass=*)',
+        'fuzzy_search'      => true,
+        'sizelimit'         => '0',
+        'timelimit'         => '0',
+        'groups'            => [
+                'base_dn'        => '$ldap_group_base_dn',
+                'filter'         => '$ldap_group_filter',
+                'object_classes' => ['top', 'groupOfUniqueNames'],
+                'member_attr'    => 'uniqueMember',
+        ],
+    ];
 
 
     // This will overwrite defined filter
     \$config['kolab_auth_filter'] = '(&' . '$ldap_user_filter' . '(|(uid=%u)(mail=%fu)(alias=%fu)))';
 
     // Use this fields (from fieldmap configuration) to get authentication ID
     \$config['kolab_auth_login'] = 'email';
 
     // Use this fields (from fieldmap configuration) for default identity
     \$config['kolab_auth_name']  = 'name';
     \$config['kolab_auth_alias'] = 'alias';
     \$config['kolab_auth_email'] = 'email';
 
-    if (preg_match('/\/helpdesk-login\//', \$_SERVER["REQUEST_URI"] ?? null) ) {
+    if (preg_match('/\/helpdesk-login\//', \$_SERVER['REQUEST_URI'] ?? '')) {
 
         // Login and password of the admin user. Enables "Login As" feature.
         \$config['kolab_auth_admin_login']    = '$imap_admin_login';
         \$config['kolab_auth_admin_password'] = '$imap_admin_password';
 
         \$config['kolab_auth_auditlog'] = true;
     }
 
     // Administrative role field (from fieldmap configuration) which must be filled with
     // specified value which adds privilege to login as another user.
     \$config['kolab_auth_role']       = 'role';
     \$config['kolab_auth_role_value'] = 'cn=kolab-admin,$ldap_base_dn';
 
     // Administrative group name to which user must be assigned to
     // which adds privilege to login as another user.
     \$config['kolab_auth_group'] = 'Kolab Helpdesk';
 
-    if (file_exists(RCUBE_CONFIG_DIR . '/' . (\$_SERVER["HTTP_HOST"] ?? null) . '/' . basename(__FILE__))) {
-        include_once(RCUBE_CONFIG_DIR . '/' . (\$_SERVER["HTTP_HOST"] ?? null). '/' . basename(__FILE__));
+    if (file_exists(RCUBE_CONFIG_DIR . '/' . (\$_SERVER["HTTP_HOST"] ?? '') . '/' . basename(__FILE__))) {
+        include_once(RCUBE_CONFIG_DIR . '/' . (\$_SERVER["HTTP_HOST"] ?? ''). '/' . basename(__FILE__));
     }
-
-?>
diff --git a/share/templates/roundcubemail/kolab_delegation.inc.php.tpl b/share/templates/roundcubemail/kolab_delegation.inc.php.tpl
index 29bec24..b206f86 100644
--- a/share/templates/roundcubemail/kolab_delegation.inc.php.tpl
+++ b/share/templates/roundcubemail/kolab_delegation.inc.php.tpl
@@ -1,14 +1,13 @@
 <?php
     // This will overwrite defined LDAP filter
     // Note: LDAP addressbook defined for kolab_auth plugin is used
     \$config['kolab_delegation_filter'] = '(|(objectClass=kolabInetOrgPerson)(&(objectclass=kolabsharedfolder)(kolabFolderType=mail)))';
 
     // Delegates field (from fieldmap configuration) to get delegates list
     // Note: This is a field name, not LDAP attribute name
     // Note: LDAP addressbook defined for kolab_auth plugin is used
     \$config['kolab_delegation_delegate_field'] = 'kolabDelegate';
 
     // Remove all user identities which do not match the users primary or alias
     // addresses and delegators addresses
     \$config['kolab_delegation_purge_identities'] = false;
-?>
diff --git a/share/templates/roundcubemail/kolab_files.inc.php.tpl b/share/templates/roundcubemail/kolab_files.inc.php.tpl
index 5720ee9..4e075ea 100644
--- a/share/templates/roundcubemail/kolab_files.inc.php.tpl
+++ b/share/templates/roundcubemail/kolab_files.inc.php.tpl
@@ -1,28 +1,27 @@
 <?php
 
 // URL of kolab-chwala installation
 \$config['kolab_files_url'] = '/chwala/';
 
 // List of files list columns. Available are: name, size, mtime, type
-\$config['kolab_files_list_cols'] = array('name', 'mtime', 'size');
+\$config['kolab_files_list_cols'] = ['name', 'mtime', 'size'];
 
 // Name of the column to sort files list by
 \$config['kolab_files_sort_col'] = 'name';
 
 // Order of the files list sort
 \$config['kolab_files_sort_order'] = 'asc';
 
 // Number of concurent requests for searching and collections listing. Default: 1
 \$config['kolab_files_search_threads'] = 1;
 
 // LDAP addressbook that would be searched for user names autocomplete.
 // That should be an array refering to the \$config['ldap_public'] array key
 // or complete addressbook configuration array.
 \$config['kolab_files_users_source'] = 'kolab_addressbook';
 
 // The LDAP attribute which will be used as ACL user identifier
 \$config['kolab_files_users_field'] = 'mail';
 
 // The LDAP search filter will be combined with search queries
 \$config['kolab_files_users_filter'] = '';
-?>
diff --git a/share/templates/roundcubemail/kolab_folders.inc.php.tpl b/share/templates/roundcubemail/kolab_folders.inc.php.tpl
index f12a195..cefc5d6 100644
--- a/share/templates/roundcubemail/kolab_folders.inc.php.tpl
+++ b/share/templates/roundcubemail/kolab_folders.inc.php.tpl
@@ -1,21 +1,19 @@
 <?php
     \$config['kolab_folders_configuration_default'] = 'Configuration';
     \$config['kolab_folders_event_default'] = 'Calendar';
     \$config['kolab_folders_contact_default'] = 'Contacts';
     \$config['kolab_folders_task_default'] = 'Tasks';
     \$config['kolab_folders_note_default'] = 'Notes';
     \$config['kolab_folders_file_default'] = 'Files';
     \$config['kolab_folders_freebusy_default'] = 'Freebusy';
     \$config['kolab_folders_journal_default'] = 'Journal';
     \$config['kolab_folders_mail_inbox'] = 'INBOX';
     \$config['kolab_folders_mail_drafts'] = 'Drafts';
     \$config['kolab_folders_mail_sentitems'] = 'Sent';
     \$config['kolab_folders_mail_junkemail'] = 'Spam';
     \$config['kolab_folders_mail_outbox'] = '';
     \$config['kolab_folders_mail_wastebasket'] = 'Trash';
 
-    if (file_exists(RCUBE_CONFIG_DIR . '/' . (\$_SERVER["HTTP_HOST"] ?? null) . '/' . basename(__FILE__))) {
-        include_once(RCUBE_CONFIG_DIR . '/' . (\$_SERVER["HTTP_HOST"] ?? null) . '/' . basename(__FILE__));
+    if (file_exists(RCUBE_CONFIG_DIR . '/' . (\$_SERVER['HTTP_HOST'] ?? '') . '/' . basename(__FILE__))) {
+        include_once(RCUBE_CONFIG_DIR . '/' . (\$_SERVER['HTTP_HOST'] ?? '') . '/' . basename(__FILE__));
     }
-
-?>
diff --git a/share/templates/roundcubemail/libkolab.inc.php.tpl b/share/templates/roundcubemail/libkolab.inc.php.tpl
index b3bb596..4118960 100644
--- a/share/templates/roundcubemail/libkolab.inc.php.tpl
+++ b/share/templates/roundcubemail/libkolab.inc.php.tpl
@@ -1,16 +1,14 @@
 <?php
 
     \$config['kolab_freebusy_server'] = '/freebusy';
 
-    if (file_exists(RCUBE_CONFIG_DIR . '/' . (\$_SERVER["HTTP_HOST"] ?? null) . '/' . basename(__FILE__))) {
-        include_once(RCUBE_CONFIG_DIR . '/' . (\$_SERVER["HTTP_HOST"] ?? null) . '/' . basename(__FILE__));
+    if (file_exists(RCUBE_CONFIG_DIR . '/' . (\$_SERVER['HTTP_HOST'] ?? '') . '/' . basename(__FILE__))) {
+        include_once(RCUBE_CONFIG_DIR . '/' . (\$_SERVER['HTTP_HOST'] ?? '') . '/' . basename(__FILE__));
     }
 
     \$config['kolab_cache'] = true;
 
     \$config['kolab_ssl_verify_host'] = false;
     \$config['kolab_ssl_verify_peer'] = false;
 
     \$config['kolab_use_subscriptions'] = true;
-
-?>
diff --git a/share/templates/roundcubemail/managesieve.inc.php.tpl b/share/templates/roundcubemail/managesieve.inc.php.tpl
index f7f1c10..52a31b0 100644
--- a/share/templates/roundcubemail/managesieve.inc.php.tpl
+++ b/share/templates/roundcubemail/managesieve.inc.php.tpl
@@ -1,31 +1,29 @@
 <?php
     \$config['managesieve_port'] = 4190;
     \$config['managesieve_host'] = '%h';
     \$config['managesieve_auth_type'] = 'PLAIN';
     \$config['managesieve_auth_cid'] = null;
     \$config['managesieve_auth_pw'] = null;
     \$config['managesieve_usetls'] = true;
     \$config['managesieve_default'] = '/etc/dovecot/sieve/global';
     \$config['managesieve_mbox_encoding'] = 'UTF-8';
     \$config['managesieve_replace_delimiter'] = '';
-    \$config['managesieve_disabled_extensions'] = array();
+    \$config['managesieve_disabled_extensions'] = [];
     \$config['managesieve_debug'] = false;
     \$config['managesieve_vacation'] = 1;
 
     \$config['managesieve_filename_extension'] = '';
     \$config['managesieve_kolab_master'] = true;
 
     // ManageSieve Connection TLS settings, adjust for Production
-    \$config['managesieve_conn_options'] = Array(
-            'ssl' => Array(
+    \$config['managesieve_conn_options'] = [
+            'ssl' => [
                     'verify_peer_name' => false,
                     'verify_peer' => false,
                     'allow_self_signed' => true
-                )
-        );
+            ]
+    ];
 
-    if (file_exists(RCUBE_CONFIG_DIR . '/' . (\$_SERVER["HTTP_HOST"] ?? null) . '/' . basename(__FILE__))) {
-        include_once(RCUBE_CONFIG_DIR . '/' . (\$_SERVER["HTTP_HOST"] ?? null) . '/' . basename(__FILE__));
+    if (file_exists(RCUBE_CONFIG_DIR . '/' . (\$_SERVER['HTTP_HOST'] ?? '') . '/' . basename(__FILE__))) {
+        include_once(RCUBE_CONFIG_DIR . '/' . (\$_SERVER['HTTP_HOST'] ?? '') . '/' . basename(__FILE__));
     }
-
-?>
diff --git a/share/templates/roundcubemail/mimetypes.php.tpl b/share/templates/roundcubemail/mimetypes.php.tpl
index d404c1f..b30e169 100644
--- a/share/templates/roundcubemail/mimetypes.php.tpl
+++ b/share/templates/roundcubemail/mimetypes.php.tpl
@@ -1,49 +1,47 @@
 <?php
 
-return array(
+return [
   'xls' => 'application/vnd.ms-excel',
   'xlm' => 'application/vnd.ms-excel',
   'xla' => 'application/vnd.ms-excel',
   'xlc' => 'application/vnd.ms-excel',
   'xlt' => 'application/vnd.ms-excel',
   'xlw' => 'application/vnd.ms-excel',
   'pdf' => 'application/pdf',
   'ppt' => 'application/vnd.ms-powerpoint',
   'pps' => 'application/vnd.ms-powerpoint',
   'pot' => 'application/vnd.ms-powerpoint',
   'doc' => 'application/msword',
   'dot' => 'application/msword',
   'odc' => 'application/vnd.oasis.opendocument.chart',
   'otc' => 'application/vnd.oasis.opendocument.chart-template',
   'odf' => 'application/vnd.oasis.opendocument.formula',
   'otf' => 'application/vnd.oasis.opendocument.formula-template',
   'odg' => 'application/vnd.oasis.opendocument.graphics',
   'otg' => 'application/vnd.oasis.opendocument.graphics-template',
   'odi' => 'application/vnd.oasis.opendocument.image',
   'oti' => 'application/vnd.oasis.opendocument.image-template',
   'odp' => 'application/vnd.oasis.opendocument.presentation',
   'otp' => 'application/vnd.oasis.opendocument.presentation-template',
   'ods' => 'application/vnd.oasis.opendocument.spreadsheet',
   'ots' => 'application/vnd.oasis.opendocument.spreadsheet-template',
   'odt' => 'application/vnd.oasis.opendocument.text',
   'otm' => 'application/vnd.oasis.opendocument.text-master',
   'ott' => 'application/vnd.oasis.opendocument.text-template',
   'oth' => 'application/vnd.oasis.opendocument.text-web',
   'docm' => 'application/vnd.ms-word.document.macroEnabled.12',
   'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
   'dotm' => 'application/vnd.ms-word.template.macroEnabled.12',
   'dotx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
   'ppsm' => 'application/vnd.ms-powerpoint.slideshow.macroEnabled.12',
   'ppsx' => 'application/vnd.openxmlformats-officedocument.presentationml.slideshow',
   'pptm' => 'application/vnd.ms-powerpoint.presentation.macroEnabled.12',
   'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
   'xlsb' => 'application/vnd.ms-excel.sheet.binary.macroEnabled.12',
   'xlsm' => 'application/vnd.ms-excel.sheet.macroEnabled.12',
   'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
   'xps' => 'application/vnd.ms-xpsdocument',
   'rar' => 'application/x-rar-compressed',
   'vcf' => 'text/vcard',
   'ics' => 'text/calendar',
-);
-
-?>
\ No newline at end of file
+];
diff --git a/share/templates/roundcubemail/password.inc.php.tpl b/share/templates/roundcubemail/password.inc.php.tpl
index d7a2354..baef9b1 100644
--- a/share/templates/roundcubemail/password.inc.php.tpl
+++ b/share/templates/roundcubemail/password.inc.php.tpl
@@ -1,155 +1,153 @@
 <?php
 
     // Password Plugin options
     // -----------------------
     // A driver to use for password change. Default: "sql".
     // See README file for list of supported driver names.
     \$config['password_driver'] = 'ldap_simple';
 
     // Determine whether current password is required to change password.
     // Default: false.
     \$config['password_confirm_current'] = true;
 
     // Require the new password to be a certain length.
     // set to blank to allow passwords of any length
     \$config['password_minimum_length'] = 6;
 
     // Require the new password to contain a letter and punctuation character
     // Change to false to remove this check.
     \$config['password_require_nonalpha'] = false;
 
     // Enables logging of password changes into logs/password
     \$config['password_log'] = true;
 
 
     // LDAP and LDAP_SIMPLE Driver options
     // -----------------------------------
     // LDAP server name to connect to.
     // You can provide one or several hosts in an array in which case the hosts are tried from left to right.
-    // Exemple: array('ldap1.exemple.com', 'ldap2.exemple.com');
+    // Exemple: ['ldap1.exemple.com', 'ldap2.exemple.com'];
     // Default: 'localhost'
     \$config['password_ldap_host'] = 'localhost';
 
     // LDAP server port to connect to
     // Default: '389'
     \$config['password_ldap_port'] = '389';
 
     // TLS is started after connecting
     // Using TLS for password modification is recommended.
     // Default: false
     \$config['password_ldap_starttls'] = false;
 
     // LDAP version
     // Default: '3'
     \$config['password_ldap_version'] = '3';
 
     // LDAP base name (root directory)
     // Exemple: 'dc=exemple,dc=com'
     \$config['password_ldap_basedn'] = '$ldap_user_base_dn';
 
     // LDAP connection method
     // There is two connection method for changing a user's LDAP password.
     // 'user': use user credential (recommended, require password_confirm_current=true)
     // 'admin': use admin credential (this mode require password_ldap_adminDN and password_ldap_adminPW)
     // Default: 'user'
     \$config['password_ldap_method'] = 'user';
 
     // LDAP Admin DN
     // Used only in admin connection mode
     // Default: null
     \$config['password_ldap_adminDN'] = null;
 
     // LDAP Admin Password
     // Used only in admin connection mode
     // Default: null
     \$config['password_ldap_adminPW'] = null;
 
     // LDAP user DN mask
     // The user's DN is mandatory and as we only have his login,
     // we need to re-create his DN using a mask
     // '%login' will be replaced by the current roundcube user's login
     // '%name' will be replaced by the current roundcube user's name part
     // '%domain' will be replaced by the current roundcube user's domain part
     // '%dc' will be replaced by domain name hierarchal string e.g. "dc=test,dc=domain,dc=com"
     // Exemple: 'uid=%login,ou=people,dc=exemple,dc=com'
     // \$config['password_ldap_userDN_mask'] = 'uid=%login,ou=people,dc=exemple,dc=com';
 
     // LDAP search DN
     // The DN roundcube should bind with to find out user's DN
     // based on his login. Note that you should comment out the default
     // password_ldap_userDN_mask setting for this to take effect.
     // Use this if you cannot specify a general template for user DN with
     // password_ldap_userDN_mask. You need to perform a search based on
     // users login to find his DN instead. A common reason might be that
     // your users are placed under different ou's like engineering or
     // sales which cannot be derived from their login only.
     \$config['password_ldap_searchDN'] = '$ldap_service_bind_dn';
 
     // LDAP search password
     // If password_ldap_searchDN is set, the password to use for
     // binding to search for user's DN. Note that you should comment out the default
     // password_ldap_userDN_mask setting for this to take effect.
     // Warning: Be sure to set approperiate permissions on this file so this password
     // is only accesible to roundcube and don't forget to restrict roundcube's access to
     // your directory as much as possible using ACLs. Should this password be compromised
     // you want to minimize the damage.
     \$config['password_ldap_searchPW'] = '$ldap_service_bind_pw';
 
     // LDAP search base
     // If password_ldap_searchDN is set, the base to search in using the filter below.
     // Note that you should comment out the default password_ldap_userDN_mask setting
     // for this to take effect.
     \$config['password_ldap_search_base'] = '$ldap_user_base_dn';
 
     // LDAP search filter
     // If password_ldap_searchDN is set, the filter to use when
     // searching for user's DN. Note that you should comment out the default
     // password_ldap_userDN_mask setting for this to take effect.
     // '%login' will be replaced by the current roundcube user's login
     // '%name' will be replaced by the current roundcube user's name part
     // '%domain' will be replaced by the current roundcube user's domain part
     // '%dc' will be replaced by domain name hierarchal string e.g. "dc=test,dc=domain,dc=com"
     // Example: '(uid=%login)'
     // Example: '(&(objectClass=posixAccount)(uid=%login))'
     \$config['password_ldap_search_filter'] = '(&(|(uid=%login)(mail=%login)(mailAlternateAddress=%login)(alias=%login))(objectclass=kolabinetorgperson))';
 
     // LDAP password hash type
     // Standard LDAP encryption type which must be one of: crypt,
     // ext_des, md5crypt, blowfish, md5, sha, smd5, ssha, or clear.
     // Please note that most encodage types require external libraries
     // to be included in your PHP installation, see function hashPassword in drivers/ldap.php for more info.
     // Default: 'crypt'
     \$config['password_ldap_encodage'] = 'clear';
 
     // LDAP password attribute
     // Name of the ldap's attribute used for storing user password
     // Default: 'userPassword'
     \$config['password_ldap_pwattr'] = 'userPassword';
 
     // LDAP password force replace
     // Force LDAP replace in cases where ACL allows only replace not read
     // See http://pear.php.net/package/Net_LDAP2/docs/latest/Net_LDAP2/Net_LDAP2_Entry.html#methodreplace
     // Default: true
     \$config['password_ldap_force_replace'] = true;
 
     // LDAP Password Last Change Date
     // Some places use an attribute to store the date of the last password change
     // The date is meassured in "days since epoch" (an integer value)
     // Whenever the password is changed, the attribute will be updated if set (e.g. shadowLastChange)
     \$config['password_ldap_lchattr'] = '';
 
     // LDAP Samba password attribute, e.g. sambaNTPassword
     // Name of the LDAP's Samba attribute used for storing user password
     \$config['password_ldap_samba_pwattr'] = '';
 
     // LDAP Samba Password Last Change Date attribute, e.g. sambaPwdLastSet
     // Some places use an attribute to store the date of the last password change
     // The date is meassured in "seconds since epoch" (an integer value)
     // Whenever the password is changed, the attribute will be updated if set
     \$config['password_ldap_samba_lchattr'] = '';
 
-    if (file_exists(RCUBE_CONFIG_DIR . '/' . (\$_SERVER["HTTP_HOST"] ?? null) . '/' . basename(__FILE__))) {
-        include_once(RCUBE_CONFIG_DIR . '/' . (\$_SERVER["HTTP_HOST"] ?? null) . '/' . basename(__FILE__));
+    if (file_exists(RCUBE_CONFIG_DIR . '/' . (\$_SERVER['HTTP_HOST'] ?? '') . '/' . basename(__FILE__))) {
+        include_once(RCUBE_CONFIG_DIR . '/' . (\$_SERVER['HTTP_HOST'] ?? '') . '/' . basename(__FILE__));
     }
-
-?>
diff --git a/share/templates/roundcubemail/recipient_to_contact.inc.php.tpl b/share/templates/roundcubemail/recipient_to_contact.inc.php.tpl
index b41ad79..606c7db 100644
--- a/share/templates/roundcubemail/recipient_to_contact.inc.php.tpl
+++ b/share/templates/roundcubemail/recipient_to_contact.inc.php.tpl
@@ -1,4 +1,3 @@
 <?php
-    \$config['recipient_to_contact_addressbooks'] = array();
+    \$config['recipient_to_contact_addressbooks'] = [];
     \$config['recipient_to_contact_enabled_by_default'] = true;
-?>
\ No newline at end of file
diff --git a/share/templates/roundcubemail/terms.inc.php.tpl b/share/templates/roundcubemail/terms.inc.php.tpl
index 7d19e02..a4e91bf 100644
--- a/share/templates/roundcubemail/terms.inc.php.tpl
+++ b/share/templates/roundcubemail/terms.inc.php.tpl
@@ -1,22 +1,20 @@
 <?php
 
     /* terms plugin */
 
     // log accepted terms
     \$config['terms_log'] = true;
 
     // renew agreement if older than YYYY-MM-DD HH:MM:SS
     // NOTICE: Must be in past and set accordingly to server Timezone!!!
     \$config['terms_date'] = '2011-02-24 00:00:00';
 
     // renew agreement automatically afer x days
     \$config['terms_renew'] = 28; // 0 = never
 
     // always request terms agreement after login
     \$config['terms_always'] = false;
 
-    if (file_exists(RCUBE_CONFIG_DIR . '/' . (\$_SERVER["HTTP_HOST"] ?? null) . '/' . basename(__FILE__))) {
-        include_once(RCUBE_CONFIG_DIR . '/' . (\$_SERVER["HTTP_HOST"] ?? null) . '/' . basename(__FILE__));
+    if (file_exists(RCUBE_CONFIG_DIR . '/' . (\$_SERVER['HTTP_HOST'] ?? '') . '/' . basename(__FILE__))) {
+        include_once(RCUBE_CONFIG_DIR . '/' . (\$_SERVER['HTTP_HOST'] ?? '') . '/' . basename(__FILE__));
     }
-
-?>