diff --git a/apps/spreadsheeteditor/mobile/app/template/AddImage.template b/apps/spreadsheeteditor/mobile/app/template/AddImage.template
deleted file mode 100644
index c6d18ccc3..000000000
--- a/apps/spreadsheeteditor/mobile/app/template/AddImage.template
+++ /dev/null
@@ -1,70 +0,0 @@
-<!-- Root view -->
-<div id="addimage-root-view">
-    <div class="list-block">
-        <ul>
-            <li>
-                <a id="add-image-file" class="item-link no-indicator">
-                    <div class="item-content">
-                        <div class="item-media">
-                            <i class="icon icon-search"></i>
-                        </div>
-                        <div class="item-inner">
-                            <div class="item-title">Picture from Library</div>
-                        </div>
-                    </div>
-                </a>
-            </li>
-            <li>
-                <a id="add-image-url" class="item-link">
-                    <div class="item-content">
-                        <div class="item-media">
-                            <i class="icon icon-link"></i>
-                        </div>
-                        <div class="item-inner">
-                            <div class="item-title">Picture from URL</div>
-                        </div>
-                    </div>
-                </a>
-            </li>
-        </ul>
-    </div>
-</div>
-
-<!-- Url view -->
-<div id="addimage-url-view">
-    <div class="navbar">
-        <div class="navbar-inner">
-            <div class="left sliding"><a href="#" class="back link"><i class="icon icon-back"></i><% if (!android) { %><span>Back</span><% } %></a></div>
-            <div class="center sliding">Link Settings</div>
-        </div>
-    </div>
-    <div class="page" id="addimage-url">
-        <div class="page-content">
-            <div class="content-block-title">Address</div>
-            <div class="list-block">
-                <ul>
-                    <li>
-                        <div id="addimage-link-url" class="item-content">
-                            <div class="item-inner">
-                                <div class="item-input">
-                                    <input type="url" placeholder="Image URL">
-                                </div>
-                            </div>
-                        </div>
-                    </li>
-                </ul>
-            </div>
-            <div class="list-block disabled" id="addimage-insert">
-                <% if (android) { %>
-                <a href="#" class="button button-fill button-raised" style="margin: 20px 16px;">Insert Image</a>
-                <% } else { %>
-                <ul>
-                    <li>
-                        <a href="#" class="list-button item-link">Insert Image</a>
-                    </li>
-                </ul>
-                <% } %>
-            </div>
-        </div>
-    </div>
-</div>
\ No newline at end of file
diff --git a/apps/spreadsheeteditor/mobile/app/template/AddTable.template b/apps/spreadsheeteditor/mobile/app/template/AddTable.template
deleted file mode 100644
index 69398316d..000000000
--- a/apps/spreadsheeteditor/mobile/app/template/AddTable.template
+++ /dev/null
@@ -1,12 +0,0 @@
-<!-- Root view -->
-<div id="add-table-root">
-    <div class="page-content dataview table-styles">
-        <ul class="row">
-            <% _.each(styles, function(style) { %>
-            <li data-type="<%= style.templateId %>">
-                <img src="<%= style.imageUrl %>">
-            </li>
-            <% }); %>
-        </ul>
-    </div>
-</div>
\ No newline at end of file
diff --git a/apps/spreadsheeteditor/mobile/app/view/add/AddOther.js b/apps/spreadsheeteditor/mobile/app/view/add/AddOther.js
index f5e2034c3..3eba05fd2 100644
--- a/apps/spreadsheeteditor/mobile/app/view/add/AddOther.js
+++ b/apps/spreadsheeteditor/mobile/app/view/add/AddOther.js
@@ -117,7 +117,7 @@ define([
 
                 $('#addimage-url').single('click', this.showImageFromUrl.bind(this));
                 $('#addimage-file').single('click', function () {
-                    this.fireEvent('insert:image',[{islocal:true}]);
+                    this.fireEvent('image:insert',[{islocal:true}]);
                 }.bind(this));
             },
 
@@ -140,7 +140,7 @@ define([
                     display = $('#add-link-display input').val(),
                     tip     = $('#add-link-tip input').val();
 
-                this.fireEvent('insert:link', [{url:url, text:display, tooltip:tip}]);
+                this.fireEvent('link:insert', [{url:url, text:display, tooltip:tip}]);
             },
 
             showImageFromUrl: function () {
@@ -151,7 +151,7 @@ define([
 
                 $('#addimage-insert a').single('click', _.buffered(function () {
                     var value = ($input.val()).replace(/ /g, '');
-                    me.fireEvent('insert:image', [{islocal:false, url:value}]);
+                    me.fireEvent('image:insert', [{islocal:false, url:value}]);
                 }, 100, me));
 
                 var $btnInsert = $('#addimage-insert');