diff --git a/UI/Templates/ContactsUI/UIxContactFoldersView.wox b/UI/Templates/ContactsUI/UIxContactFoldersView.wox
index 4cfbf526c..29bba5c2a 100644
--- a/UI/Templates/ContactsUI/UIxContactFoldersView.wox
+++ b/UI/Templates/ContactsUI/UIxContactFoldersView.wox
@@ -1,17 +1,17 @@
 <?xml version='1.0' standalone='yes'?>
 <!DOCTYPE var:component>
 <var:component
-    xmlns = "http://www.w3.org/1999/xhtml"
-    xmlns:var = "http://www.skyrix.com/od/binding"
-    xmlns:const = "http://www.skyrix.com/od/constant"
-    xmlns:label = "OGo:label"
-    const:userDefaultsKeys = "SOGoContactsCategories"
-    const:jsFiles = "Common/user-model.js, Common/acl-model.js, Common/resource.js, Contacts/card-model.js, Contacts/addressbook-model.js"
-    className = "UIxPageFrame"
-    title = "name"
-    var:popup = "isPopup">
-  <script type = "text/javascript">
-    var contactFolders =<var:string value = "contactFolders" const:escapeHTML = "NO" />;
+    xmlns="http://www.w3.org/1999/xhtml"
+    xmlns:var="http://www.skyrix.com/od/binding"
+    xmlns:const="http://www.skyrix.com/od/constant"
+    xmlns:label="OGo:label"
+    const:userDefaultsKeys="SOGoContactsCategories"
+    const:jsFiles="Common/user-model.js, Common/acl-model.js, Common/resource.js, Contacts/card-model.js, Contacts/addressbook-model.js"
+    className="UIxPageFrame"
+    title="name"
+    var:popup="isPopup">
+  <script type="text/javascript">
+    var contactFolders =<var:string value="contactFolders" const:escapeHTML="NO" />;
   </script>
 
   <!--
@@ -71,47 +71,47 @@
   <main class="view md-layout-fill" ui-view="addressbooks" layout="row"><!-- addressbooks list --></main>
 
   <!-- TEMPLATE SCRIPT WRAPPER -->
-  <script type = "text/ng-template" id = "UIxContactFoldersView">
+  <script type="text/ng-template" id="UIxContactFoldersView">
 
     <!-- dropdown menu for addressbook options button -->
-    <div id = "addressbookProperties" class = "f-dropdown icons-dropdown">
-      <ul class = "button-group">
-        <li label:tooltip = "Links to this Address Book"
-            tooltip-popup-delay = "500">
-          <span class = "button"
-              sg-dropdown-content-toggle = "#addressbookLinks">
-            <i class = "icon-hyperlink"><!-- links --></i>
+    <div id="addressbookProperties" class="f-dropdown icons-dropdown">
+      <ul class="button-group">
+        <li label:tooltip="Links to this Address Book"
+            tooltip-popup-delay="500">
+          <span class="button"
+              sg-dropdown-content-toggle="#addressbookLinks">
+            <i class="icon-hyperlink"><!-- links --></i>
           </span>
         </li>
-        <li label:tooltip = "Rename"
-            tooltip-popup-delay = "500">
-          <span class = "button" ng-click = "edit()">
-            <i class = "icon-pencil"><!-- rename --></i>
+        <li label:tooltip="Rename"
+            tooltip-popup-delay="500">
+          <span class="button" ng-click="edit()">
+            <i class="icon-pencil"><!-- rename --></i>
           </span>
         </li>
-        <li ng-show = "addressbook.isOwned"
-            label:tooltip = "Sharing..."
-            tooltip-popup-delay = "500">
-          <span class = "button" ng-click = "share()">
-            <i class = "icon-share"><!-- share --></i>
+        <li ng-show="addressbook.isOwned"
+            label:tooltip="Sharing..."
+            tooltip-popup-delay="500">
+          <span class="button" ng-click="share()">
+            <i class="icon-share"><!-- share --></i>
           </span>
         </li>
-        <li label:tooltip = "Import Cards"
-            tooltip-popup-delay = "500">
-          <span class = "button" ng-click = "importCards()">
-            <i class = "icon-file"><!-- import --></i>
+        <li label:tooltip="Import Cards"
+            tooltip-popup-delay="500">
+          <span class="button" ng-click="importCards()">
+            <i class="icon-file"><!-- import --></i>
           </span>
         </li>
-        <li label:tooltip = "Export"
-            tooltip-popup-delay = "500">
-          <span class = "button" ng-click = "exportCards()">
-            <i class = "icon-ion-ios7-upload-outline"><!-- export --></i>
+        <li label:tooltip="Export"
+            tooltip-popup-delay="500">
+          <span class="button" ng-click="exportCards()">
+            <i class="icon-ion-ios7-upload-outline"><!-- export --></i>
           </span>
         </li>
-        <li label:tooltip = "Delete"
-            tooltip-popup-delay = "500">
-          <span class = "button" ng-click = "confirmDelete(addressbook)">
-            <i class = "icon-trash"><!-- delete --></i>
+        <li label:tooltip="Delete"
+            tooltip-popup-delay="500">
+          <span class="button" ng-click="confirmDelete(addressbook)">
+            <i class="icon-trash"><!-- delete --></i>
           </span>
         </li>
       </ul>
@@ -156,31 +156,31 @@
       <md-content md-scroll-y="md-scroll-y" class="md-flex" ng-controller="LeftCtrl">
         <md-button ng-click="close()" class="md-primary md-hide-gt-md">Close</md-button>
         <md-list>
-          <md-item ng-repeat = "folder in addressbooks track by folder.id"
-              ng-class = "{_selected: addressbook.id==folder.id}"
-              ng-dblclick = "edit($index)">
+          <md-item ng-repeat="folder in addressbooks track by folder.id"
+              ng-class="{_selected: addressbook.id==folder.id}"
+              ng-dblclick="edit($index)">
             <md-item-content>
-              <i class = "icon" ng-class = "{'icon-earth': folder.isRemote, 'icon-address-book': folder.isEditable}"><!-- icon --></i>
-              <form ng-submit = "save($index)">
-                <a ui-sref = "addressbook({addressbookId: folder.id})"
-                    ng-click = "select($index)"
-                    ng-show = "editMode!=folder.id"
-                    ng-cloak = "ng-cloak">{{folder.name}}
+              <i class="icon" ng-class="{'icon-earth': folder.isRemote, 'icon-address-book': folder.isEditable}"><!-- icon --></i>
+              <form ng-submit="save($index)">
+                <a ui-sref="addressbook({addressbookId: folder.id})"
+                    ng-click="select($index)"
+                    ng-show="editMode!=folder.id"
+                    ng-cloak="ng-cloak">{{folder.name}}
                 </a>
-                <input class = "folder-name" type = "text"
-                    ng-model = "folder.name"
-                    ng-show = "editMode==folder.id"
-                    ng-cloak = "ng-cloak"
-                    ng-blur = "save($index)"
-                    sg-focus-on = "addressBookName_{{$index}}"
-                    sg-escape = "revertEditing($index)" />
+                <input class="folder-name" type="text"
+                    ng-model="folder.name"
+                    ng-show="editMode==folder.id"
+                    ng-cloak="ng-cloak"
+                    ng-blur="save($index)"
+                    sg-focus-on="addressBookName_{{$index}}"
+                    sg-escape="revertEditing($index)" />
               </form>
-              <span class = "icon" ng-cloak = "ng-cloak">
-                <a class = "icon" href = "#"
-                    dropdown-toggle = "#addressbookProperties"
-                    options = "align:right"
-                    ng-show = "currentFolderIsConfigurable(folder)">
-                  <i class = "icon-cog"><!-- options --></i>
+              <span class="icon" ng-cloak="ng-cloak">
+                <a class="icon" href="#"
+                    dropdown-toggle="#addressbookProperties"
+                    options="align:right"
+                    ng-show="currentFolderIsConfigurable(folder)">
+                  <i class="icon-cog"><!-- options --></i>
                 </a>
               </span>
             </md-item-content>
@@ -273,13 +273,13 @@
 
   </script>
     <!-- modal for addressbook sharing options -->
-    <script type = "text/ng-template" id="UIxUserRightsEditor">
+    <script type="text/ng-template" id="UIxUserRightsEditor">
       <var:component className="UIxContactsUserRightsEditor" />
     </script>
-    <script type = "text/ng-template" id = "UIxContactViewTemplate">
+    <script type="text/ng-template" id="UIxContactViewTemplate">
       <var:component className="UIxContactViewTemplate" />
     </script>
 
-    <var:string value = "errorAlertJavaScript" const:escapeHTML = "NO" />
+    <var:string value="errorAlertJavaScript" const:escapeHTML="NO" />
 
 </var:component>
diff --git a/UI/Templates/ContactsUI/UIxContactViewTemplate.wox b/UI/Templates/ContactsUI/UIxContactViewTemplate.wox
index 1bab5b585..049d167a9 100644
--- a/UI/Templates/ContactsUI/UIxContactViewTemplate.wox
+++ b/UI/Templates/ContactsUI/UIxContactViewTemplate.wox
@@ -1,9 +1,9 @@
 <?xml version='1.0' standalone='yes'?>
 <container
-    xmlns = "http://www.w3.org/1999/xhtml"
-    xmlns:var = "http://www.skyrix.com/od/binding"
-    xmlns:const = "http://www.skyrix.com/od/constant"
-    xmlns:label = "OGo:label"
+    xmlns="http://www.w3.org/1999/xhtml"
+    xmlns:var="http://www.skyrix.com/od/binding"
+    xmlns:const="http://www.skyrix.com/od/constant"
+    xmlns:label="OGo:label"
     >
   <md-card class="viewer">
     <md-card-content>
diff --git a/UI/Templates/MailerUI/UIxMailFolderTemplate.wox b/UI/Templates/MailerUI/UIxMailFolderTemplate.wox
index 936a059ce..595a115af 100644
--- a/UI/Templates/MailerUI/UIxMailFolderTemplate.wox
+++ b/UI/Templates/MailerUI/UIxMailFolderTemplate.wox
@@ -1,6 +1,6 @@
 <?xml version='1.0' standalone='yes'?>
 <container
-    xmlns = "http://www.w3.org/1999/xhtml"
+    xmlns="http://www.w3.org/1999/xhtml"
     >
   <md-content style="position: relative;" id="messagesList">
     <style>
diff --git a/UI/Templates/MailerUI/UIxMailMainFrame.wox b/UI/Templates/MailerUI/UIxMailMainFrame.wox
index 49f71edcf..ee49eefb9 100644
--- a/UI/Templates/MailerUI/UIxMailMainFrame.wox
+++ b/UI/Templates/MailerUI/UIxMailMainFrame.wox
@@ -1,37 +1,37 @@
 <?xml version="1.0" standalone="yes"?>
 <!DOCTYPE var:component>
 <var:component
-    xmlns = "http://www.w3.org/1999/xhtml"
-    xmlns:var = "http://www.skyrix.com/od/binding"
-    xmlns:const = "http://www.skyrix.com/od/constant"
-    className = "UIxPageFrame"
-    title = "title"
-    const:userDefaultsKeys = "SOGoMailMessageCheck,SOGoRefreshViewCheck,SOGoMailSortByThreads,SOGoMailListViewColumnsOrder,SOGoMailDisplayRemoteInlineImages,SOGoMailComposeMessageType,SOGoMailReplyPlacement"
-    const:userSettingsKeys = "Mail"
-    const:jsFiles = "Common/resource.js, Common/user-model.js, Common/acl-model.js, Contacts/card-model.js, Contacts/addressbook-model.js, Mailer/message-model.js, Mailer/mailbox-model.js, Mailer/account-model.js, vendor/ckeditor/ckeditor.js, vendor/ckeditor/ck.js, vendor/ng-tags-input.js, vendor/angular-file-upload.js">
-    <!--const:cssFiles = "ng-tags-input.css">-->
-  <script type = "text/javascript">
-    var mailAccounts =<var:string value = "mailAccounts" const:escapeHTML = "NO" />;
-    var userNames =<var:string value = "userNames" const:escapeHTML = "NO" />;
-    var unseenCountFolders =<var:string value = "unseenCountFolders" const:escapeHTML = "NO" />;
+    xmlns="http://www.w3.org/1999/xhtml"
+    xmlns:var="http://www.skyrix.com/od/binding"
+    xmlns:const="http://www.skyrix.com/od/constant"
+    className="UIxPageFrame"
+    title="title"
+    const:userDefaultsKeys="SOGoMailMessageCheck,SOGoRefreshViewCheck,SOGoMailSortByThreads,SOGoMailListViewColumnsOrder,SOGoMailDisplayRemoteInlineImages,SOGoMailComposeMessageType,SOGoMailReplyPlacement"
+    const:userSettingsKeys="Mail"
+    const:jsFiles="Common/resource.js, Common/user-model.js, Common/acl-model.js, Contacts/card-model.js, Contacts/addressbook-model.js, Mailer/message-model.js, Mailer/mailbox-model.js, Mailer/account-model.js, vendor/ckeditor/ckeditor.js, vendor/ckeditor/ck.js, vendor/ng-tags-input.js, vendor/angular-file-upload.js">
+    <!--const:cssFiles="ng-tags-input.css">-->
+  <script type="text/javascript">
+    var mailAccounts =<var:string value="mailAccounts" const:escapeHTML="NO" />;
+    var userNames =<var:string value="userNames" const:escapeHTML="NO" />;
+    var unseenCountFolders =<var:string value="unseenCountFolders" const:escapeHTML="NO" />;
   </script>
-  <style type = "text/css">
-    <var:foreach list = "availableLabels" item = "currentLabel">
-      #label-menu LI.<var:string value = "currentLabel.name.asCSSIdentifier" />,
+  <style type="text/css">
+    <var:foreach list="availableLabels" item="currentLabel">
+      #label-menu LI.<var:string value="currentLabel.name.asCSSIdentifier" />,
       TABLE.messageList TR[labels~=
-      <var:string const:value = '"' const:escapeHTML = "NO"
+      <var:string const:value = '"' const:escapeHTML="NO"
           />
-      <var:string value = "currentLabel.name" />
-      <var:string const:value = '"' const:escapeHTML = "NO" />] TD
-      { color:<var:string value = "currentLabel.color" />; }
+      <var:string value="currentLabel.name" />
+      <var:string const:value = '"' const:escapeHTML="NO" />] TD
+      { color:<var:string value="currentLabel.color" />; }
       TABLE.messageList TR[labels~=
-      <var:string const:value = '"' const:escapeHTML = "NO"
+      <var:string const:value = '"' const:escapeHTML="NO"
           />
-      <var:string value = "currentLabel.name" />
-      <var:string const:value = '"' const:escapeHTML = "NO" />]._selected TD
+      <var:string value="currentLabel.name" />
+      <var:string const:value = '"' const:escapeHTML="NO" />]._selected TD
       { color: #fff;
       background-color:
-      <var:string value = "currentLabel.color" />
+      <var:string value="currentLabel.color" />
       !important; }
     </var:foreach>
   </style>
@@ -230,33 +230,33 @@
   <main class="view md-layout-fill" ui-view="mailboxes" layout="row"><!-- mailboxes list --></main>
 
 <!-- TEMPLATE SCRIPT WRAPPER -->
-  <script type = "text/ng-template" id="UIxMailMainFrame">
+  <script type="text/ng-template" id="UIxMailMainFrame">
     <!-- dropdown menu for mailbox options button -->
     <div id="folderProperties" class ="f-dropdown icons-dropdown" dropdown-content="dropdown-content">
-      <ul class = "button-group">
-        <li ng-show = "currentFolder.isEditable">
-          <span class = "button" ng-click = "editFolder(currentFolder)">
-            <i class = "icon-pencil"><!-- rename --></i>
+      <ul class="button-group">
+        <li ng-show="currentFolder.isEditable">
+          <span class="button" ng-click="editFolder(currentFolder)">
+            <i class="icon-pencil"><!-- rename --></i>
           </span>
         </li>
-        <li ng-show = "currentFolder.isEditable">
-          <span class = "button" ng-click = "newFolder(currentFolder)">
-            <i class = "icon-plus"><!-- new mailbox --></i>
+        <li ng-show="currentFolder.isEditable">
+          <span class="button" ng-click="newFolder(currentFolder)">
+            <i class="icon-plus"><!-- new mailbox --></i>
           </span>
         </li>
-        <li ng-show = "currentFolder.isEditable">
-          <span class = "button" ng-click = "share()">
-            <i class = "icon-earth"><!-- share --></i>
+        <li ng-show="currentFolder.isEditable">
+          <span class="button" ng-click="share()">
+            <i class="icon-earth"><!-- share --></i>
           </span>
         </li>
         <li>
-          <span class = "button" ng-click = "exportMails()">
-            <i class = "icon-ion-ios7-upload-outline"><!-- export --></i>
+          <span class="button" ng-click="exportMails()">
+            <i class="icon-ion-ios7-upload-outline"><!-- export --></i>
           </span>
         </li>
-        <li ng-show = "currentFolder.isEditable">
-          <span class = "button" ng-click = "confirmDelete()">
-            <i class = "icon-trash"><!-- delete --></i>
+        <li ng-show="currentFolder.isEditable">
+          <span class="button" ng-click="confirmDelete()">
+            <i class="icon-trash"><!-- delete --></i>
           </span>
         </li>
       </ul>
@@ -322,12 +322,12 @@
     </section>
   </script>
 
-  <script type = "text/ng-template" id = "UIxMailFolderTemplate">
-    <var:component className = "UIxMailFolderTemplate" />
+  <script type="text/ng-template" id="UIxMailFolderTemplate">
+    <var:component className="UIxMailFolderTemplate" />
   </script>
 
-  <script type = "text/ng-template" id = "UIxMailViewTemplate">
-    <var:component className = "UIxMailViewTemplate" />
+  <script type="text/ng-template" id="UIxMailViewTemplate">
+    <var:component className="UIxMailViewTemplate" />
   </script>
 
 </var:component>
diff --git a/UI/Templates/PreferencesUI/UIxPreferences.wox b/UI/Templates/PreferencesUI/UIxPreferences.wox
index ba24e73e9..759c560a2 100644
--- a/UI/Templates/PreferencesUI/UIxPreferences.wox
+++ b/UI/Templates/PreferencesUI/UIxPreferences.wox
@@ -39,11 +39,11 @@
   -->
   <section layout="row" flex="flex">
 
-    <md-sidenav  class = "md-sidenav-left md-whiteframe-z1" md-component-id = "left" md-is-locked-open = "$media('gt-md')" layout = "column">
+    <md-sidenav  class="md-sidenav-left md-whiteframe-z1" md-component-id="left" md-is-locked-open="$media('gt-md')" layout="column">
 
-      <md-toolbar class = "md-tall" layout-align = "end start">
-        <h2 class = "md-toolbar-tools md-toolbar-tools-bottom">
-          <span class = "md-flex">{{activeUser.identification}}</span>
+      <md-toolbar class="md-tall" layout-align="end start">
+        <h2 class="md-toolbar-tools md-toolbar-tools-bottom">
+          <span class="md-flex">{{activeUser.identification}}</span>
         </h2>
       </md-toolbar>
 
diff --git a/UI/Templates/UIxPageFrame.wox b/UI/Templates/UIxPageFrame.wox
index e79c106f1..b72c5c411 100644
--- a/UI/Templates/UIxPageFrame.wox
+++ b/UI/Templates/UIxPageFrame.wox
@@ -1,77 +1,77 @@
 <?xml version="1.0" standalone="yes"?>
 <!DOCTYPE container>
 <container
-    xmlns = "http://www.w3.org/1999/xhtml"
-    xmlns:xml = "http://www.w3.org/XML/1998/namespace"
-    xmlns:var = "http://www.skyrix.com/od/binding"
-    xmlns:const = "http://www.skyrix.com/od/constant"
-    xmlns:rsrc = "OGo:url"
-    xmlns:label = "OGo:label"
+    xmlns="http://www.w3.org/1999/xhtml"
+    xmlns:xml="http://www.w3.org/XML/1998/namespace"
+    xmlns:var="http://www.skyrix.com/od/binding"
+    xmlns:const="http://www.skyrix.com/od/constant"
+    xmlns:rsrc="OGo:url"
+    xmlns:label="OGo:label"
     >
-  <var:string var:value = "doctype" const:escapeHTML = "NO" />
-  <var:if condition = "hideFrame" const:negate = "YES"
+  <var:string var:value="doctype" const:escapeHTML="NO" />
+  <var:if condition="hideFrame" const:negate="YES"
       >
-    <html const:xmlns = "http://www.w3.org/1999/xhtml"
-        xml:lang = "en" const:lang = "en" class="">
+    <html const:xmlns="http://www.w3.org/1999/xhtml"
+        xml:lang="en" const:lang="en" class="">
       <head>
         <title>
-          <var:string value = "title" />
+          <var:string value="title" />
         </title>
-        <meta name = "hideFrame" var:content = "hideFrame" />
-        <meta name = "description" content = "SOGo Web Interface" />
-        <meta name = "author" content = "SKYRIX Software AG/Inverse inc." />
-        <meta name = "robots" content = "stop" />
-        <meta name = "build" var:content = "buildDate" />
-        <meta name = "viewport" content = "width=device-width, initial-scale=1" />
-        <link href = "mailto:support@inverse.ca" rev = "made" />
-        <link rel = "shortcut icon" var:href = "siteFavicon" type = "image/x-icon" />
-        <link type = "text/css" rel = "stylesheet" rsrc:href = "css/styles.css" />
-        <var:if condition = "hasPageSpecificCSS"
+        <meta name="hideFrame" var:content="hideFrame" />
+        <meta name="description" content="SOGo Web Interface" />
+        <meta name="author" content="SKYRIX Software AG/Inverse inc." />
+        <meta name="robots" content="stop" />
+        <meta name="build" var:content="buildDate" />
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
+        <link href="mailto:support@inverse.ca" rev="made" />
+        <link rel="shortcut icon" var:href="siteFavicon" type="image/x-icon" />
+        <link type="text/css" rel="stylesheet" rsrc:href="css/styles.css" />
+        <var:if condition="hasPageSpecificCSS"
             >
-          <link type = "text/css" rel = "stylesheet" var:href = "pageCSSURL"
+          <link type="text/css" rel="stylesheet" var:href="pageCSSURL"
               />
         </var:if>
-        <var:foreach list = "additionalCSSFiles" item = "item"
+        <var:foreach list="additionalCSSFiles" item="item"
             >
-          <link type = "text/css" rel = "stylesheet" var:href = "item"
+          <link type="text/css" rel="stylesheet" var:href="item"
               />
         </var:foreach>
-        <var:if-ie const:lte = "9"
+        <var:if-ie const:lte="9"
             >
-          <link type = "text/css" rel = "stylesheet" rsrc:href = "iefixes.css" />
-          <script type = "text/javascript" rsrc:src = "XMLHttpRequest.js"><!-- space --></script>
+          <link type="text/css" rel="stylesheet" rsrc:href="iefixes.css" />
+          <script type="text/javascript" rsrc:src="XMLHttpRequest.js"><!-- space --></script>
         </var:if-ie>
       </head>
 
-      <body var:ng-app = "angularModule" var:class = "bodyClasses">
-        <var:if condition = "isCompatibleBrowser">
-          <var:if condition = "singleWindowModeEnabled">
-            <div id = "popupFrame" style = "display: none;">
-              <iframe width = "100%" height = "100%" src = "/SOGo/loading"><!-- space --></iframe>
+      <body var:ng-app="angularModule" var:class="bodyClasses">
+        <var:if condition="isCompatibleBrowser">
+          <var:if condition="singleWindowModeEnabled">
+            <div id="popupFrame" style="display: none;">
+              <iframe width="100%" height="100%" src="/SOGo/loading"><!-- space --></iframe>
             </div>
           </var:if
               >
-          <var:if condition = "shortUserNameForDisplay" const:value = "anonymous"
-              const:negate = "YES">
-            <var:if condition = "hasUserSettingsKeys"
+          <var:if condition="shortUserNameForDisplay" const:value="anonymous"
+              const:negate="YES">
+            <var:if condition="hasUserSettingsKeys"
                 >
-              <script type = "text/javascript">
-                var UserSettings =<var:string value = "userSettings" const:escapeHTML = "NO" />;
+              <script type="text/javascript">
+                var UserSettings =<var:string value="userSettings" const:escapeHTML="NO" />;
               </script
                   >
             </var:if>
-            <var:if condition = "hasUserDefaultsKeys">
-              <script type = "text/javascript">
-                var UserDefaults =<var:string value = "userDefaults" const:escapeHTML = "NO" />;
+            <var:if condition="hasUserDefaultsKeys">
+              <script type="text/javascript">
+                var UserDefaults =<var:string value="userDefaults" const:escapeHTML="NO" />;
               </script
                   >
             </var:if
                 >
           </var:if
               >
-          <var:if condition = "isPopup" const:negate = "YES"
+          <var:if condition="isPopup" const:negate="YES"
               >
-            <var:if condition = "isUIxDebugEnabled"
+            <var:if condition="isUIxDebugEnabled"
                 ><!-- space --></var:if>
           </var:if>
 <!-- MAIN CONTENT ROW -->
@@ -81,7 +81,7 @@
           <!-- BOTTOM-BAR -->
           <var:if condition="shortUserNameForDisplay" const:value="anonymous" const:negate="YES">
           <md-toolbar class="sg-bottombar md-hide-sm" layout="row" layout-align="center center">
-            <var:if condition = "userHasCalendarAccess">
+            <var:if condition="userHasCalendarAccess">
               <var:if condition="isCalendar">
                 <md-button ng-disabled="true">
                   <var:string label:value="Calendar"/>
@@ -109,24 +109,24 @@
                   <var:string label:value="Mail"/>
                 </md-button>
               </var:if>
-              <var:if condition = "isMail" const:negate = "YES">
-                <md-button var:href = "relativeMailPath">
-                  <var:string label:value = "Mail" />
+              <var:if condition="isMail" const:negate="YES">
+                <md-button var:href="relativeMailPath">
+                  <var:string label:value="Mail" />
                 </md-button>
               </var:if>
             </var:if>
-            <md-button var:ng-href = "relativePreferencesPath">
-              <var:string label:value = "Preferences" />
+            <md-button var:ng-href="relativePreferencesPath">
+              <var:string label:value="Preferences" />
             </md-button>
-            <var:if condition = "isSuperUser">
-              <var:if condition = "isAdministration">
-                <md-button ng-disabled = "true">
-                  <var:string label:value = "Administration" />
+            <var:if condition="isSuperUser">
+              <var:if condition="isAdministration">
+                <md-button ng-disabled="true">
+                  <var:string label:value="Administration" />
                 </md-button>
               </var:if>
-              <var:if condition = "isAdministration" const:negate = "YES">
-                <md-button var:href = "relativeAdministrationPath">
-                  <var:string label:value = "Administration" />
+              <var:if condition="isAdministration" const:negate="YES">
+                <md-button var:href="relativeAdministrationPath">
+                  <var:string label:value="Administration" />
                 </md-button>
               </var:if>
             </var:if>
@@ -134,81 +134,81 @@
           </var:if>
           
           <!-- Javascripot imports -->
-          <script type = "text/javascript">
-            var ApplicationBaseURL = '<var:string value = "modulePath" />';
-            var ResourcesURL = '<var:string value = "applicationPath" />.woa/WebServerResources';
-            var minimumSearchLength =<var:string value = "minimumSearchLength" />;
-            <var:if condition = "isSuperUser"
+          <script type="text/javascript">
+            var ApplicationBaseURL = '<var:string value="modulePath" />';
+            var ResourcesURL = '<var:string value="applicationPath" />.woa/WebServerResources';
+            var minimumSearchLength =<var:string value="minimumSearchLength" />;
+            <var:if condition="isSuperUser"
                 >var IsSuperUser = true;
             </var:if>
-            <var:if condition = "isSuperUser" const:negate = "YES"
+            <var:if condition="isSuperUser" const:negate="YES"
                 >var IsSuperUser = false;
             </var:if>
-            <var:if condition = "usesCASAuthentication"
+            <var:if condition="usesCASAuthentication"
                 >var usesCASAuthentication = true;
             </var:if>
-            <var:if condition = "usesCASAuthentication" const:negate = "YES"
+            <var:if condition="usesCASAuthentication" const:negate="YES"
                 >var usesCASAuthentication = false;
             </var:if>
-            <var:if condition = "shortUserNameForDisplay" const:value = "anonymous"
-                const:negate = "YES"
-                >var UserFolderURL = '<var:string value = "userFolderPath" const:escapeHTML = "NO" />';
-              var UserLogin = '<var:string value = "shortUserNameForDisplay" const:escapeHTML = "NO" />';
-              var UserIdentification = '<var:string value = "userIdentification" const:escapeHTML = "NO" />';
-              var UserLanguage = '<var:string value = "userLanguage" const:escapeHTML = "NO" />';
+            <var:if condition="shortUserNameForDisplay" const:value="anonymous"
+                const:negate="YES"
+                >var UserFolderURL = '<var:string value="userFolderPath" const:escapeHTML="NO" />';
+              var UserLogin = '<var:string value="shortUserNameForDisplay" const:escapeHTML="NO" />';
+              var UserIdentification = '<var:string value="userIdentification" const:escapeHTML="NO" />';
+              var UserLanguage = '<var:string value="userLanguage" const:escapeHTML="NO" />';
             </var:if>
-            <var:string value = "commonLocalizableStrings" const:escapeHTML = "NO" />
-            <var:string value = "productLocalizableStrings" const:escapeHTML = "NO" />
+            <var:string value="commonLocalizableStrings" const:escapeHTML="NO" />
+            <var:string value="productLocalizableStrings" const:escapeHTML="NO" />
           </script>
-          <script type = "text/javascript" rsrc:src = "js/vendor/underscore-min.js"><!-- space --></script>
-          <script type = "text/javascript" rsrc:src = "js/vendor/angular.js"><!-- space --></script>
-          <script type = "text/javascript" rsrc:src = "js/vendor/angular-animate.js"><!-- space --></script>
-          <script type = "text/javascript" rsrc:src = "js/vendor/angular-sanitize.js"><!-- space --></script>
-          <script type = "text/javascript" rsrc:src = "js/vendor/angular-aria.js"><!-- space --></script>
-          <script type = "text/javascript" rsrc:src = "js/vendor/angular-material.js"><!-- space --></script>
-          <script type = "text/javascript" rsrc:src = "js/vendor/angular-ui-router.js"><!-- space --></script>
-          <script type = "text/javascript" rsrc:src = "js/vendor/mm-foundation-tpls.js"><!-- space --></script>
-          <script type = "text/javascript" rsrc:src = "js/vendor/angular-recursion.js"><!-- space --></script>
-          <script type = "text/javascript" rsrc:src = "js/vendor/angular-vs-repeat.js"><!-- space --></script>
-          <script type = "text/javascript" rsrc:src = "js/Common/utils.js"><!-- space --></script>
-          <script type = "text/javascript" rsrc:src = "js/Common/ui.js"><!-- space --></script>
-          <script type = "text/javascript" rsrc:src = "js/Common/ui-common.js"><!-- space --></script>
-          <script type = "text/javascript" rsrc:src = "js/Common/ui-desktop.js"><!-- space --></script>
+          <script type="text/javascript" rsrc:src="js/vendor/underscore-min.js"><!-- space --></script>
+          <script type="text/javascript" rsrc:src="js/vendor/angular.js"><!-- space --></script>
+          <script type="text/javascript" rsrc:src="js/vendor/angular-animate.js"><!-- space --></script>
+          <script type="text/javascript" rsrc:src="js/vendor/angular-sanitize.js"><!-- space --></script>
+          <script type="text/javascript" rsrc:src="js/vendor/angular-aria.js"><!-- space --></script>
+          <script type="text/javascript" rsrc:src="js/vendor/angular-material.js"><!-- space --></script>
+          <script type="text/javascript" rsrc:src="js/vendor/angular-ui-router.js"><!-- space --></script>
+          <script type="text/javascript" rsrc:src="js/vendor/mm-foundation-tpls.js"><!-- space --></script>
+          <script type="text/javascript" rsrc:src="js/vendor/angular-recursion.js"><!-- space --></script>
+          <script type="text/javascript" rsrc:src="js/vendor/angular-vs-repeat.js"><!-- space --></script>
+          <script type="text/javascript" rsrc:src="js/Common/utils.js"><!-- space --></script>
+          <script type="text/javascript" rsrc:src="js/Common/ui.js"><!-- space --></script>
+          <script type="text/javascript" rsrc:src="js/Common/ui-common.js"><!-- space --></script>
+          <script type="text/javascript" rsrc:src="js/Common/ui-desktop.js"><!-- space --></script>
 
-          <var:if condition = "hasProductSpecificJavaScript">
-            <script type = "text/javascript"
-                var:src = "productJavaScriptURL"><!-- space --></script>
+          <var:if condition="hasProductSpecificJavaScript">
+            <script type="text/javascript"
+                var:src="productJavaScriptURL"><!-- space --></script>
           </var:if>
-          <var:if condition = "hasPageSpecificJavaScript">
-            <script type = "text/javascript"
-                var:src = "pageJavaScriptURL"><!-- space --></script>
+          <var:if condition="hasPageSpecificJavaScript">
+            <script type="text/javascript"
+                var:src="pageJavaScriptURL"><!-- space --></script>
           </var:if>
-          <var:foreach list = "additionalJSFiles" item = "item"
+          <var:foreach list="additionalJSFiles" item="item"
               >
-            <script type = "text/javascript" var:src = "item"><!-- space --></script>
+            <script type="text/javascript" var:src="item"><!-- space --></script>
           </var:foreach>
-          <var:foreach list = "systemAdditionalJSFiles" item = "item"
+          <var:foreach list="systemAdditionalJSFiles" item="item"
               >
-            <script type = "text/javascript" var:src = "item"><!-- space --></script>
+            <script type="text/javascript" var:src="item"><!-- space --></script>
           </var:foreach>
         </var:if>
-        <var:if condition = "isCompatibleBrowser" const:negate = "YES"
+        <var:if condition="isCompatibleBrowser" const:negate="YES"
             >
-          <var:component className = "SOGoBrowsersPanel"
+          <var:component className="SOGoBrowsersPanel"
               />
         </var:if>
         <noscript>
-          <div class = "javascriptPopupBackground">
+          <div class="javascriptPopupBackground">
           </div>
-          <div class = "javascriptMessagePseudoWindow noJavascriptErrorMessage">
-            <var:string label:value = "noJavascriptError"
+          <div class="javascriptMessagePseudoWindow noJavascriptErrorMessage">
+            <var:string label:value="noJavascriptError"
                 />
             <br />
             <br
                 />
-            <a class = "button" var:href = "page.context.uri"
+            <a class="button" var:href="page.context.uri"
                 >
-              <var:string label:value = "noJavascriptRetry"
+              <var:string label:value="noJavascriptRetry"
                   />
             </a>
           </div>
@@ -218,7 +218,7 @@
     </html>
   </var:if>
 
-  <var:if condition = "hideFrame">
+  <var:if condition="hideFrame">
     <var:component-content />
   </var:if>
 </container>