diff --git a/UI/Templates/Themes/mobile/CommonUI/UIxPageFrame.wox b/UI/Templates/Themes/mobile/CommonUI/UIxPageFrame.wox
deleted file mode 100644
index d22034fd9..000000000
--- a/UI/Templates/Themes/mobile/CommonUI/UIxPageFrame.wox
+++ /dev/null
@@ -1,100 +0,0 @@
-<?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"
-  ><var:string var:value="doctype" const:escapeHTML="NO" />
-<html const:xmlns="http://www.w3.org/1999/xhtml"
-      xml:lang="en" const:lang="en">
-  <head>
-    <meta charset="utf-8"/>
-    <meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no, width=device-width"/>
-    <title><var:string value="title"/></title>
-
-    <link rsrc:href="css/mobile.css" rel="stylesheet"><!-- mobile.css --></link>
-
-    <!-- ionic/angularjs js -->
-    <script rsrc:src="js/vendor/ionic.bundle.js"><!-- ionic --></script>
-
-    <!-- your app's js -->
-    <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 IsSuperUser = false;
-      </var:if>
-      <var:if condition="usesCASAuthentication"
-	      >var usesCASAuthentication = true;
-      </var:if>
-      <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 UserLanguage = '<var:string value="userLanguage" const:escapeHTML="NO"/>';
-      </var:if>
-      <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-recursion.js"><!-- space --></script>
-    <script type="text/javascript" rsrc:src="js/Common/utils.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-mobile.js"><!-- 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>
-    <var:foreach list="additionalJSFiles" item="item"><script type="text/javascript"
-                                    var:src="item"><!-- space --></script>
-    </var:foreach>
-    <var:foreach list="systemAdditionalJSFiles" item="item"><script type="text/javascript"
-                                    var:src="item"><!-- space --></script>
-    </var:foreach>
-  </head>
-
-  <body var:ng-app="angularModule">
-
-    <script type="text/ng-template" id="menu.html">
-      <ion-side-menus>
-        <ion-side-menu-content>
-          <ion-nav-bar class="bar-stable nav-title-slide-ios7">
-            <ion-nav-back-button class="button-clear"><i class="icon ion-ios7-arrow-back"><!-- back --></i> Back</ion-nav-back-button>
-          </ion-nav-bar>
-          <ion-nav-view name="menuContent" animation="slide-left-right"><!-- content --></ion-nav-view>
-        </ion-side-menu-content>
-
-        <ion-side-menu side="left">
-          <header class="bar bar-header bar-stable">
-            <h1 class="title">{{UserLogin}}</h1>
-          </header>
-          <ion-content class="has-header">
-            <ion-list>
-              <ion-item class="nav-clear menu-close" var:href="relativeMailPath">
-                <var:string label:value="Mail"/>
-              </ion-item>
-              <ion-item class="nav-clear menu-close" var:href="relativeContactsPath">
-                <var:string label:value="Address Books"/>
-              </ion-item>
-            </ion-list>
-            <a class="button button-full button-assertive" href="#" ng-href="{{UserFolderURL}}logoff?theme=mobile"><var:string label:value="Disconnect"/></a>
-            <a class="button button-small button-outline button-stable button-block" ng-href="{{ApplicationBaseURL}}"><var:string label:value="Desktop Version"/></a>
-          </ion-content>
-        </ion-side-menu>
-      </ion-side-menus>
-    </script>
-
-    <var:component-content/>
-  </body>
-</html>
-</container>
diff --git a/UI/Templates/Themes/mobile/ContactsUI/UIxContactFoldersView.wox b/UI/Templates/Themes/mobile/ContactsUI/UIxContactFoldersView.wox
deleted file mode 100644
index 5e2446af3..000000000
--- a/UI/Templates/Themes/mobile/ContactsUI/UIxContactFoldersView.wox
+++ /dev/null
@@ -1,409 +0,0 @@
-<?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:uix="OGo:uix"
-    xmlns:label="OGo:label"
-    xmlns:rsrc="OGo:url"
-    const:userDefaultsKeys="SOGoContactsCategories"
-    const:jsFiles="Common/resource.js, Common/user-model.js, Common/acl-model.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>
-
-  <ion-nav-view><!-- main view --></ion-nav-view>
-
-  <script type="text/ng-template" id="addressbooks.html">
-    <ion-view title="Address Books">
-      <ion-nav-buttons side="left">
-        <button menu-toggle="left" class="button button-icon icon ion-navicon"><!-- menu toggle --></button>
-      </ion-nav-buttons>
-      <ion-nav-buttons side="right">
-        <a class="button button-clear button-positive button-icon icon ion-ios7-plus-empty" ng-click="newAddressbook()"><!-- new --></a>
-      </ion-nav-buttons>
-      <ion-content class="has-header">
-        <ion-list>
-          <ion-item ng-repeat="addressbook in addressbooks" option-buttons="buttons"
-                    ui-sref="app.addressbook({addressbookId: addressbook.id})"
-                    class="item-icon-left item-icon-right">
-            <i class="icon" ng-class="{'ion-earth': addressbook.isRemote}"><!-- public addressbook --></i>
-            {{addressbook.name}}
-            <i class="icon ion-ios7-arrow-right"><!-- right arrow icon --></i>
-            <ion-option-button class="button-info"
-                               ng-hide="addressbook.isRemote"
-                               ng-click="edit(addressbook)"><var:string label:value="Edit"/></ion-option-button>
-          </ion-item>
-        </ion-list>
-      </ion-content>
-    </ion-view>
-  </script>
-
-  <script type="text/ng-template" id="addressbook.html">
-    <ion-view title="{{addressbook.name}}">
-      <ion-nav-buttons side="right">
-        <a class="button button-clear button-positive button-icon icon ion-ios7-plus-empty" ng-click="addCard()"><!-- new --></a>
-      </ion-nav-buttons>
-      <ion-content class="has-header">
-        <ion-list>
-          <ion-item class="item-input">
-            <i class="icon ion-search placeholder-icon"><!-- search --></i>
-            <input type="text"
-                   placeholder="Search"
-                   ng-model="search.filter"
-                   ng-keyup="doSearch($event)"/>
-          </ion-item>
-        </ion-list>
-         <ion-list>
-          <ion-item class="item-icon-right" option-buttons="buttons"
-                    ng-repeat="card in addressbook.cards"
-                    ui-sref="app.card({addressbookId: addressbook.id, cardId: card.c_name})">
-            {{card.c_cn || card.c_mail}}
-            <i class="icon ion-ios7-arrow-right"><!-- right arrow icon --></i>
-          </ion-item>
-        </ion-list>
-      </ion-content>
-    </ion-view>
-  </script>
-
-  <script type="text/ng-template" id="card.html">
-    <ion-view title="">
-      <ion-nav-buttons side="right">
-        <a class="button button-clear button-positive" ng-click="edit()"><var:string label:value="Edit"/></a>
-      </ion-nav-buttons>
-      <ion-content padding="10" class="has-header">
-        <h4 ng-bind-html="card.$fullname()"><!-- fullname --></h4>
-        <p>
-          {{card.$description()}}
-          <span class="label" ng-repeat="category in card.categories">{{category.value}}</span>
-        </p>
-        <ion-list class="list-clear" ng-show="card.birthday">
-          <ion-item class="item-icon-right">
-            <i class="icon ion-calendar"><!-- icon --></i>
-            <small><var:string label:value="Birthday"/></small> {{card.$birthday() | date}}
-          </ion-item>
-        </ion-list>
-        <ion-list class="list-clear" ng-show="card.refs.length > 0">
-          <ion-item ng-repeat="ref in card.refs"
-                    href="{{UserFolderURL}}Mail/Compose/{{ref.email}}"
-                    class="item-icon-right">
-            <i class="icon ion-person"><!-- icon --></i>
-            {{ref.fn || ref.email}}
-          </ion-item>
-        </ion-list>
-        <ion-list class="list-clear" ng-show="card.emails">
-          <ion-item ng-repeat="email in card.emails"
-                    href="{{UserFolderURL}}Mail/Compose/{{email.value}}"
-                    class="item-icon-right">
-            <i class="icon ion-email"><!-- icon --></i>
-            <small>{{email.type}}</small> {{email.value}}
-          </ion-item>
-        </ion-list>
-        <ion-list class="list-clear" ng-show="card.phones">
-          <ion-item ng-repeat="phone in card.phones"
-                    href="tel:{{phone.value}}"
-                    class="item-icon-right">
-            <i class="icon ion-ios7-telephone-outline"><!-- icon --></i>
-            <small>{{phone.type}}</small> {{phone.value}}
-          </ion-item>
-        </ion-list>
-        <ion-list class="list-clear" ng-show="card.urls">
-          <ion-item ng-repeat="url in card.urls"
-                    href="{{url.value}}"
-                    class="item-icon-right">
-            <i class="icon ion-link"><!-- icon --></i>
-            <small>{{url.type}}</small> {{url.value}}
-          </ion-item>
-        </ion-list>
-        <ion-list class="list-clear" ng-show="card.addresses">
-          <ion-item class="item-icon-right" ng-repeat="address in card.addresses">
-            <i class="icon ion-location"><!-- icon --></i>
-            <small>{{address.type}}</small>
-            <address sg-address="address"><!-- address --></address>
-          </ion-item>
-        </ion-list>
-        <ion-list class="list-clear" ng-show="card.note">
-          <ion-item>
-            <small><var:string label:value="note"/></small>
-            {{card.note}}
-          </ion-item>
-        </ion-list>
-      </ion-content>
-    </ion-view>
-  </script>
-
-  <script type="text/ng-template" id="cardEditor.html">
-    <ion-modal-view>
-      <form name="cardForm" ng-show="card.$isCard()">
-        <ion-header-bar class="bar-positive">
-          <button class="button button-clear" ng-click="cancel()"><var:string label:value="Cancel"/></button>
-          <button class="button button-clear" ng-click="save(cardForm)"><var:string label:value="Save"/></button>
-        </ion-header-bar>
-        <ion-content padding="10">
-          <ion-list class="list-clear">
-            <ion-item class="item-input">
-              <input type="text" label:placeholder="Display" ng-model="card.fn"/>
-            </ion-item>
-            <ion-item class="item-input">
-              <input type="text" label:placeholder="Givenname" ng-model="card.givenname"/>
-            </ion-item>
-            <ion-item class="item-input">
-              <input type="text" label:placeholder="Lastname" ng-model="card.sn"/>
-            </ion-item>
-            <ion-item class="item-input">
-              <input type="text" label:placeholder="Nickname" ng-model="card.nickname"/>
-            </ion-item>
-            <ion-item class="item-input">
-              <input type="text" label:placeholder="Organization" ng-model="card.org"/>
-            </ion-item>
-            <ion-item class="item-input">
-              <input type="text" label:placeholder="Title" ng-model="card.title"/>
-            </ion-item>
-          </ion-list>
-          <ion-list class="list-clear">
-            <ion-item ng-repeat="unit in card.orgUnits"
-                      class="item-input">
-              <button class="button button-small button-assertive button-icon icon ion-minus-circled" ng-click="card.$delete('orgUnits', $index)"><!-- remove --></button>
-              <input type="text" label:placeholder="organization unit"
-                   ng-model="unit.value"/>
-            </ion-item>
-            <ion-item>
-              <button class="button button-small button-clear button-positive"
-                      ng-click="addOrgUnit()"><i class="icon ion-plus-circled"><!-- add --></i> <var:string label:value="Add Organizational Unit"/></button>
-            </ion-item>
-          </ion-list>
-          <ion-list class="list-clear">
-            <ion-item class="item-input">
-              <input type="date" label:placeholder="birthday"
-                     ng-model="birthday"/>
-            </ion-item>
-          </ion-list>
-          <ion-list class="list-clear">
-            <ion-item ng-repeat="category in card.categories"
-                      class="item-input">
-              <button class="button button-small button-assertive button-icon icon ion-minus-circled" ng-click="card.$delete('categories', $index)"><!-- remove --></button>
-              <input type="text" label:placeholder="category"
-                     ng-model="category.value"/>
-            </ion-item>
-            <ion-item>
-              <button class="button button-small button-clear button-positive"
-                      ng-click="addCategory()"><i class="icon ion-plus-circled"><!-- add --></i> <var:string label:value="Add Category"/></button>
-            </ion-item>
-          </ion-list>
-          <ion-list class="list-clear">
-            <ion-item ng-repeat="email in card.emails"
-                      class="item-input item-select">
-              <button class="button button-small button-assertive button-icon icon ion-minus-circled" ng-click="card.$delete('emails', $index)"><!-- remove --></button>
-              <input type="text" label:placeholder="email address"
-                     ng-model="email.value"/>
-              <select ng-model="email.type"
-                      ng-options="type for type in allEmailTypes"><!-- email types --></select>
-            </ion-item>
-            <ion-item>
-              <button class="button button-small button-clear button-positive"
-                      ng-click="addEmail()"><i class="icon ion-plus-circled"><!-- add --></i> <var:string label:value="Add Email Address"/></button>
-            </ion-item>
-          </ion-list>
-          <ion-list class="list-clear">
-            <ion-item ng-repeat="phone in card.phones"
-                      class="item-input item-select">
-              <button class="button button-small button-assertive button-icon icon ion-minus-circled" ng-click="card.$delete('phones', $index)"><!-- remove --></button>
-              <input type="text" label:placeholder="phone number"
-                     ng-model="phone.value"/>
-              <select ng-model="phone.type"
-                    ng-options="type for type in allPhoneTypes"><!-- phone types --></select>
-            </ion-item>
-            <ion-item>
-              <button class="button button-small button-clear button-positive"
-                      ng-click="addPhone()"><i class="icon ion-plus-circled"><!-- add --></i> <var:string label:value="Add Phone Number"/></button>
-            </ion-item>
-          </ion-list>
-          <ion-list class="list-clear">
-            <ion-item ng-repeat="url in card.urls"
-                      class="item-input item-select">
-              <button class="button button-small button-assertive button-icon icon ion-minus-circled"
-                      ng-click="card.$delete('urls', $index)"><!-- remove --></button>
-              <input type="text" label:placeholder="URL"
-                      ng-model="url.value"/>
-              <select ng-model="url.type"
-                      ng-options="type for type in allUrlTypes"><!-- url types --></select>
-            </ion-item>
-            <ion-item>
-              <button class="button button-small button-clear button-positive" ng-click="addUrl()">
-                <i class="icon ion-plus-circled"><!-- add --></i> <var:string label:value="Add URL"/>
-              </button>
-            </ion-item>
-          </ion-list>
-          <ion-list class="list-clear"
-                    ng-repeat="address in card.addresses">
-            <ion-item class="item-input">
-            <button class="button button-small button-assertive button-icon icon ion-minus-circled"
-                    ng-click="card.$delete('addresses', $index)"><!-- remove --></button>
-            <ion-list class="list-address">
-              <ion-item class="item-input">
-                <input type="text" label:placeholder="street" ng-model="address.street"/>
-              </ion-item>
-              <ion-item class="item-input">
-                <input type="text" label:placeholder="street" ng-model="address.street2"/>
-              </ion-item>
-              <ion-item class="item-input item-select">
-                <input type="text" label:placeholder="Postoffice" ng-model="address.postoffice"/>
-                <select ng-model="address.type"
-                        ng-options="type for type in allAddressTypes"><!-- address types --></select>
-              </ion-item>
-              <ion-item class="item-input">
-                <input type="text" label:placeholder="City" ng-model="address.locality"/>
-                <input type="text" label:placeholder="Region" ng-model="address.region"/>
-              </ion-item>
-              <ion-item class="item-input">
-                <input type="text" label:placeholder="Country" ng-model="address.country"/>
-                <input type="text" label:placeholder="Postal Code" ng-model="address.postalcode"/>
-              </ion-item>
-            </ion-list>
-            </ion-item>
-            <ion-item>
-            <button class="button button-small button-clear button-positive" ng-click="addAddress()">
-              <i class="icon ion-plus-circled"><!-- add --></i> <var:string label:value="Add Address"/>
-            </button>
-            </ion-item>
-          </ion-list>
-          <ion-list class="list-clear">
-            <ion-item class="item-input">
-              <input type="text" label:placeholder="Note" ng-model="card.note"/>
-            </ion-item>
-          </ion-list>
-          <button class="button button-block button-assertive"
-                  ng-hide="card.isNew"
-                  ng-click="confirmDelete(card)"><var:string label:value="Delete"/></button>
-        </ion-content>
-      </form>
-      <form name="listForm" ng-show="card.$isList()">
-        <ion-header-bar class="bar-positive">
-          <button class="button button-clear" ng-click="cancel()"><var:string label:value="Cancel"/></button>
-          <button class="button button-clear" ng-click="save(listForm)"><var:string label:value="Save" /></button>
-        </ion-header-bar>
-        <ion-content padding="10">
-          <div>
-            <div class="subtitle">
-              <var:string label:value="List details"/>
-            </div>
-            <ion-list class="list-clear">
-              <ion-item class="item-input">
-                <input type="text" label:placeholder="List name:" ng-model="card.fn"/>
-              </ion-item>
-              <ion-item class="item-input">
-                <input type="text" label:placeholder="List nickname:" ng-model="card.nickname"/>
-              </ion-item>
-              <ion-item class="item-input">
-                <input type="text" label:placeholder="List description:" ng-model="card.description"/>
-              </ion-item>
-            </ion-list>
-          </div>
-          <div class="subtitle">
-            <var:string label:value="Members"/>
-          </div>
-          <div id="search-box" class="item-input-inset">
-            <div class="item-input-wrapper">
-              <i class="icon ion-search placeholder-icon"></i>
-              <input type="text" label:placeholder="Search" ng-model="search.query" ng-keyup="showPopOver($event)" />
-              <i ng-show="search.query" class="clear-search icon ion-ios7-close-empty" ng-click="resetSearch()"><!-- spacer --></i>
-            </div>
-          </div>
-          <ion-list class="list-clear">
-            <ion-item ng-repeat="ref in card.refs" class="item-input">
-              <button class="button button-small button-assertive button-icon icon ion-minus-circled" 
-                      ng-click="card.$delete('refs', $index)"><!-- remove --></button>
-              <span>{{ref.$shortFormat()}}</span>
-            </ion-item>
-          </ion-list>
-          <button class="button button-block button-assertive" ng-hide="card.isNew"
-                  ng-click="confirmDelete(card)"><var:string label:value="Delete"/></button>
-        </ion-content>
-      </form>
-    </ion-modal-view>
-  </script>
-
-  <script type="text/ng-template" id="searchFolderContacts.html">
-    <ion-popover-view>
-      <ion-content>
-        <ion-list ng-repeat="card in addressbook.cards | orderBy:['sn'] | filter:cardsFilter">
-          <ion-item ng-click="addMember(card)">
-            <span>{{card.$shortFormat(search.query)}}</span>
-          </ion-item>
-        </ion-list>
-      </ion-content>
-    </ion-popover-view>
-  </script>
-
-  <script type="text/ng-template" id="acl-modal.html">
-    <ion-modal-view>
-      <ion-header-bar class="bar-positive">
-        <div class="buttons" ng-hide="search.active">
-          <button class="button button-icon" ng-click="closeModal()"><var:string label:value="Close"/></button>
-        </div>
-        <div class="buttons" ng-show="search.active">
-          <button class="button button-icon" ng-click="cancelSearch()"><var:string label:value="Back"/></button>
-        </div>
-        <h1 class="title">{{title}}</h1>
-        <div class="buttons">
-          <button class="button button-icon" ng-click="saveModal()"><var:string label:value="Save"/></button>
-        </div>
-      </ion-header-bar>
-      <ion-content>
-        <ion-list show-delete="showDelete"
-                  on-tap="toggleDelete(false)">
-          <div ng-repeat="user in users | orderBy:['userClass', 'displayName']">
-            <ion-item class="item-stable item-icon-left item-icon-right"
-                      ng-click="toggleUser(user)"
-                      on-swipe-right="toggleDelete(true)">
-              <i class="icon"
-                 ng-class="(user.userClass == 'public-user') ? 'ion-ios7-people' : 'ion-ios7-person'"><!-- spacer --></i>
-              {{user.$shortFormat()}}
-              <i class="icon" ng-class="displayIcon(user)"><!-- spacer --></i>
-              <ion-delete-button class="ion-minus-circled"
-                                 ng-disabled="user.$isSpecial() || !user.inAclList"
-                                 ng-click="removeUser(user)"></ion-delete-button>
-            </ion-item>
-            <div class="item-accordion" ng-show="userIsSelected(user)">
-              <ion-toggle ng-hide="user.$isSpecial()"
-                          ng-model="selectedUser.isSubscribed"
-                          ng-checked="selectedUser.isSubscribed"
-                          ng-disabled="selectedUser.wasSubscribed">
-                <var:string label:value="Subscribe user"/></ion-toggle>
-                <ion-checkbox ng-hide="selectedUser.$isAnonymous()"
-                              ng-checked="selectedUser.rights.canCreateObjects"
-                              ng-model="selectedUser.rights.canCreateObjects"
-                              ng-change="confirmChange(selectedUser)">
-                <var:string label:value="This person can add cards to this addressbook."/></ion-checkbox>
-                <ion-checkbox ng-hide="selectedUser.$isAnonymous()"
-                              ng-checked="selectedUser.rights.canEditObjects"
-                              ng-model="selectedUser.rights.canEditObjects"
-                              ng-change="confirmChange(selectedUser)">
-                <var:string label:value="This person can edit the cards of this addressbook."/></ion-checkbox>
-                <ion-checkbox ng-hide="selectedUser.$isAnonymous()"
-                              ng-checked="selectedUser.rights.canEraseObjects"
-                              ng-model="selectedUser.rights.canEraseObjects"
-                              ng-change="confirmChange(selectedUser)">
-                <var:string label:value="This person can erase cards from this addressbook."/></ion-checkbox>
-              <ion-checkbox ng-checked="selectedUser.rights.canViewObjects"
-                            ng-model="selectedUser.rights.canViewObjects"
-                            ng-change="confirmChange(selectedUser)">
-                <var:string label:value="This person can read the cards of this addressbook."/></ion-checkbox>
-            </div>
-          </div>
-        </ion-list>
-      </ion-content>
-      <ion-footer-bar class="bar-footer">
-        <ion-search class="item item-light" label:placeholder="Add..." min-length="2"
-                    model="usersFound"
-                    source="searchUsers"
-                    clear="cancelSearch()">
-        </ion-search>
-      </ion-footer-bar>
-    </ion-modal-view>
-  </script>
-</var:component>
diff --git a/UI/Templates/Themes/mobile/MailerUI/UIxMailMainFrame.wox b/UI/Templates/Themes/mobile/MailerUI/UIxMailMainFrame.wox
deleted file mode 100644
index 73314c562..000000000
--- a/UI/Templates/Themes/mobile/MailerUI/UIxMailMainFrame.wox
+++ /dev/null
@@ -1,94 +0,0 @@
-<?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:uix="OGo:uix"
-    xmlns:label="OGo:label"
-    xmlns:rsrc="OGo:url"
-    const:jsFiles="Common/resource.js, Common/ui-common.js, Mailer/account-model.js, Mailer/mailbox-model.js, Mailer/message-model.js"
-    className="UIxPageFrame"
-    title="name">
-  <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>
-
-  <ion-nav-view><!-- main view --></ion-nav-view>
-
-
-  <script type="text/ng-template" id="mailboxes.html">
-    <ion-view title="Mailboxes">
-      <ion-nav-buttons side="left">
-        <button menu-toggle="left" class="button button-icon icon ion-navicon"><!-- menu toggle --></button>
-      </ion-nav-buttons>
-      <ion-nav-buttons side="right">
-        <a class="button button-clear button-positive button-icon icon ion-ios7-plus-empty" ng-click="newMailbox()"><!-- new --></a>
-      </ion-nav-buttons>
-      <ion-content class="has-header">
-        <!-- sgFamilyTree -->
-        <ion-list ng-repeat="account in accounts">
-          <ion-item class="item-divider">{{account.name}}</ion-item>
-          <sg-folder-tree ng-repeat="folder in account.$mailboxes track by folder.id"
-                          sg-root="account"
-                          sg-folder="folder"
-                          sg-set-folder="setCurrentFolder"
-                          sg-edit="edit"><!-- tree --></sg-folder-tree>
-        </ion-list>
-      </ion-content>
-    </ion-view>
-  </script>
-
-  <script type="text/ng-template" id="mailbox.html">
-    <ion-view title="{{mailbox.name}}">
-      <ion-nav-buttons side="right">
-        <a class="button button-clear button-positive button-icon icon ion-ios7-plus-empty"><!-- edit --></a>
-      </ion-nav-buttons>
-      <ion-content class="has-header">
-        <ion-list>
-          <ion-item class="item-input">
-            <i class="icon ion-search placeholder-icon"><!-- search --></i>
-            <input type="text"
-                   placeholder="Search"
-                   ng-model="search.filter"
-                   ng-keyup="doSearch($event)"/>
-          </ion-item>
-        </ion-list>
-        <ion-list class="small">
-          <ion-item class="item-icon-right" option-buttons="buttons"
-                    collection-repeat="currentMessage in mailbox.$messages"
-                    collection-item-height="52"
-                    ui-sref="app.mail.account.mailbox.message({accountId: account.id, mailboxId: (mailbox.path | encodeUri), messageId: currentMessage.uid})">
-            <small class="right">{{currentMessage.relativedate}}</small>
-            <h2>{{currentMessage.$shortAddress('from')}}</h2>
-            <p>{{currentMessage.subject}}</p>
-            <i class="icon ion-looping"
-               ng-hide="mailbox.$loadMessage(currentMessage.uid)"><!-- loading --></i>
-            <i class="icon ion-ios7-arrow-right"><!-- right arrow icon --></i>
-          </ion-item>
-        </ion-list>
-      </ion-content>
-    </ion-view>
-  </script>
-
-  <script type="text/ng-template" id="message.html">
-    <ion-view title="{{message.from[0].name}}">
-      <ion-nav-buttons side="right">
-        <a class="button button-clear button-positive button-icon icon ion-ios7-plus-empty"><!-- new --></a>
-      </ion-nav-buttons>
-      <ion-content class="has-header" padding="10">
-        <h5>{{message.subject}}</h5>
-        <small><a ng-href="mailto:{{message.from[0].address}}">{{message.from[0].name}}</a>
-        -
-        <a ng-href="mailto:{{message.to[0].address}}">{{message.to[0].name}}</a>
-        <br />
-        {{message.date}}</small>
-        <hr/>
-        <div ng-bind-html="message.$content()"><!-- msg --></div>
-      </ion-content>
-    </ion-view>
-  </script>
-
-</var:component>
diff --git a/UI/Templates/Themes/mobile/MainUI/SOGoRootPage.wox b/UI/Templates/Themes/mobile/MainUI/SOGoRootPage.wox
deleted file mode 100644
index 6ad8626f2..000000000
--- a/UI/Templates/Themes/mobile/MainUI/SOGoRootPage.wox
+++ /dev/null
@@ -1,79 +0,0 @@
-<?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:uix="OGo:uix"
-    xmlns:label="OGo:label"
-    xmlns:rsrc="OGo:url"
-    const:jsFiles="Common/SOGoAuthentication.js"
-    className="UIxPageFrame"
-    title="name"
-    var:popup="isPopup">
-
-  <body ng-app="SOGo.RootPage">
-
-  <ion-nav-view><!-- main view --></ion-nav-view>
-
-  <script type="text/ng-template" id="menu.html">
-    <ion-side-menus>
-      <ion-side-menu-content>
-        <ion-nav-bar class="bar-stable nav-title-slide-ios7">
-          <ion-nav-back-button class="button-clear"><i class="icon ion-ios7-arrow-back"><!-- back --></i> Back</ion-nav-back-button>
-        </ion-nav-bar>
-        <ion-nav-view name="menuContent" animation="slide-left-right"><!-- content --></ion-nav-view>
-      </ion-side-menu-content>
-
-      <ion-side-menu side="left">
-        <ion-content padding="true">
-          <img class="full-image" alt="SOGo" rsrc:src="img/sogo-logo.png"/>
-          <a class="button button-balanced button-block button-clear" href="http://sogo.nu/" target="_new">sogo.nu</a>
-          <small>Version <var:string value="version"/> <span class="buildDate">(<var:string value="buildDate" />)</span></small>
-          <p><var:string label:value="AboutBox" const:escapeHTML="NO"/></p>
-          <img class="full-image" const:alt="Inverse" rsrc:src="img/inverse.png"/>
-          <a class="button button-positive button-block button-clear" href="http://inverse.ca/" target="_new">inverse.ca</a>
-          <a ng-href="{{ApplicationBaseURL}}?theme=desktop" class="button button-small button-outline button-stable button-block"><var:string label:value="Desktop Version"/></a>
-        </ion-content>
-      </ion-side-menu>
-    </ion-side-menus>
-  </script>
-
-  <script type="text/ng-template" id="login.html">
-    <ion-view label:title="Login">
-      <ion-nav-buttons side="left">
-        <button menu-toggle="left" class="button button-icon icon ion-navicon"><!-- menu toggle --></button>
-      </ion-nav-buttons>
-      <ion-content class="has-header">
-        <form name="loginForm" ng-submit="login(creds)">
-        <ion-list>
-          <ion-item class="item-input item-floating-label">
-            <span class="input-label"><var:string label:value="Username"/></span>
-            <input type="text" placeholder="username" ng-model="creds.username" required="required"/>
-          </ion-item>
-          <ion-item class="item-input item-floating-label">
-            <span class="input-label"><var:string label:value="Password"/></span>
-            <input type="password" placeholder="password" ng-model="creds.password" required="required"/>
-          </ion-item>
-          <ion-item class="item-input item-select">
-            <div class="input-label"><var:string label:value="Language"/></div>
-            <var:popup const:name="language"
-                       const:ng-model="creds.language"
-		       list="languages"
-		       item="item"
-		       var:value="item"
-		       string="languageText"
-		       label:noSelectionString="choose"
-		       />
-          </ion-item>
-        </ion-list>
-        <ion-checkbox ng-model="creds.rememberLogin"><var:string label:value="Remember username"/></ion-checkbox>
-        <p class="padding"><input class="button button-block button-positive" type="submit" label:value="Connect"/></p>
-        </form>
-      </ion-content>
-    </ion-view>
-  </script>
-
-  </body>
-
-</var:component>
