diff --git a/insert.php b/insert.php
index 6c5e0b5..92e1318 100644
--- a/insert.php
+++ b/insert.php
@@ -57,8 +57,8 @@
     }
 
     $edusharing->id = $id;
+    $edusharing->src = $CFG->wwwroot . '/mod/edusharing/pix/edusharing.png';
 
-    $edusharing->src = $CFG->wwwroot . '/lib/editor/edusharing/images/edusharing.png';
 
     header('Content-type: application/json', true, 200);
     echo json_encode($edusharing);
diff --git a/lang/de/atto_edusharing.php b/lang/de/atto_edusharing.php
index d3d898b..2046b3f 100644
--- a/lang/de/atto_edusharing.php
+++ b/lang/de/atto_edusharing.php
@@ -22,8 +22,8 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$string['pluginname'] = 'edu-sharing';
-$string['dialogtitle'] = 'edu-sharing Material';
+$string['pluginname'] = get_config('edusharing', 'application_appname');
+$string['dialogtitle'] = get_config('edusharing', 'application_appname') . ' Material';
 $string['settings'] = 'edu-sharing (Atto)';
 $string['insert'] = 'EINFÜGEN';
 $string['update'] = 'AKTUALISIEREN';
@@ -39,11 +39,11 @@
 $string['dimensionsWidth'] = 'Breite';
 $string['dimensionsheight'] = 'Höhe';
 $string['openRepo'] = 'REPOSITORIUM ÖFFNEN';
-$string['hint1'] = 'Wählen Sie ein edu-sharing Objekt aus dem Repositorium, um es in Moodle einzubinden. Klicken Sie dazu auf "REPOSITORIUM ÖFFNEN".';
+$string['hint1'] = 'Wählen Sie ein '.get_config('edusharing', 'application_appname').' Objekt aus dem Repositorium, um es in Moodle einzubinden. Klicken Sie dazu auf "REPOSITORIUM ÖFFNEN".';
 $string['hint2'] = 'Suchen Sie nun das gewünschte Objekt und betätigen Sie die "ÜBERNEHMEN" Schaltfläche.';
 $string['skipHint'] = 'Beim nächsten Mal direkt zur Suche springen.';
 $string['directoryHint'] = 'Der Ordner wird eingebunden. Elemente des Ordners werden angezeigt, nicht aber weitere Unterordner.';
-$string['privacy:metadata'] = 'Das edu-sharing atto-Plugin speichert keine Benutzerdaten.';
+$string['privacy:metadata'] = 'Das '.get_config('edusharing', 'application_appname').' atto-Plugin speichert keine Benutzerdaten.';
 
 $string['edusharing:visible'] = 'edu-sharing atto-plugin Sichtbarkeit';
 
diff --git a/lang/en/atto_edusharing.php b/lang/en/atto_edusharing.php
index c498843..b6c8494 100644
--- a/lang/en/atto_edusharing.php
+++ b/lang/en/atto_edusharing.php
@@ -22,8 +22,8 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$string['pluginname'] = 'edu-sharing';
-$string['dialogtitle'] = 'edu-sharing material';
+$string['pluginname'] = get_config('edusharing', 'application_appname');
+$string['dialogtitle'] = get_config('edusharing', 'application_appname').' material';
 $string['settings'] = 'edu-sharing (Atto)';
 $string['insert'] = 'EMBED';
 $string['update'] = 'UPDATE';
@@ -39,11 +39,11 @@
 $string['dimensionsWidth'] = 'Width';
 $string['dimensionsheight'] = 'Height';
 $string['openRepo'] = 'OPEN REPOSITORY';
-$string['hint1'] = 'Select an edu-sharing object from the repository to embed it in Moodle. Click on "OPEN REPOSITORY".';
+$string['hint1'] = 'Select an '.get_config('edusharing', 'application_appname').' object from the repository to embed it in Moodle. Click on "OPEN REPOSITORY".';
 $string['hint2'] = 'Search for the desired object and click the "APPLY" button.';
 $string['skipHint'] = 'Open the search engine right away next time.';
 $string['directoryHint'] = 'The folder was embedded. Elements of the folder will be displayed, but not its subfolders.';
-$string['privacy:metadata'] = 'The edu-sharing atto-plugin does not store any user data.';
+$string['privacy:metadata'] = 'The '.get_config('edusharing', 'application_appname').' atto-plugin does not store any user data.';
 
 $string['edusharing:visible'] = 'edu-sharing atto-plugin visibility';
 
diff --git a/lib.php b/lib.php
index 7f91ce9..1217682 100644
--- a/lib.php
+++ b/lib.php
@@ -80,9 +80,16 @@ function atto_edusharing_params_for_js() {
         $params['disabled'] = true;
         return $params;
     }
+
+
     $params['disabled'] = false;
     $params['repourl'] = trim(get_config('edusharing', 'application_cc_gui_url'), '/');
     $params['courseid'] = $COURSE->id;
+    $params['buttonTitle'] = 'edu-sharing';
+
+    if (!empty(get_config('edusharing', 'application_appname'))){
+        $params['buttonTitle'] = get_config('edusharing', 'application_appname');
+    }
 
     return $params;
 }
diff --git a/styles.css b/styles.css
index e36fc37..a8c56cd 100644
--- a/styles.css
+++ b/styles.css
@@ -116,7 +116,7 @@ input#edusharing_title:hover + #edusharing_title_pencil {
     background-color: #efefef;
     background-repeat: no-repeat;
     background-size: 16px;
-    background-image: url('[[pix:atto_edusharing|/icon]]');
+    background-image: url('[[pix:edusharing|icon]]');
 }
 
 .editor_atto img.edusharing_atto {
diff --git a/version.php b/version.php
index 4551d44..0e9f7f4 100644
--- a/version.php
+++ b/version.php
@@ -24,14 +24,14 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version = 2021093001;        // The current plugin version (Date: YYYYMMDDXX).
+$plugin->version = 2021100603;        // The current plugin version (Date: YYYYMMDDXX).
 $plugin->requires = 2013110500;        // Requires this Moodle version.
 $plugin->component = 'atto_edusharing';  // Full name of the plugin (used for diagnostics).
 $plugin->maturity = MATURITY_STABLE;
 $plugin->dependencies = array(
-    'mod_edusharing' => 2018110801
+    'mod_edusharing' => 2021100601
 );
 // Human readable version information.
-$plugin->release = '5.0';
+$plugin->release = '6.0';
 
 
diff --git a/yui/build/moodle-atto_edusharing-button/moodle-atto_edusharing-button-debug.js b/yui/build/moodle-atto_edusharing-button/moodle-atto_edusharing-button-debug.js
index fe201fe..e1efa75 100644
--- a/yui/build/moodle-atto_edusharing-button/moodle-atto_edusharing-button-debug.js
+++ b/yui/build/moodle-atto_edusharing-button/moodle-atto_edusharing-button-debug.js
@@ -122,8 +122,9 @@ Y.namespace('M.atto_edusharing').Button = Y.Base.create('button', Y.M.editor_att
         }
         this.addButton({
             icon: 'icon',
-            iconComponent: 'atto_edusharing',
+            iconComponent: 'edusharing',
             buttonName: 'icon',
+            title: this.get('buttonTitle'),
             callback: this._displayDialogue,
             callbackArgs: 'icon',
             tags: '.edusharing_atto',
diff --git a/yui/build/moodle-atto_edusharing-button/moodle-atto_edusharing-button-min.js b/yui/build/moodle-atto_edusharing-button/moodle-atto_edusharing-button-min.js
index 7bb6a71..008e7c3 100644
--- a/yui/build/moodle-atto_edusharing-button/moodle-atto_edusharing-button-min.js
+++ b/yui/build/moodle-atto_edusharing-button/moodle-atto_edusharing-button-min.js
@@ -1,3 +1,3 @@
-YUI.add("moodle-atto_edusharing-button",function(h,e){var d="atto_edusharing",n='<div id="edusharing_hint"> <img src="" id="edusharing_hint_logo"><img id="edusharing_hint_help" src="'+M.cfg.wwwroot+'/lib/editor/atto/plugins/edusharing/pix/help_en.gif">{{get_string "hint1" component}}<br/><br/>{{get_string "hint2" component}}<div style="clear: both"></div><div id="edusharing_hint_skip"><input type="checkbox" id="edusharing_hint_check" name="edusharing_hint_check" value="dontshow" /><label for="edusharing_hint_check">{{get_string "skipHint" component}}</label></div><div class="edusharing_center edusharing_hint_buttons"><a id="edusharing_hint_close" class="btn btn-secondary" href="#">{{get_string "cancel" component}}</a> <button id="edusharing_open_repo" class="btn btn-primary">{{get_string "openRepo" component}}</button></div></div> <form id="edusharing_form" class="atto_form" style="display: none"><input id="edusharing_object_url" name="edusharing_object_url" type="hidden" value="" /><input id="edusharing_resid" name="edusharing_resid" type="hidden" value="" /><input id="edusharing_mimetype" name="edusharing_mimetype" type="hidden" value="" /><input id="edusharing_mediatype" name="edusharing_mediatype" type="hidden" value="" /><input id="edusharing_preview_url" name="edusharing_preview_url" type="hidden" value="" /><input id="edusharing_version" name="edusharing_version" type="hidden" value="" /><input id="edusharing_ratio" name="edusharing_ratio" type="hidden" value="" /><h2>{{get_string "title" component}}</h2><input id="edusharing_title" name="edusharing_title" value="" maxlength="25"/><i id="edusharing_title_pencil" class="icon fa fa-pencil fa-fw " aria-hidden="true"></i> <span style="position:absolute; color: rgba(0, 0, 0, 0); display:inline-block; font-size:2em;"id="edusharing_title_helper" name="edusharing_title_helper" value=""></span> <img src="" id="edusharing_preview"> <div id="edusharing_hint_directory" style="display:none">{{get_string "directoryHint" component}}</div><br/><input type="checkbox" id="edusharing_version_latest" name="edusharing_version_latest" checked /><label for="edusharing_version_latest" class="edusharing_label_inline" id="edusharing_version_latest_label">{{get_string "alwaysShowLatestVersion" component}}</label> <div id="edusharing_wrapper_caption" class="edusharing_form_wrapper"><h2>{{get_string "subtitle" component}}</h2> <input id="edusharing_caption" name="edusharing_caption" value="" /></div><div id="edusharing_wrapper_alignment" class="edusharing_form_wrapper"><h2>{{get_string "alignment" component}}</h2> <div class="edusharing_wrapper_alignment_radiowrapper"><input type="radio" id="edusharing_alignment_left" name="edusharing_alignment" value="left"><label for="edusharing_alignment_left" class="edusharing_label_inline">{{get_string "alignmentLeft" component}}</label> </div><div class="edusharing_wrapper_alignment_radiowrapper"><input type="radio" id="edusharing_alignment_right" name="edusharing_alignment" value="right"><label for="edusharing_alignment_right" class="edusharing_label_inline">{{get_string "alignmentRight" component}}</label> </div><div class="edusharing_wrapper_alignment_radiowrapper"><input type="radio" id="edusharing_alignment_none" name="edusharing_alignment" value="none" checked="checked"><label for="edusharing_alignment_none" class="edusharing_label_inline">{{get_string "alignmentNone" component}}</label> </div></div><div id="edusharing_wrapper_dimensions" class="edusharing_form_wrapper"><h2>{{get_string "dimensions" component}}</h2><div style="float:left;margin-right: 20px;"><label for="edusharing_width" class="edusharing_label_block">{{get_string "dimensionsWidth" component}}</label><input type="number" id="edusharing_width" name="edusharing_width" value="" maxlength="4" length="4" />&nbsp;px</div><div><label for="edusharing_height" class="edusharing_label_block">{{get_string "dimensionsheight" component}}</label><input type="number" id="edusharing_height" name="edusharing_height" value="" maxlength="4" length="4"/>&nbsp;px</div></div><div id="edusharing_wrapper_buttons" class="edusharing_form_wrapper"><a id="edusharing_dialog_cancel" class="btn" href="#">{{get_string "cancel" component}}</a><button id="edusharing_submit" class="btn btn-primary">{{get_string "insert" component}}</button> </div></form>';function u(e){this.name="",this.object_url="",this.course=e,this.id="",this.object_version="0"}h.namespace("M.atto_edusharing").Button=h.Base.create("button",h.M.editor_atto.EditorPlugin,[],{initializer:function(){var e,i;this.get("disabled")||(this.addButton({icon:"icon",iconComponent:"atto_edusharing",buttonName:"icon",callback:this._displayDialogue,callbackArgs:"icon",tags:".edusharing_atto",tagMatchRequiresAll:!1}),(e=this.get("host").textarea.ancestor("form"))&&e.on("submit",this.eduSubmit,this),this.getExistingObjects(),i=this,window.addEventListener("message",function(e){if("APPLY_NODE"==e.data.event){var t=e.data.data;window.win.close(),i.updateDialog(t)}},!1))},getUrlVars:function(e){var n={};return e.startsWith("?")||(e="?"+e),e.replace(/[?&]+([^=&]+)=([^&]*)/gi,function(e,t,i){n[t]=i}),n},getExistingObjects:function(){var e,t,i,n,s,r=this.get("host").textarea.get("value"),a=document.createElement("div");for(a.innerHTML=r,e=[a];0<e.length;)if(1==(t=e.shift()).nodeType&&h.one(t).hasClass("edusharing_atto")&&(i="img"==t.nodeName.toLowerCase()?t.getAttribute("src"):t.getAttribute("href"),n=new URL(i).searchParams,(s=new u(this.get("courseid"))).importNode(n)?this.get("existingObjects")[s.id]=s:(alert("error_importing_node - 1"),t.parentNode.removeChild(t))),t.hasChildNodes())for(child=0;child<t.childNodes.length;)e.push(t.childNodes.item(child)),child++},updateDialog:function(e,t){var i,n,s,r,a;h.one("#edusharing_form").set("style","display:block"),h.one("#edusharing_hint").set("style","display:none"),e.isDirectory?(h.one("#edusharing_wrapper_dimensions").set("style","display:none"),h.one("#edusharing_version_latest").set(
-"style","visibility:hidden"),h.one("#edusharing_version_latest_label").set("style","visibility:hidden"),h.one("#edusharing_wrapper_alignment").set("style","visibility:hidden"),h.one("#edusharing_hint_directory").set("style","display:block")):"ref"==this.getType(e.mediatype)?h.one("#edusharing_wrapper_dimensions").set("style","visibility:hidden"):(n=i=1e3,s=0,r=Math.round(e.properties["ccm:width"])||600,a=Math.round(e.properties["ccm:height"])||400,i<r&&(a*=s=i/r,r*=s),n<a&&(r*=s=n/a,a*=s),h.one("#edusharing_width").set("value",Math.round(r)),h.one("#edusharing_height").set("value",Math.round(a)),h.one("#edusharing_ratio").set("value",r/a)),h.one("#edusharing_title").set("value",e.title||e.name),h.one("#edusharing_caption").set("value",e.caption||""),h.one("#edusharing_object_url").set("value",e.objectUrl),h.one("#edusharing_mimetype").set("value",e.mimetype),h.one("#edusharing_mediatype").set("value",e.mediatype),h.one("#edusharing_preview_url").set("value",e.preview.url),h.one("#edusharing_preview").set("src",e.preview.url),h.one("#edusharing_version").set("value",e.properties["cclom:version"]),t&&(h.one("#edusharing_resid").set("value",e.resid),h.one("#edusharing_version_latest").set("style","display:none"),h.one("#edusharing_version_latest_label").set("style","display:none"),h.one("#edusharing_submit").setContent(M.util.get_string("update",d)),e.alignment?(h.one("#edusharing_alignment_none").set("checked",!1),h.one("#edusharing_alignment_"+e.alignment).set("checked",!0)):(h.one("#edusharing_alignment_none").set("checked",!0),h.one("#edusharing_alignment_right").set("checked",!1),h.one("#edusharing_alignment_left").set("checked",!1)))},eduSubmit:function(){var e,t,i,n,s,r,a,o=this.get("host").textarea.get("value"),d=document.createElement("div");for(d.innerHTML=o,e=[d];0<e.length;)if(1==(t=e.shift()).nodeType&&h.one(t).hasClass("edusharing_atto")&&(i="",i="img"==t.nodeName.toLowerCase()?t.getAttribute("src"):t.getAttribute("href"),(s=(n=new URL(i).searchParams).get("resourceId"))&&this.get("existingObjects")[s]?delete this.get("existingObjects")[s]:((r=new u(this.get("courseid"))).importNode(n)||alert("error_importing_node - 2"),r.link(t)||(alert("error_setting_usage"),t.parentNode.removeChild(t)),"img"==t.nodeName.toLowerCase()?t.setAttribute("src",this.getPreviewUrl(r.id)+"&"+n.toString()):t.setAttribute("href",this.getPreviewUrl(r.id)+"&"+n.toString()))),t.hasChildNodes())for(a=0;a<t.childNodes.length;)e.push(t.childNodes.item(a)),a++;for(s in this.get("existingObjects"))this.get("existingObjects")[s].unlink(t)||alert("error_deleting_usage");this.get("host").textarea.set("value",d.innerHTML)},getQueryStringFromParams:function(e){var t,i=[];for(t in e)i.push(t+"="+e[t]);return i.join("&")},getPreviewUrl:function(e){var t=M.cfg.wwwroot+"/lib/editor/atto/plugins/edusharing/preview.php";return t+="?resourceId="+e},getSelectedElement:function(){var e=this.get("host").getSelectedNodes()._nodes[0];return e&&e.nodeType&&3==e.nodeType&&(e=e.parentElement),void 0!==e&&h.one(e).hasClass("edusharing_atto")?e:""},handleUpdate:function(){var e,t,i=[],n=this.getSelectedElement();return!!n&&(e="img"==n.nodeName.toLowerCase()?n.getAttribute("src"):n.getAttribute("href"),"folder"==(t=new URL(e).searchParams).get("mediatype")&&(i.isDirectory=!0),t.get("resourceId")&&(i.resid=t.get("resourceId")),i.title=t.get("title"),i.caption=t.get("caption"),i.properties=[],t.get("width")&&(i.properties["ccm:width"]=n.attributes.width.value),n.attributes.height&&(i.properties["ccm:height"]=n.attributes.height.value),i.objectUrl=t.get("object_url"),i.mimetype=t.get("mimetype"),i.mediatype=t.get("mediatype"),i.preview=[],"content"==this.getType(i.mediatype)?i.preview.url=n.attributes.src.value:i.preview.url=n.attributes.href.value,n.attributes.src?i.preview.url=n.attributes.src.value:i.preview.url=n.attributes.href.value,i.properties["cclom:version"]=t.get("window_version"),i.alignment=n.style["float"],this.updateDialog(i,!0),!0)},_displayDialogue:function(e,t){var i,n,s,r,a,o;e.preventDefault(),i=800,n=600,(s=this.getDialogue({headerContent:M.util.get_string("dialogtitle",d),width:i+"px",height:n+"px",focusAfterHide:t})).width!==i+"px"&&s.set("width",i+"px"),r=this._getFormContent(t),(a=h.Node.create("<div></div>")).append(r),s.set("bodyContent",a),this.handleUpdate()||(h.one("#edusharing_hint_logo").setAttribute("src",this.get("repourl")+"/assets/images/logo.svg"),o=this,YUI().use("cookie",function(e){e.Cookie.get("edusharing_hint_hide")?(o.open_repo(),YUI().use("node",function(e){e.one("#edusharing_hint_check").setAttribute("checked","checked")})):YUI().use("node",function(e){e.one("#edusharing_hint_check").removeAttribute("checked")})})),s.show(),this.markUpdated()},_getFormContent:function(e){var t=h.Handlebars.compile(n),i=h.Node.create(t({component:d,clickedicon:e}));return this._form=i,this._form.one("#edusharing_submit").on("click",this._doInsert,this),this._form.one("#edusharing_hint_check").setAttribute("checked","checked"),this._form.one("#edusharing_hint_check").on("change",this.edusharing_hint_check_change,this),this._form.one("#edusharing_open_repo").on("click",this.open_repo,this),this._form.one("#edusharing_hint_close").on("click",this.closeDialog,this),this._form.one("#edusharing_dialog_cancel").on("click",this.closeDialog,this),this._form.one("#edusharing_width").on("change",this.recalculateDimensions,this),this._form.one("#edusharing_width").on("keyup",this.recalculateDimensions,this),this._form.one("#edusharing_height").on("change",this.recalculateDimensions,this),this._form.one("#edusharing_height").on("keyup",this.recalculateDimensions,this),this._form.one("#edusharing_title").on("keyup",this.recalculateTitleWidth,this),i},recalculateTitleWidth:function(){h.one("#edusharing_title_helper").setContent(h.one("#edusharing_title").get("value")),h.one("#edusharing_title").setStyle("width",h.one("#edusharing_title_helper").get("offsetWidth")+10+"px")},closeDialog:function(e){e.preventDefault(),
-this.getDialogue({focusAfterHide:null}).hide()},open_repo:function(){var e,t,i;window.win=window.open(),window.win.document.write("Loading edu-sharing ticket..."),e=M.cfg.wwwroot+"/lib/editor/atto/plugins/edusharing/fetch.php",t=this.get("repourl"),i=this.get("courseid"),fetch(e,{method:"post",mode:"cors",headers:{"Content-Type":"application/json",Accept:"application/json"},body:JSON.stringify({useCase:"getTicket",courseid:i})}).then(function(e){if(200<=e.status&&e.status<300)return e.text();throw new Error(e.statusText)}).then(function(e){t+="/components/search?reurl=WINDOW&applyDirectories=true&ticket="+e,window.win.location.href=t})},recalculateDimensions:function(e){"edusharing_height"==e._currentTarget.id?h.one("#edusharing_width").set("value",Math.round(h.one("#edusharing_height").get("value")*h.one("#edusharing_ratio").get("value"))):h.one("#edusharing_height").set("value",Math.round(h.one("#edusharing_width").get("value")/h.one("#edusharing_ratio").get("value")))},edusharing_hint_check_change:function(t){YUI().use("cookie",function(e){t.target._stateProxy.checked?e.Cookie.set("edusharing_hint_hide",!0,{expires:new Date("January 12, 2025")}):e.Cookie.remove("edusharing_hint_hide")})},_doInsert:function(e){var t,i,n,s,r,a;e.preventDefault(),this.getDialogue({focusAfterHide:null}).hide(),this.editor.focus(),(t=this.getNode()).resid?((i=this.getSelectedElement()).setAttribute("title",t.title),n="","none"!=t.alignment&&(n="float:"+t.alignment),"folder"==t.mediatype&&(n="display:block;"),i.setAttribute("style",n),"ref"==this.getType(t.mediatype)?(s=new URL(i.attributes.href.value),i.innerHTML=t.title,s.searchParams.set("title",t.title),s.searchParams.set("caption",t.caption),i.setAttribute("href",s.toString())):((s=new URL(i.attributes.src.value)).searchParams.set("title",t.title),s.searchParams.set("caption",t.caption),s.searchParams.set("width",t.width),s.searchParams.set("height",t.height),i.setAttribute("alt",t.title),i.setAttribute("width",t.width),i.setAttribute("height",t.height),i.setAttribute("src",s.toString()))):(n="","none"!=t.alignment&&(n="float:"+t.alignment+";"),"folder"==t.mediatype&&(n="display:block;"),r="0",0==t.showlatest&&"undefined"!=t.version&&(r=t.version),a='class="edusharing_atto" style="'+n+'" title="'+t.title+'" contenteditable="false" ',s=t.previewurl+"&caption="+t.caption+"&object_url="+t.objecturl+"&mediatype="+t.mediatype+"&mimetype="+t.mimetype+"&window_version="+r+"&title="+t.title,(s=new URL(t.previewurl)).searchParams.set("caption",t.caption),s.searchParams.set("object_url",t.objecturl),s.searchParams.set("mediatype",t.mediatype),s.searchParams.set("mimetype",t.mimetype),s.searchParams.set("window_version",r),s.searchParams.set("title",t.title),"ref"==t.type?a="&nbsp;<a "+a+' href="'+s.toString()+'">'+t.title+"</a>&nbsp;":(a+='src="'+s.toString()+"&width="+t.width+"&height="+t.height+'"',a='<img alt="'+t.title+'" width="'+t.width+'" height="'+t.height+'" '+a+" />",a+="<p>"+t.caption+"</p>"),this.get("host").insertContentAtFocusPoint(a)),this.markUpdated()},getType:function(e){var t="ref";switch(!0){case-1<e.indexOf("image"):case-1<e.indexOf("video"):case-1<e.indexOf("h5p"):case-1<e.indexOf("learningapps"):case-1<e.indexOf("youtube"):case-1<e.indexOf("vimeo"):case-1<e.indexOf("folder"):t="content"}return t},getNode:function(){var e={};return e.resid=h.one("#edusharing_resid").get("value"),e.title=h.one("#edusharing_title").get("value"),e.caption=h.one("#edusharing_caption").get("value"),e.width=h.one("#edusharing_width").get("value"),e.height=h.one("#edusharing_height").get("value"),e.previewurl=h.one("#edusharing_preview_url").get("value"),e.objecturl=h.one("#edusharing_object_url").get("value"),e.mimetype=h.one("#edusharing_mimetype").get("value"),e.mediatype=h.one("#edusharing_mediatype").get("value"),e.showlatest=h.one("#edusharing_version_latest").get("checked"),e.version=h.one("#edusharing_version").get("value"),"undefined"==e.version&&(e.version="0"),e.alignment=h.one("input[name=edusharing_alignment]:checked").get("value"),e.type=this.getType(e.mediatype),"folder"==e.mediatype&&(e.showlatest=!0,e.width=500),e}},{ATTRS:{disabled:{value:!1},repourl:{value:""},courseid:{value:""},ticket:{value:""},existingObjects:{value:[]}}}),u.prototype.importNode=function(e){var t,i,n,s=e.get("title");return!!s&&(this.name=s,!!(t=e.get("object_url"))&&(this.object_url=t,(i=e.get("resourceId"))&&(this.id=i),(n=e.get("window_version"))&&(this.object_version=n),!0))},u.prototype.link=function(e){var t=M.cfg.wwwroot+"/lib/editor/atto/plugins/edusharing/insert.php?sesskey="+M.cfg.sesskey+"&courseid="+this.course,r=this,a=YUI().use("io","json"),i={method:"POST",sync:!0,data:a.JSON.stringify(r),arguments:{},on:{success:function(e,t,i){try{var n=a.JSON.parse(t.responseText)}catch(s){return alert("invalid data"),!1}return n.id?(r.id=n.id,!0):(alert("no resource id"),!1)},failure:function(e,t,i){return alert("error setting usage"),!1}}};return a.io(t,i)},u.prototype.unlink=function(e){var t=M.cfg.wwwroot+"/lib/editor/atto/plugins/edusharing/delete.php?sesskey="+M.cfg.sesskey+"&courseid="+this.course,n=this,i=YUI().use("io","json","json-stringify"),s={method:"POST",sync:!0,headers:{"Content-Type":"application/json"},data:i.JSON.stringify(n),arguments:{object:n,node:e},on:{success:function(e,t,i){return!0},failure:function(e,t,i){return alert("error deleting object "+n.id+"."),!1}}};return i.io(t,s)}},"@VERSION@",{requires:["moodle-editor_atto-plugin"]});
\ No newline at end of file
+YUI.add("moodle-atto_edusharing-button",function(h,e){var d="atto_edusharing",n='<div id="edusharing_hint"> <img src="" id="edusharing_hint_logo"><img id="edusharing_hint_help" src="'+M.cfg.wwwroot+'/lib/editor/atto/plugins/edusharing/pix/help_en.gif">{{get_string "hint1" component}}<br/><br/>{{get_string "hint2" component}}<div style="clear: both"></div><div id="edusharing_hint_skip"><input type="checkbox" id="edusharing_hint_check" name="edusharing_hint_check" value="dontshow" /><label for="edusharing_hint_check">{{get_string "skipHint" component}}</label></div><div class="edusharing_center edusharing_hint_buttons"><a id="edusharing_hint_close" class="btn btn-secondary" href="#">{{get_string "cancel" component}}</a> <button id="edusharing_open_repo" class="btn btn-primary">{{get_string "openRepo" component}}</button></div></div> <form id="edusharing_form" class="atto_form" style="display: none"><input id="edusharing_object_url" name="edusharing_object_url" type="hidden" value="" /><input id="edusharing_resid" name="edusharing_resid" type="hidden" value="" /><input id="edusharing_mimetype" name="edusharing_mimetype" type="hidden" value="" /><input id="edusharing_mediatype" name="edusharing_mediatype" type="hidden" value="" /><input id="edusharing_preview_url" name="edusharing_preview_url" type="hidden" value="" /><input id="edusharing_version" name="edusharing_version" type="hidden" value="" /><input id="edusharing_ratio" name="edusharing_ratio" type="hidden" value="" /><h2>{{get_string "title" component}}</h2><input id="edusharing_title" name="edusharing_title" value="" maxlength="25"/><i id="edusharing_title_pencil" class="icon fa fa-pencil fa-fw " aria-hidden="true"></i> <span style="position:absolute; color: rgba(0, 0, 0, 0); display:inline-block; font-size:2em;"id="edusharing_title_helper" name="edusharing_title_helper" value=""></span> <img src="" id="edusharing_preview"> <div id="edusharing_hint_directory" style="display:none">{{get_string "directoryHint" component}}</div><br/><input type="checkbox" id="edusharing_version_latest" name="edusharing_version_latest" checked /><label for="edusharing_version_latest" class="edusharing_label_inline" id="edusharing_version_latest_label">{{get_string "alwaysShowLatestVersion" component}}</label> <div id="edusharing_wrapper_caption" class="edusharing_form_wrapper"><h2>{{get_string "subtitle" component}}</h2> <input id="edusharing_caption" name="edusharing_caption" value="" /></div><div id="edusharing_wrapper_alignment" class="edusharing_form_wrapper"><h2>{{get_string "alignment" component}}</h2> <div class="edusharing_wrapper_alignment_radiowrapper"><input type="radio" id="edusharing_alignment_left" name="edusharing_alignment" value="left"><label for="edusharing_alignment_left" class="edusharing_label_inline">{{get_string "alignmentLeft" component}}</label> </div><div class="edusharing_wrapper_alignment_radiowrapper"><input type="radio" id="edusharing_alignment_right" name="edusharing_alignment" value="right"><label for="edusharing_alignment_right" class="edusharing_label_inline">{{get_string "alignmentRight" component}}</label> </div><div class="edusharing_wrapper_alignment_radiowrapper"><input type="radio" id="edusharing_alignment_none" name="edusharing_alignment" value="none" checked="checked"><label for="edusharing_alignment_none" class="edusharing_label_inline">{{get_string "alignmentNone" component}}</label> </div></div><div id="edusharing_wrapper_dimensions" class="edusharing_form_wrapper"><h2>{{get_string "dimensions" component}}</h2><div style="float:left;margin-right: 20px;"><label for="edusharing_width" class="edusharing_label_block">{{get_string "dimensionsWidth" component}}</label><input type="number" id="edusharing_width" name="edusharing_width" value="" maxlength="4" length="4" />&nbsp;px</div><div><label for="edusharing_height" class="edusharing_label_block">{{get_string "dimensionsheight" component}}</label><input type="number" id="edusharing_height" name="edusharing_height" value="" maxlength="4" length="4"/>&nbsp;px</div></div><div id="edusharing_wrapper_buttons" class="edusharing_form_wrapper"><a id="edusharing_dialog_cancel" class="btn" href="#">{{get_string "cancel" component}}</a><button id="edusharing_submit" class="btn btn-primary">{{get_string "insert" component}}</button> </div></form>';function l(e){this.name="",this.object_url="",this.course=e,this.id="",this.object_version="0"}h.namespace("M.atto_edusharing").Button=h.Base.create("button",h.M.editor_atto.EditorPlugin,[],{initializer:function(){var e,i;this.get("disabled")||(this.addButton({icon:"icon",iconComponent:"edusharing",buttonName:"icon",title:this.get("buttonTitle"),callback:this._displayDialogue,callbackArgs:"icon",tags:".edusharing_atto",tagMatchRequiresAll:!1}),(e=this.get("host").textarea.ancestor("form"))&&e.on("submit",this.eduSubmit,this),this.getExistingObjects(),i=this,window.addEventListener("message",function(e){if("APPLY_NODE"==e.data.event){var t=e.data.data;window.win.close(),i.updateDialog(t)}},!1))},getUrlVars:function(e){var n={};return e.startsWith("?")||(e="?"+e),e.replace(/[?&]+([^=&]+)=([^&]*)/gi,function(e,t,i){n[t]=i}),n},getExistingObjects:function(){var e,t,i,n,s,r=this.get("host").textarea.get("value"),a=document.createElement("div");for(a.innerHTML=r,e=[a];0<e.length;)if(1==(t=e.shift()).nodeType&&h.one(t).hasClass("edusharing_atto")&&(i="img"==t.nodeName.toLowerCase()?t.getAttribute("src"):t.getAttribute("href"),n=new URL(i).searchParams,(s=new l(this.get("courseid"))).importNode(n)?this.get("existingObjects")[s.id]=s:(alert("error_importing_node - 1"),t.parentNode.removeChild(t))),t.hasChildNodes())for(child=0;child<t.childNodes.length;)e.push(t.childNodes.item(child)),child++},updateDialog:function(e,t){var i,n,s,r,a;h.one("#edusharing_form").set("style","display:block"),h.one("#edusharing_hint").set("style","display:none"),e.isDirectory?(h.one("#edusharing_wrapper_dimensions").set("style","display:none"),h.one(
+"#edusharing_version_latest").set("style","visibility:hidden"),h.one("#edusharing_version_latest_label").set("style","visibility:hidden"),h.one("#edusharing_wrapper_alignment").set("style","visibility:hidden"),h.one("#edusharing_hint_directory").set("style","display:block")):"ref"==this.getType(e.mediatype)?h.one("#edusharing_wrapper_dimensions").set("style","visibility:hidden"):(n=i=1e3,s=0,r=Math.round(e.properties["ccm:width"])||600,a=Math.round(e.properties["ccm:height"])||400,i<r&&(a*=s=i/r,r*=s),n<a&&(r*=s=n/a,a*=s),h.one("#edusharing_width").set("value",Math.round(r)),h.one("#edusharing_height").set("value",Math.round(a)),h.one("#edusharing_ratio").set("value",r/a)),h.one("#edusharing_title").set("value",e.title||e.name),h.one("#edusharing_caption").set("value",e.caption||""),h.one("#edusharing_object_url").set("value",e.objectUrl),h.one("#edusharing_mimetype").set("value",e.mimetype),h.one("#edusharing_mediatype").set("value",e.mediatype),h.one("#edusharing_preview_url").set("value",e.preview.url),h.one("#edusharing_preview").set("src",e.preview.url),h.one("#edusharing_version").set("value",e.properties["cclom:version"]),t&&(h.one("#edusharing_resid").set("value",e.resid),h.one("#edusharing_version_latest").set("style","display:none"),h.one("#edusharing_version_latest_label").set("style","display:none"),h.one("#edusharing_submit").setContent(M.util.get_string("update",d)),e.alignment?(h.one("#edusharing_alignment_none").set("checked",!1),h.one("#edusharing_alignment_"+e.alignment).set("checked",!0)):(h.one("#edusharing_alignment_none").set("checked",!0),h.one("#edusharing_alignment_right").set("checked",!1),h.one("#edusharing_alignment_left").set("checked",!1)))},eduSubmit:function(){var e,t,i,n,s,r,a,o=this.get("host").textarea.get("value"),d=document.createElement("div");for(d.innerHTML=o,e=[d];0<e.length;)if(1==(t=e.shift()).nodeType&&h.one(t).hasClass("edusharing_atto")&&(i="",i="img"==t.nodeName.toLowerCase()?t.getAttribute("src"):t.getAttribute("href"),(s=(n=new URL(i).searchParams).get("resourceId"))&&this.get("existingObjects")[s]?delete this.get("existingObjects")[s]:((r=new l(this.get("courseid"))).importNode(n)||alert("error_importing_node - 2"),r.link(t)||(alert("error_setting_usage"),t.parentNode.removeChild(t)),"img"==t.nodeName.toLowerCase()?t.setAttribute("src",this.getPreviewUrl(r.id)+"&"+n.toString()):t.setAttribute("href",this.getPreviewUrl(r.id)+"&"+n.toString()))),t.hasChildNodes())for(a=0;a<t.childNodes.length;)e.push(t.childNodes.item(a)),a++;for(s in this.get("existingObjects"))this.get("existingObjects")[s].unlink(t)||alert("error_deleting_usage");this.get("host").textarea.set("value",d.innerHTML)},getQueryStringFromParams:function(e){var t,i=[];for(t in e)i.push(t+"="+e[t]);return i.join("&")},getPreviewUrl:function(e){var t=M.cfg.wwwroot+"/lib/editor/atto/plugins/edusharing/preview.php";return t+="?resourceId="+e},getSelectedElement:function(){var e=this.get("host").getSelectedNodes()._nodes[0];return e&&e.nodeType&&3==e.nodeType&&(e=e.parentElement),void 0!==e&&h.one(e).hasClass("edusharing_atto")?e:""},handleUpdate:function(){var e,t,i=[],n=this.getSelectedElement();return!!n&&(e="img"==n.nodeName.toLowerCase()?n.getAttribute("src"):n.getAttribute("href"),"folder"==(t=new URL(e).searchParams).get("mediatype")&&(i.isDirectory=!0),t.get("resourceId")&&(i.resid=t.get("resourceId")),i.title=t.get("title"),i.caption=t.get("caption"),i.properties=[],t.get("width")&&(i.properties["ccm:width"]=n.attributes.width.value),n.attributes.height&&(i.properties["ccm:height"]=n.attributes.height.value),i.objectUrl=t.get("object_url"),i.mimetype=t.get("mimetype"),i.mediatype=t.get("mediatype"),i.preview=[],"content"==this.getType(i.mediatype)?i.preview.url=n.attributes.src.value:i.preview.url=n.attributes.href.value,n.attributes.src?i.preview.url=n.attributes.src.value:i.preview.url=n.attributes.href.value,i.properties["cclom:version"]=t.get("window_version"),i.alignment=n.style["float"],this.updateDialog(i,!0),!0)},_displayDialogue:function(e,t){var i,n,s,r,a,o;e.preventDefault(),i=800,n=600,(s=this.getDialogue({headerContent:M.util.get_string("dialogtitle",d),width:i+"px",height:n+"px",focusAfterHide:t})).width!==i+"px"&&s.set("width",i+"px"),r=this._getFormContent(t),(a=h.Node.create("<div></div>")).append(r),s.set("bodyContent",a),this.handleUpdate()||(h.one("#edusharing_hint_logo").setAttribute("src",this.get("repourl")+"/assets/images/logo.svg"),o=this,YUI().use("cookie",function(e){e.Cookie.get("edusharing_hint_hide")?(o.open_repo(),YUI().use("node",function(e){e.one("#edusharing_hint_check").setAttribute("checked","checked")})):YUI().use("node",function(e){e.one("#edusharing_hint_check").removeAttribute("checked")})})),s.show(),this.markUpdated()},_getFormContent:function(e){var t=h.Handlebars.compile(n),i=h.Node.create(t({component:d,clickedicon:e}));return this._form=i,this._form.one("#edusharing_submit").on("click",this._doInsert,this),this._form.one("#edusharing_hint_check").setAttribute("checked","checked"),this._form.one("#edusharing_hint_check").on("change",this.edusharing_hint_check_change,this),this._form.one("#edusharing_open_repo").on("click",this.open_repo,this),this._form.one("#edusharing_hint_close").on("click",this.closeDialog,this),this._form.one("#edusharing_dialog_cancel").on("click",this.closeDialog,this),this._form.one("#edusharing_width").on("change",this.recalculateDimensions,this),this._form.one("#edusharing_width").on("keyup",this.recalculateDimensions,this),this._form.one("#edusharing_height").on("change",this.recalculateDimensions,this),this._form.one("#edusharing_height").on("keyup",this.recalculateDimensions,this),this._form.one("#edusharing_title").on("keyup",this.recalculateTitleWidth,this),i},recalculateTitleWidth:function(){h.one("#edusharing_title_helper").setContent(h.one("#edusharing_title").get("value")),h.one("#edusharing_title").setStyle("width",h.one("#edusharing_title_helper").get("offsetWidth")+10+"px")},
+closeDialog:function(e){e.preventDefault(),this.getDialogue({focusAfterHide:null}).hide()},open_repo:function(){var e,t,i;window.win=window.open(),window.win.document.write("Loading edu-sharing ticket..."),e=M.cfg.wwwroot+"/lib/editor/atto/plugins/edusharing/fetch.php",t=this.get("repourl"),i=this.get("courseid"),fetch(e,{method:"post",mode:"cors",headers:{"Content-Type":"application/json",Accept:"application/json"},body:JSON.stringify({useCase:"getTicket",courseid:i})}).then(function(e){if(200<=e.status&&e.status<300)return e.text();throw new Error(e.statusText)}).then(function(e){t+="/components/search?reurl=WINDOW&applyDirectories=true&ticket="+e,window.win.location.href=t})},recalculateDimensions:function(e){"edusharing_height"==e._currentTarget.id?h.one("#edusharing_width").set("value",Math.round(h.one("#edusharing_height").get("value")*h.one("#edusharing_ratio").get("value"))):h.one("#edusharing_height").set("value",Math.round(h.one("#edusharing_width").get("value")/h.one("#edusharing_ratio").get("value")))},edusharing_hint_check_change:function(t){YUI().use("cookie",function(e){t.target._stateProxy.checked?e.Cookie.set("edusharing_hint_hide",!0,{expires:new Date("January 12, 2025")}):e.Cookie.remove("edusharing_hint_hide")})},_doInsert:function(e){var t,i,n,s,r,a;e.preventDefault(),this.getDialogue({focusAfterHide:null}).hide(),this.editor.focus(),(t=this.getNode()).resid?((i=this.getSelectedElement()).setAttribute("title",t.title),n="","none"!=t.alignment&&(n="float:"+t.alignment),"folder"==t.mediatype&&(n="display:block;"),i.setAttribute("style",n),"ref"==this.getType(t.mediatype)?(s=new URL(i.attributes.href.value),i.innerHTML=t.title,s.searchParams.set("title",t.title),s.searchParams.set("caption",t.caption),i.setAttribute("href",s.toString())):((s=new URL(i.attributes.src.value)).searchParams.set("title",t.title),s.searchParams.set("caption",t.caption),s.searchParams.set("width",t.width),s.searchParams.set("height",t.height),i.setAttribute("alt",t.title),i.setAttribute("width",t.width),i.setAttribute("height",t.height),i.setAttribute("src",s.toString()))):(n="","none"!=t.alignment&&(n="float:"+t.alignment+";"),"folder"==t.mediatype&&(n="display:block;"),r="0",0==t.showlatest&&"undefined"!=t.version&&(r=t.version),a='class="edusharing_atto" style="'+n+'" title="'+t.title+'" contenteditable="false" ',s=t.previewurl+"&caption="+t.caption+"&object_url="+t.objecturl+"&mediatype="+t.mediatype+"&mimetype="+t.mimetype+"&window_version="+r+"&title="+t.title,(s=new URL(t.previewurl)).searchParams.set("caption",t.caption),s.searchParams.set("object_url",t.objecturl),s.searchParams.set("mediatype",t.mediatype),s.searchParams.set("mimetype",t.mimetype),s.searchParams.set("window_version",r),s.searchParams.set("title",t.title),"ref"==t.type?a="&nbsp;<a "+a+' href="'+s.toString()+'">'+t.title+"</a>&nbsp;":(a+='src="'+s.toString()+"&width="+t.width+"&height="+t.height+'"',a='<img alt="'+t.title+'" width="'+t.width+'" height="'+t.height+'" '+a+" />",a+="<p>"+t.caption+"</p>"),this.get("host").insertContentAtFocusPoint(a)),this.markUpdated()},getType:function(e){var t="ref";switch(!0){case-1<e.indexOf("image"):case-1<e.indexOf("video"):case-1<e.indexOf("h5p"):case-1<e.indexOf("learningapps"):case-1<e.indexOf("youtube"):case-1<e.indexOf("vimeo"):case-1<e.indexOf("folder"):t="content"}return t},getNode:function(){var e={};return e.resid=h.one("#edusharing_resid").get("value"),e.title=h.one("#edusharing_title").get("value"),e.caption=h.one("#edusharing_caption").get("value"),e.width=h.one("#edusharing_width").get("value"),e.height=h.one("#edusharing_height").get("value"),e.previewurl=h.one("#edusharing_preview_url").get("value"),e.objecturl=h.one("#edusharing_object_url").get("value"),e.mimetype=h.one("#edusharing_mimetype").get("value"),e.mediatype=h.one("#edusharing_mediatype").get("value"),e.showlatest=h.one("#edusharing_version_latest").get("checked"),e.version=h.one("#edusharing_version").get("value"),"undefined"==e.version&&(e.version="0"),e.alignment=h.one("input[name=edusharing_alignment]:checked").get("value"),e.type=this.getType(e.mediatype),"folder"==e.mediatype&&(e.showlatest=!0,e.width=500),e}},{ATTRS:{disabled:{value:!1},repourl:{value:""},courseid:{value:""},ticket:{value:""},existingObjects:{value:[]}}}),l.prototype.importNode=function(e){var t,i,n,s=e.get("title");return!!s&&(this.name=s,!!(t=e.get("object_url"))&&(this.object_url=t,(i=e.get("resourceId"))&&(this.id=i),(n=e.get("window_version"))&&(this.object_version=n),!0))},l.prototype.link=function(e){var t=M.cfg.wwwroot+"/lib/editor/atto/plugins/edusharing/insert.php?sesskey="+M.cfg.sesskey+"&courseid="+this.course,r=this,a=YUI().use("io","json"),i={method:"POST",sync:!0,data:a.JSON.stringify(r),arguments:{},on:{success:function(e,t,i){try{var n=a.JSON.parse(t.responseText)}catch(s){return alert("invalid data"),!1}return n.id?(r.id=n.id,!0):(alert("no resource id"),!1)},failure:function(e,t,i){return alert("error setting usage"),!1}}};return a.io(t,i)},l.prototype.unlink=function(e){var t=M.cfg.wwwroot+"/lib/editor/atto/plugins/edusharing/delete.php?sesskey="+M.cfg.sesskey+"&courseid="+this.course,n=this,i=YUI().use("io","json","json-stringify"),s={method:"POST",sync:!0,headers:{"Content-Type":"application/json"},data:i.JSON.stringify(n),arguments:{object:n,node:e},on:{success:function(e,t,i){return!0},failure:function(e,t,i){return alert("error deleting object "+n.id+"."),!1}}};return i.io(t,s)}},"@VERSION@",{requires:["moodle-editor_atto-plugin"]});
\ No newline at end of file
diff --git a/yui/build/moodle-atto_edusharing-button/moodle-atto_edusharing-button.js b/yui/build/moodle-atto_edusharing-button/moodle-atto_edusharing-button.js
index fe201fe..e1efa75 100644
--- a/yui/build/moodle-atto_edusharing-button/moodle-atto_edusharing-button.js
+++ b/yui/build/moodle-atto_edusharing-button/moodle-atto_edusharing-button.js
@@ -122,8 +122,9 @@ Y.namespace('M.atto_edusharing').Button = Y.Base.create('button', Y.M.editor_att
         }
         this.addButton({
             icon: 'icon',
-            iconComponent: 'atto_edusharing',
+            iconComponent: 'edusharing',
             buttonName: 'icon',
+            title: this.get('buttonTitle'),
             callback: this._displayDialogue,
             callbackArgs: 'icon',
             tags: '.edusharing_atto',
diff --git a/yui/src/button/js/button.js b/yui/src/button/js/button.js
index d76d7c1..6fbbc1c 100644
--- a/yui/src/button/js/button.js
+++ b/yui/src/button/js/button.js
@@ -120,8 +120,9 @@ Y.namespace('M.atto_edusharing').Button = Y.Base.create('button', Y.M.editor_att
         }
         this.addButton({
             icon: 'icon',
-            iconComponent: 'atto_edusharing',
+            iconComponent: 'edusharing',
             buttonName: 'icon',
+            title: this.get('buttonTitle'),
             callback: this._displayDialogue,
             callbackArgs: 'icon',
             tags: '.edusharing_atto',