diff -u8pdNr ExportCalendarselection/0.1.2/_locales/de/messages.json ExportCalendarSelection/0.5/_locales/de/messages.json
--- ExportCalendarselection/0.1.2/_locales/de/messages.json	1970-01-01 01:00:00.000000000 +0100
+++ ExportCalendarSelection/0.5/_locales/de/messages.json	2019-07-28 17:16:07.243968400 +0200
@@ -0,0 +1,9 @@
+{
+  "extensionName": {
+    "message": "Export Calendar Selection"
+  },
+
+  "extensionDescription": {
+    "message": "Nur ausgewählte Termine oder Aufgaben anstelle ganzer Kalender exportieren. Dem Menü \"Extras\" fügt die Erweiterung einen entsprechenden Eintrag hinzu."
+  }
+}
\ No newline at end of file
diff -u8pdNr ExportCalendarselection/0.1.2/_locales/en/messages.json ExportCalendarSelection/0.5/_locales/en/messages.json
--- ExportCalendarselection/0.1.2/_locales/en/messages.json	1970-01-01 01:00:00.000000000 +0100
+++ ExportCalendarSelection/0.5/_locales/en/messages.json	2019-07-28 17:16:25.552348700 +0200
@@ -0,0 +1,9 @@
+{
+  "extensionName": {
+    "message": "Export Calendar Selection"
+  },
+
+  "extensionDescription": {
+    "message": "Export selected events or tasks only instead of whole calendars. The extension adds an appropriate entry to the menu \"Tools\"."
+  }
+}
\ No newline at end of file
diff -u8pdNr ExportCalendarselection/0.1.2/chrome/content/excasel-overlay.xul ExportCalendarSelection/0.5/chrome/content/excasel-overlay.xul
--- ExportCalendarselection/0.1.2/chrome/content/excasel-overlay.xul	2015-07-12 00:12:22.078060200 +0200
+++ ExportCalendarSelection/0.5/chrome/content/excasel-overlay.xul	2019-08-09 20:54:01.530287200 +0200
@@ -1,31 +1,33 @@
 <?xml version="1.0"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://excasel/skin/excasel.css" type="text/css"?>
 <!DOCTYPE overlay SYSTEM "chrome://excasel/locale/excasel.dtd">
 
 <overlay id="excasel-overlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <script type="application/javascript"
           src="chrome://excasel/content/excasel.js"/>
 
-    <menupopup id="menu_Event_Task_Popup">
+    <menupopup id="taskPopup">
+        <menuseparator id="excasel_separator" />
         <menu id="excasel_menu"
               label="&excaselMenu.label;"
               accesskey="&excaselMenu.accesskey;"
-              insertafter="calendar-export-menu">
+              class="menu-iconic excasel-icon  menuitem-iconic">
             <menupopup id="excasel_menu_Popup">
                 <menuitem id="excaselExportSelectedEvents"
                           label="&excaselExportSelectedEvents.label;"
                           accesskey="&excaselExportSelectedEvents.accesskey;"
-                          oncommand="excasel_exportEventSelection()"/>
+                          oncommand="excasel_exportEventSelection();"/>
                 <menuitem id="excaselExportSelectedTasks"
                           label="&excaselExportSelectedTasks.label;"
                           accesskey="&excaselExportSelectedTasks.accesskey;"
-                          oncommand="excasel_exportTaskSelection()"/>
+                          oncommand="excasel_exportTaskSelection();"/>
             </menupopup>
         </menu>
     </menupopup>
 
 </overlay>
diff -u8pdNr ExportCalendarselection/0.1.2/chrome/content/excasel-prefs.js ExportCalendarSelection/0.5/chrome/content/excasel-prefs.js
--- ExportCalendarselection/0.1.2/chrome/content/excasel-prefs.js	2015-07-11 18:04:11.576295200 +0200
+++ ExportCalendarSelection/0.5/chrome/content/excasel-prefs.js	1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
diff -u8pdNr ExportCalendarselection/0.1.2/chrome/content/excasel-prefs.xul ExportCalendarSelection/0.5/chrome/content/excasel-prefs.xul
--- ExportCalendarselection/0.1.2/chrome/content/excasel-prefs.xul	2015-07-11 18:05:11.377801900 +0200
+++ ExportCalendarSelection/0.5/chrome/content/excasel-prefs.xul	1970-01-01 01:00:00.000000000 +0100
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<!DOCTYPE dialog SYSTEM "chrome://exporttools/locale/exporttools.dtd">
- 
-<prefwindow id="exporttools-prefs"
-     title="..."
-     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
- 
-
-</prefwindow>
diff -u8pdNr ExportCalendarselection/0.1.2/chrome/content/excasel.js ExportCalendarSelection/0.5/chrome/content/excasel.js
--- ExportCalendarselection/0.1.2/chrome/content/excasel.js	2015-07-12 00:30:06.089582500 +0200
+++ ExportCalendarSelection/0.5/chrome/content/excasel.js	2019-08-09 20:53:27.122462300 +0200
@@ -12,9 +12,8 @@ function excasel_exportEventSelection(){
 
 function excasel_exportTaskSelection(){
     try {
         var excaselTasks = getSelectedTasks();
         saveEventsToFile(excaselTasks);
     }
     catch (e) {}
 }
-
diff -u8pdNr ExportCalendarselection/0.1.2/chrome/locale/de/excasel.dtd ExportCalendarSelection/0.5/chrome/locale/de/excasel.dtd
--- ExportCalendarselection/0.1.2/chrome/locale/de/excasel.dtd	2015-07-12 00:04:00.070627700 +0200
+++ ExportCalendarSelection/0.5/chrome/locale/de/excasel.dtd	2019-07-23 15:18:25.181226600 +0200
@@ -1,10 +1,13 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<!ENTITY excaselMenu.label                        "Auswahl exportieren">
+<!ENTITY excasel.window.title                     "Export Calendar Selection">
+<!ENTITY excasel.export.button.label              "Exportieren">
+<!ENTITY excasel.export.button.accesskey          "">
+<!ENTITY excaselMenu.label                        "Auswahl exportieren…">
 <!ENTITY excaselMenu.accesskey                    "">
 <!ENTITY excaselExportSelectedEvents.label        "Ausgewählte Termine exportieren">
 <!ENTITY excaselExportSelectedEvents.accesskey    "">
 <!ENTITY excaselExportSelectedTasks.label         "Ausgewählte Aufgaben exportieren">
 <!ENTITY excaselExportSelectedTasks.accesskey     "">
diff -u8pdNr ExportCalendarselection/0.1.2/chrome/locale/de/excasel.properties ExportCalendarSelection/0.5/chrome/locale/de/excasel.properties
--- ExportCalendarselection/0.1.2/chrome/locale/de/excasel.properties	2015-07-11 19:28:43.700367800 +0200
+++ ExportCalendarSelection/0.5/chrome/locale/de/excasel.properties	1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-extensions.exporttools@nadelundhirn.de.description=Export Tools
diff -u8pdNr ExportCalendarselection/0.1.2/chrome/locale/en-US/excasel.dtd ExportCalendarSelection/0.5/chrome/locale/en-US/excasel.dtd
--- ExportCalendarselection/0.1.2/chrome/locale/en-US/excasel.dtd	2015-07-12 00:04:30.174986600 +0200
+++ ExportCalendarSelection/0.5/chrome/locale/en-US/excasel.dtd	2019-07-23 15:18:54.484152600 +0200
@@ -1,10 +1,13 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<!ENTITY excaselMenu.label                        "Export selection">
+<!ENTITY excasel.window.title                     "Export Calendar Selection">
+<!ENTITY excasel.export.button.label              "Export">
+<!ENTITY excasel.export.button.accesskey          "">
+<!ENTITY excaselMenu.label                        "Export selection…">
 <!ENTITY excaselMenu.accesskey                    "">
 <!ENTITY excaselExportSelectedEvents.label        "Export selected events">
 <!ENTITY excaselExportSelectedEvents.accesskey    "">
 <!ENTITY excaselExportSelectedTasks.label         "Export selected tasks">
 <!ENTITY excaselExportSelectedTasks.accesskey     "">
diff -u8pdNr ExportCalendarselection/0.1.2/chrome/locale/en-US/excasel.properties ExportCalendarSelection/0.5/chrome/locale/en-US/excasel.properties
--- ExportCalendarselection/0.1.2/chrome/locale/en-US/excasel.properties	2015-07-11 19:28:43.700367800 +0200
+++ ExportCalendarSelection/0.5/chrome/locale/en-US/excasel.properties	1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-extensions.exporttools@nadelundhirn.de.description=Export Tools
diff -u8pdNr ExportCalendarselection/0.1.2/chrome/skin/excasel.css ExportCalendarSelection/0.5/chrome/skin/excasel.css
--- ExportCalendarselection/0.1.2/chrome/skin/excasel.css	1970-01-01 01:00:00.000000000 +0100
+++ ExportCalendarSelection/0.5/chrome/skin/excasel.css	2019-07-29 00:02:37.838954300 +0200
@@ -0,0 +1,3 @@
+.excasel-icon {
+  list-style-image: url("chrome://excasel/skin/excasel16.png");
+}
\ No newline at end of file
Files ExportCalendarselection/0.1.2/chrome/skin/excasel16.png and ExportCalendarSelection/0.5/chrome/skin/excasel16.png differ
Files ExportCalendarselection/0.1.2/chrome/skin/excasel32.png and ExportCalendarSelection/0.5/chrome/skin/excasel32.png differ
Files ExportCalendarselection/0.1.2/chrome/skin/excasel48.png and ExportCalendarSelection/0.5/chrome/skin/excasel48.png differ
diff -u8pdNr ExportCalendarselection/0.1.2/chrome.manifest ExportCalendarSelection/0.5/chrome.manifest
--- ExportCalendarselection/0.1.2/chrome.manifest	2015-07-12 00:14:02.870900600 +0200
+++ ExportCalendarSelection/0.5/chrome.manifest	2019-07-28 23:38:08.420131900 +0200
@@ -1,5 +1,8 @@
+overlay chrome://messenger/content/messenger.xul chrome://excasel/content/excasel-overlay.xul
+
 content excasel chrome/content/
+
+skin    excasel classic/1.0 chrome/skin/
+
 locale excasel en-US chrome/locale/en-US/
 locale excasel de chrome/locale/de/
-overlay chrome://calendar/content/calendar.xul chrome://excasel/content/excasel-overlay.xul
-overlay chrome://lightning/content/messenger-overlay-sidebar.xul chrome://excasel/content/excasel-overlay.xul
diff -u8pdNr ExportCalendarselection/0.1.2/install.rdf ExportCalendarSelection/0.5/install.rdf
--- ExportCalendarselection/0.1.2/install.rdf	2019-07-20 23:27:22.611866400 +0200
+++ ExportCalendarSelection/0.5/install.rdf	1970-01-01 01:00:00.000000000 +0100
@@ -1,59 +0,0 @@
-<?xml version="1.0"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-     xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
-  <Description about="urn:mozilla:install-manifest">
-    <em:name>Export Calendar Selection</em:name>
-    <em:id>excasel@nadelundhirn.de</em:id>
-    <em:version>0.1.2</em:version>
-
-    <em:localized>
-      <Description>
-        <em:locale>de-DE</em:locale>
-        <em:name>Export Calendar Selection</em:name>
-        <em:creator>Robert Brand</em:creator>
-        <em:description>Nur ausgewählte Termine oder Aufgaben anstelle ganzer Kalender exportieren. Dem Menü "Termine und Aufgaben" fügt die Erweiterung einen entsprechenden Eintrag hinzu.</em:description>
-        <em:homepageURL>https://www.nadelundhirn.de/wp/tag/export-calendar-selection/</em:homepageURL>
-      </Description>
-    </em:localized>
-    <em:description>Export selected events or tasks only instead of whole calendars. The extension adds an appropriate entry to the menu "Events and tasks".</em:description>
-    <em:creator>Robert Brand</em:creator>
-    <em:homepageURL>https://www.nadelundhirn.de/wp/tag/export-calendar-selection/</em:homepageURL>
-    <em:updateURL>https://www.nadelundhirn.de/krams/exten/exportcalendarselection/updates.json</em:updateURL>
-
-    <em:updateKey>MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC9ai8NkE9XnAfbpjeuGLXwidUFh2cng/g8upwFhxgnGkr0+RyE2moB/NrfjHMRoHx06XHVDSLLoNCGGXAoPICzmcoBBdpiesHRjbT2No2zTp4SGNnBgqsGP3Tfmzt1FiLGJrShevYUIujH6YmBsNmKPezL6G0DtZ1Y6FNdkZr5cwIDAQAB</em:updateKey>
-
-    <!-- Thunderbird -->
-    <em:targetApplication>
-      <Description>
-        <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
-        <em:minVersion>38.0a1</em:minVersion>
-        <em:maxVersion>60.*</em:maxVersion>
-      </Description>
-    </em:targetApplication>
-    
-    <!-- SeaMonkey -->
-    <em:targetApplication>
-      <Description>
-        <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
-        <em:minVersion>2.35</em:minVersion>
-        <em:maxVersion>2.35.*</em:maxVersion>
-      </Description>
-    </em:targetApplication>
-
-    <em:requires>
-      <Description>
-        <!-- Lightning (also Sunbird via extension stub) -->
-        <em:id>{e2fda1a4-762b-4020-b5ad-a41df1933103}</em:id>
-        <em:minVersion>4.0</em:minVersion>
-        <em:maxVersion>6.*</em:maxVersion>
-      </Description>
-    </em:requires>
-
-  </Description>
-
-</RDF>
diff -u8pdNr ExportCalendarselection/0.1.2/manifest.json ExportCalendarSelection/0.5/manifest.json
--- ExportCalendarselection/0.1.2/manifest.json	1970-01-01 01:00:00.000000000 +0100
+++ ExportCalendarSelection/0.5/manifest.json	2019-08-09 20:52:02.949799300 +0200
@@ -0,0 +1,21 @@
+{
+  "manifest_version": 2,
+  "applications": {
+    "gecko": {
+      "id": "excasel@nadelundhirn.de",
+      "strict_min_version": "68.0",
+      "update_url": "https://www.nadelundhirn.de/krams/exten/exportcalendarselection/updates.json"
+    }
+  },
+  "name": "__MSG_extensionName__",
+  "description": "__MSG_extensionDescription__",
+  "version": "0.5",
+  "homepage_url": "https://www.nadelundhirn.de/wp/tag/export-calendar-selection/",
+  "default_locale": "de",
+  "icons": {
+    "32": "chrome/skin/excasel32.png"
+   },
+  "legacy": {
+    "type": "xul"
+  }
+}
\ No newline at end of file