diff -u8pdNr 1.4/chrome/content/ccd-prefs.js 1.5/chrome/content/ccd-prefs.js
--- 1.4/chrome/content/ccd-prefs.js	2014-07-28 16:14:49 +0000
+++ 1.5/chrome/content/ccd-prefs.js	2015-04-30 20:36:44 +0000
@@ -2,133 +2,35 @@
  * 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/. */
 
 let gPrefBranch = Components.classes["@mozilla.org/preferences-service;1"]
                             .getService(Components.interfaces.nsIPrefBranch);
 
 var bundle = srGetStrBundle("chrome://customcalendardefaults/locale/ccd-prefs.properties");
 
-function toggleEventUI() {
-  var ccdCheckEventPrivacy = document.getElementById("ccdCheckEventPrivacy");
-  var ccdSetEventPrivacy = document.getElementById("ccdSetEventPrivacy");
-  var hideableItems = new Array();
-  hideableItems = ccdSetEventPrivacy.getElementsByAttribute("hideable", true);
-  if (ccdCheckEventPrivacy.hasAttribute("checked", true)) {
-    for (var i = 0; i < hideableItems.length; ++i) {
-      var item = hideableItems[i];
-	  if (item.hasAttribute("disabled", true)) {
-  	    item.removeAttribute("disabled");
-	  }
-    }
-  }
-  else {
-    for (var i = 0; i < hideableItems.length; ++i) {
-      var item = hideableItems[i];
-	  if (!item.hasAttribute("disabled", true)) {
-  	    item.setAttribute("disabled", true);
-	  }
-    }
-  }
-  var ccdCheckEventShowTimeAs = document.getElementById("ccdCheckEventShowTimeAs");
-  var ccdSetEventShowTimeAs = document.getElementById("ccdSetEventShowTimeAs");
-  var hideableItems = new Array();
-  hideableItems = ccdSetEventShowTimeAs.getElementsByAttribute("hideable", true);
-  if (ccdCheckEventShowTimeAs.hasAttribute("checked", true)) {
-    for (var i = 0; i < hideableItems.length; ++i) {
-      var item = hideableItems[i];
-	  if (item.hasAttribute("disabled", true)) {
-  	    item.removeAttribute("disabled");
-	  }
-    }
-  }
-  else {
-    for (var i = 0; i < hideableItems.length; ++i) {
-      var item = hideableItems[i];
-	  if (!item.hasAttribute("disabled", true)) {
-  	    item.setAttribute("disabled", true);
-	  }
-    }
-  }
-}
-
-function toggleTaskUI() {
-  var ccdCheckTaskPrivacy = document.getElementById("ccdCheckTaskPrivacy");
-  var ccdSetTaskPrivacy = document.getElementById("ccdSetTaskPrivacy");
-  var hideableItems = new Array();
-  hideableItems = ccdSetTaskPrivacy.getElementsByAttribute("hideable", true);
-  if (ccdCheckTaskPrivacy.hasAttribute("checked", true)) {
-    for (var i = 0; i < hideableItems.length; ++i) {
-      var item = hideableItems[i];
-	  if (item.hasAttribute("disabled", true)) {
-  	    item.removeAttribute("disabled");
-	  }
-    }
-  }
-  else {
-    for (var i = 0; i < hideableItems.length; ++i) {
-      var item = hideableItems[i];
-	  if (!item.hasAttribute("disabled", true)) {
-  	    item.setAttribute("disabled", true);
-	  }
-    }
-  }
-  var ccdCheckTaskShowTimeAs = document.getElementById("ccdCheckTaskShowTimeAs");
-  var ccdSetTaskShowTimeAs = document.getElementById("ccdSetTaskShowTimeAs");
-  var hideableItems = new Array();
-  hideableItems = ccdSetTaskShowTimeAs.getElementsByAttribute("hideable", true);
-  if (ccdCheckTaskShowTimeAs.hasAttribute("checked", true)) {
-    for (var i = 0; i < hideableItems.length; ++i) {
-      var item = hideableItems[i];
-	  if (item.hasAttribute("disabled", true)) {
-  	    item.removeAttribute("disabled");
-	  }
-    }
-  }
-  else {
-    for (var i = 0; i < hideableItems.length; ++i) {
-      var item = hideableItems[i];
-	  if (!item.hasAttribute("disabled", true)) {
-  	    item.setAttribute("disabled", true);
-	  }
-    }
-  }
-}
-
-function resetCalendarDefaults() {
+function ccdResetCalendarDefaults() {
   if (gPrefBranch.prefHasUserValue("extensions.customcalendardefaults.event.status")) {
     void gPrefBranch.clearUserPref("extensions.customcalendardefaults.event.status");
   }
-  if (gPrefBranch.prefHasUserValue("extensions.customcalendardefaults.event.privacy")) {
-    void gPrefBranch.clearUserPref("extensions.customcalendardefaults.event.privacy");
-  }
-  if (gPrefBranch.prefHasUserValue("extensions.customcalendardefaults.event.privacy.state")) {
-    void gPrefBranch.clearUserPref("extensions.customcalendardefaults.event.privacy.state");
-  }
   if (gPrefBranch.prefHasUserValue("extensions.customcalendardefaults.event.priority")) {
     void gPrefBranch.clearUserPref("extensions.customcalendardefaults.event.priority");
   }
   if (gPrefBranch.prefHasUserValue("extensions.customcalendardefaults.event.showTimeAs")) {
     void gPrefBranch.clearUserPref("extensions.customcalendardefaults.event.showTimeAs");
   }
   if (gPrefBranch.prefHasUserValue("calendar.events.defaultTransparency.standard.transparent")) {
     void gPrefBranch.clearUserPref("calendar.events.defaultTransparency.standard.transparent");
   }
   if (gPrefBranch.prefHasUserValue("calendar.events.defaultTransparency.allday.transparent")) {
     void gPrefBranch.clearUserPref("calendar.events.defaultTransparency.allday.transparent");
   }
   if (gPrefBranch.prefHasUserValue("extensions.customcalendardefaults.task.status")) {
     void gPrefBranch.clearUserPref("extensions.customcalendardefaults.task.status");
   }
-  if (gPrefBranch.prefHasUserValue("extensions.customcalendardefaults.task.privacy")) {
-    void gPrefBranch.clearUserPref("extensions.customcalendardefaults.task.privacy");
-  }
-  if (gPrefBranch.prefHasUserValue("extensions.customcalendardefaults.task.privacy.state")) {
-    void gPrefBranch.clearUserPref("extensions.customcalendardefaults.task.privacy.state");
-  }
   if (gPrefBranch.prefHasUserValue("extensions.customcalendardefaults.task.priority")) {
     void gPrefBranch.clearUserPref("extensions.customcalendardefaults.task.priority");
   }
   if (gPrefBranch.prefHasUserValue("extensions.customcalendardefaults.task.showTimeAs")) {
     void gPrefBranch.clearUserPref("extensions.customcalendardefaults.task.showTimeAs");
   }
   if (gPrefBranch.prefHasUserValue("extensions.customcalendardefaults.task.showTimeAs.state")) {
     void gPrefBranch.clearUserPref("extensions.customcalendardefaults.task.showTimeAs.state");
@@ -164,57 +66,16 @@ function onLoadCcdPrefsPane() {
   } else if (defaultEventStatus == "TENTATIVE") {
     ccdEventStatus.setAttribute("label", eventStatusTentative);
   } else if (defaultEventStatus == "CONFIRMED") {
     ccdEventStatus.setAttribute("label", eventStatusConfirmed);
   } else if (defaultEventStatus == "CANCELLED") {
     ccdEventStatus.setAttribute("label", eventStatusCancelled);
   }
   
-  var ccdEventPrivacyPref = gPrefBranch.getBoolPref("extensions.customcalendardefaults.event.privacy");
-  var ccdSetEventPrivacy = document.getElementById("ccdSetEventPrivacy");
-  if (ccdEventPrivacyPref == false) {
-    var hideableItems = new Array();
-    hideableItems = ccdSetEventPrivacy.getElementsByAttribute("hideable", true);
-    for (var i = 0; i < hideableItems.length; ++i) {
-      var item = hideableItems[i];
-	  if (!item.hasAttribute("disabled", true)) {
-  	    item.setAttribute("disabled", true);
-	  }
-    }
-  }
-  
-  var ccdEventPrivacy = document.getElementById("ccdEventPrivacy");
-  var defaultEventPrivacy = gPrefBranch.getCharPref("extensions.customcalendardefaults.event.privacy.state");
-  var eventPrivacyPrivate = bundle.GetStringFromName( "eventPrivacyPrivate.label" );
-  var eventPrivacyConfidential = bundle.GetStringFromName( "eventPrivacyConfidential.label" );
-  var eventPrivacyPublic = bundle.GetStringFromName( "eventPrivacyPublic.label" );
-  if (defaultEventPrivacy == "PRIVATE") {
-    ccdEventPrivacy.setAttribute("label", eventPrivacyPrivate);
-  } else if (defaultEventPrivacy == "CONFIDENTIAL") {
-    ccdEventPrivacy.setAttribute("label", eventPrivacyConfidential);
-  } else if (defaultEventPrivacy == "PUBLIC") {
-    ccdEventPrivacy.setAttribute("label", eventPrivacyPublic);
-  } else {
-    ccdEventPrivacy.setAttribute("label", "");
-  }
-  
-  var ccdEventShowTimeAsPref = gPrefBranch.getBoolPref("extensions.customcalendardefaults.event.showTimeAs");
-  var ccdSetEventShowTimeAs = document.getElementById("ccdSetEventShowTimeAs");
-  if (ccdEventShowTimeAsPref == false) {
-    var hideableItems = new Array();
-    hideableItems = ccdSetEventShowTimeAs.getElementsByAttribute("hideable", true);
-    for (var i = 0; i < hideableItems.length; ++i) {
-      var item = hideableItems[i];
-	  if (!item.hasAttribute("disabled", true)) {
-  	    item.setAttribute("disabled", true);
-	  }
-    }
-  }
-  
   var ccdTaskPriority = document.getElementById("ccdTaskPriority");
   var defaultTaskPriority = gPrefBranch.getCharPref("extensions.customcalendardefaults.task.priority");
   var taskPriorityNone = bundle.GetStringFromName( "taskPriorityNone.label" );
   var taskPriorityLow = bundle.GetStringFromName( "taskPriorityLow.label" );
   var taskPriorityHigh = bundle.GetStringFromName( "taskPriorityHigh.label" );
   var taskPriorityNormal = bundle.GetStringFromName( "taskPriorityNormal.label" );
   if (defaultTaskPriority == "0") {
     ccdTaskPriority.setAttribute("label", taskPriorityNone);
@@ -239,62 +100,9 @@ function onLoadCcdPrefsPane() {
     ccdTaskStatus.setAttribute("label", taskStatusAction);
   } else if (defaultTaskStatus == "IN-PROCESS") {
     ccdTaskStatus.setAttribute("label", taskStatusProcess);
   } else if (defaultTaskStatus == "COMPLETED") {
     ccdTaskStatus.setAttribute("label", taskStatusCompleted);
   } else if (defaultTaskStatus == "CANCELLED") {
     ccdTaskStatus.setAttribute("label", taskStatusCancelled);
   }
-  
-  var ccdTaskPrivacy = document.getElementById("ccdTaskPrivacy");
-  var defaultTaskPrivacy = gPrefBranch.getCharPref("extensions.customcalendardefaults.task.privacy.state");
-  var taskPrivacyPrivate = bundle.GetStringFromName( "taskPrivacyPrivate.label" );
-  var taskPrivacyConfidential = bundle.GetStringFromName( "taskPrivacyConfidential.label" );
-  var taskPrivacyPublic = bundle.GetStringFromName( "taskPrivacyPublic.label" );
-  if (defaultTaskPrivacy == "PRIVATE") {
-    ccdTaskPrivacy.setAttribute("label", taskPrivacyPrivate);
-  } else if (defaultTaskPrivacy == "CONFIDENTIAL") {
-    ccdTaskPrivacy.setAttribute("label", taskPrivacyConfidential);
-  } else if (defaultTaskPrivacy == "PUBLIC") {
-    ccdTaskPrivacy.setAttribute("label", taskPrivacyPublic);
-  } else {
-    ccdTaskPrivacy.setAttribute("label", "");
-  }
-  
-  var ccdTaskPrivacyPref = gPrefBranch.getBoolPref("extensions.customcalendardefaults.task.privacy");
-  var ccdSetTaskPrivacy = document.getElementById("ccdSetTaskPrivacy");
-  if (ccdTaskPrivacyPref == false) {
-    var hideableItems = new Array();
-    hideableItems = ccdSetTaskPrivacy.getElementsByAttribute("hideable", true);
-    for (var i = 0; i < hideableItems.length; ++i) {
-      var item = hideableItems[i];
-	  if (!item.hasAttribute("disabled", true)) {
-  	    item.setAttribute("disabled", true);
-	  }
-    }
-  }
-  
-  var ccdTaskShowTimeAsPref = gPrefBranch.getBoolPref("extensions.customcalendardefaults.task.showTimeAs");
-  var ccdSetTaskShowTimeAs = document.getElementById("ccdSetTaskShowTimeAs");
-  if (ccdTaskShowTimeAsPref == false) {
-    var hideableItems = new Array();
-    hideableItems = ccdSetTaskShowTimeAs.getElementsByAttribute("hideable", true);
-    for (var i = 0; i < hideableItems.length; ++i) {
-      var item = hideableItems[i];
-	  if (!item.hasAttribute("disabled", true)) {
-  	    item.setAttribute("disabled", true);
-	  }
-    }
-  }
-  
-  var ccdTaskShowTimeAs = document.getElementById("ccdTaskShowTimeAs");
-  var defaultTaskShowTimeAs = gPrefBranch.getCharPref("extensions.customcalendardefaults.task.showTimeAs.state");
-  var taskShowTimeAsFree = bundle.GetStringFromName( "taskShowTimeAsFree.label" );
-  var taskShowTimeAsBusy = bundle.GetStringFromName( "taskShowTimeAsBusy.label" );
-  if (defaultTaskShowTimeAs == "TRANSPARENT") {
-    ccdTaskShowTimeAs.setAttribute("label", taskShowTimeAsFree);
-  } else if (defaultTaskShowTimeAs == "OPAQUE") {
-    ccdTaskShowTimeAs.setAttribute("label", taskShowTimeAsBusy);
-  } else {
-    ccdTaskShowTimeAs.setAttribute("label", "");
-  }
 }
diff -u8pdNr 1.4/chrome/content/ccd-prefs.xul 1.5/chrome/content/ccd-prefs.xul
--- 1.4/chrome/content/ccd-prefs.xul	2014-07-28 16:11:42 +0000
+++ 1.5/chrome/content/ccd-prefs.xul	2015-04-30 19:51:24 +0000
@@ -79,45 +79,24 @@
             <menupopup id="ccdEventPriorityPopup">
               <menuitem label="&customcalendardefaults.preferences.ccdEventPriorityNone;" value="0"/>
               <menuitem label="&customcalendardefaults.preferences.ccdEventPriorityLow;" value="9"/>
               <menuitem label="&customcalendardefaults.preferences.ccdEventPriorityNormal;" value="5"/>
               <menuitem label="&customcalendardefaults.preferences.ccdEventPriorityHigh;" value="1"/>
             </menupopup>
           </menulist>
         </row>
-        <row>
-          <checkbox id="ccdCheckEventPrivacy"
-                    label="&customcalendardefaults.preferences.setEventPrivacy.label;"
-                    preference="extensions.customcalendardefaults.event.privacy"
-                    oncommand="toggleEventUI();"/>
-        </row>
-        <row id="ccdSetEventPrivacy">
-          <label control="ccdEventPrivacy"
-                 accesskey="&customcalendardefaults.preferences.ccdEventPrivacy.accesskey;"
-                 value="&customcalendardefaults.preferences.ccdEventPrivacy;"/>
-          <menulist id="ccdEventPrivacy"
-                    preference="extensions.customcalendardefaults.event.privacy.state"
-                    flex="0"
-                    hideable="true">
-            <menupopup id="ccdEventPrivacyPopup" hideable="true">
-              <menuitem label="&customcalendardefaults.preferences.ccdEventPrivacyPublic;" value="PUBLIC"/>
-              <menuitem label="&customcalendardefaults.preferences.ccdEventPrivacyConfidential;" value="CONFIDENTIAL"/>
-              <menuitem label="&customcalendardefaults.preferences.ccdEventPrivacyPrivate;" value="PRIVATE"/>
-            </menupopup>
-          </menulist>
-        </row>
         <row id="ccdSetEventShowTimeAs">
           <label control="ccdEventShowTimeAs"
                  accesskey="&customcalendardefaults.preferences.ccdEventShowTimeAs.accesskey;"
                  value="&customcalendardefaults.preferences.ccdEventShowTimeAs;"/>
           <menulist id="ccdEventShowTimeAs"
                     preference="calendar.events.defaultTransparency.standard.transparent"
                     flex="0">
-            <menupopup id="ccdEventShowTimeAsPopup" hideable="true">
+            <menupopup id="ccdEventShowTimeAsPopup">
               <menuitem label="&customcalendardefaults.preferences.ccdEventShowTimeAsFree;" value="true"/>
               <menuitem label="&customcalendardefaults.preferences.ccdEventShowTimeAsBusy;" value="false"/>
             </menupopup>
           </menulist>
         </row>
         <row id="ccdSetAlldayEventShowTimeAs">
           <label control="ccdAlldayEventShowTimeAs"
                  accesskey=""
@@ -168,62 +147,21 @@
             <menupopup id="ccdTaskPriorityPopup">
               <menuitem label="&customcalendardefaults.preferences.ccdTaskPriorityNone;" value="0"/>
               <menuitem label="&customcalendardefaults.preferences.ccdTaskPriorityLow;" value="9"/>
               <menuitem label="&customcalendardefaults.preferences.ccdTaskPriorityNormal;" value="5"/>
               <menuitem label="&customcalendardefaults.preferences.ccdTaskPriorityHigh;" value="1"/>
             </menupopup>
           </menulist>
         </row>
-        <row>
-          <checkbox id="ccdCheckTaskPrivacy"
-                    label="&customcalendardefaults.preferences.setTaskPrivacy.label;"
-                    preference="extensions.customcalendardefaults.task.privacy"
-                    oncommand="toggleTaskUI();"/>
-        </row>
-        <row id="ccdSetTaskPrivacy">
-          <label control="ccdTaskPrivacy"
-                 accesskey="&customcalendardefaults.preferences.ccdTaskPrivacy.accesskey;"
-                 value="&customcalendardefaults.preferences.ccdTaskPrivacy;"/>
-          <menulist id="ccdTaskPrivacy"
-                    preference="extensions.customcalendardefaults.task.privacy.state"
-                    flex="0"
-                    hideable="true">
-            <menupopup id="ccdTaskPrivacyPopup" hideable="true">
-              <menuitem label="&customcalendardefaults.preferences.ccdTaskPrivacyPublic;" value="PUBLIC"/>
-              <menuitem label="&customcalendardefaults.preferences.ccdTaskPrivacyConfidential;" value="CONFIDENTIAL"/>
-              <menuitem label="&customcalendardefaults.preferences.ccdTaskPrivacyPrivate;" value="PRIVATE"/>
-            </menupopup>
-          </menulist>
-        </row>
-        <row>
-          <checkbox id="ccdCheckTaskShowTimeAs"
-                    label="&customcalendardefaults.preferences.setTaskShowTimeAs.label;"
-                    preference="extensions.customcalendardefaults.task.showTimeAs"
-                    oncommand="toggleTaskUI();"/>
-        </row>
-        <row id="ccdSetTaskShowTimeAs">
-          <label control="ccdTaskShowTimeAs"
-                 accesskey="&customcalendardefaults.preferences.ccdTaskShowTimeAs.accesskey;"
-                 value="&customcalendardefaults.preferences.ccdTaskShowTimeAs;"/>
-          <menulist id="ccdTaskShowTimeAs"
-                    preference="extensions.customcalendardefaults.task.showTimeAs.state"
-                    flex="0"
-                    hideable="true">
-            <menupopup id="ccdTaskShowTimeAsPopup" hideable="true">
-              <menuitem label="&customcalendardefaults.preferences.ccdTaskShowTimeAsFree;" value="TRANSPARENT"/>
-              <menuitem label="&customcalendardefaults.preferences.ccdTaskShowTimeAsBusy;" value="OPAQUE"/>
-            </menupopup>
-          </menulist>
-        </row>
       </rows>
     </grid>
     </groupbox>
 
     <hbox>
-      <button id="ts-resetWatchList-button" label="&customcalendardefaults.preferences.resetButton;"
+      <button id="ccdResetDefaultsButton" label="&customcalendardefaults.preferences.resetButton;"
               accesskey=""
-              oncommand="resetCalendarDefaults();"/>
+              oncommand="ccdResetCalendarDefaults();"/>
     </hbox>
   </vbox>
 </prefpane>
 
 </prefwindow>
diff -u8pdNr 1.4/chrome/content/customcalendardefaults.js 1.5/chrome/content/customcalendardefaults.js
--- 1.4/chrome/content/customcalendardefaults.js	2014-07-28 17:07:41 +0000
+++ 1.5/chrome/content/customcalendardefaults.js	2015-05-02 20:45:47 +0000
@@ -12,85 +12,49 @@ function setCustomCalendarDefaults(aItem
     var prefService = Components.classes["@mozilla.org/preferences-service;1"]
                        .getService(Components.interfaces.nsIPrefService);
     var prefBranch = prefService.getBranch("extensions.customcalendardefaults.");
     let type = cal.isEvent(aItem) ? "event" : "todo";
     if (type == "event") {
         // apply default event status
         let ccdStatus = prefBranch.getCharPref("event.status");
         aItem.setProperty("STATUS", ccdStatus);
-        // apply default event privacy
-        let ccdPrivacy = prefBranch.getBoolPref("event.privacy");
-        if (ccdPrivacy == true) {
-            let ccdPrivacyState = prefBranch.getCharPref("event.privacy.state");
-            aItem.setProperty("CLASS", ccdPrivacyState);
-        }
         // apply default event priority
         let ccdPriority = prefBranch.getCharPref("event.priority");
         aItem.setProperty("PRIORITY", ccdPriority);
     }
     else if (type == "todo") {
         // apply default task status
         let ccdStatus = prefBranch.getCharPref("task.status");
         aItem.setProperty("STATUS", ccdStatus);
-        // apply default task privacy
-        let ccdPrivacy = prefBranch.getBoolPref("task.privacy");
-        if (ccdPrivacy == true) {
-            let ccdPrivacyState = prefBranch.getCharPref("task.privacy.state");
-            aItem.setProperty("CLASS", ccdPrivacyState);
-        }
         // apply default task priority
         let ccdPriority = prefBranch.getCharPref("task.priority");
         aItem.setProperty("PRIORITY", ccdPriority);
-        // apply default task showTimeAs
-        let ccdShowTimeAs = prefBranch.getBoolPref("task.showTimeAs");
-        if (ccdShowTimeAs == true) {
-            let ccdShowTimeAsState = prefBranch.getCharPref("task.showTimeAs.state");
-            aItem.setProperty("TRANSP", ccdShowTimeAsState);
-        }
     }
 }
 
 function setCustomCalendarDefaultsTaskQuickadd(item) {
     var prefService = Components.classes["@mozilla.org/preferences-service;1"]
                        .getService(Components.interfaces.nsIPrefService);
     var prefBranch = prefService.getBranch("extensions.customcalendardefaults.");
     // apply default task status
     let ccdStatus = prefBranch.getCharPref("task.status");
     item.setProperty("STATUS", ccdStatus);
-    // apply default task privacy
-    let ccdPrivacy = prefBranch.getBoolPref("task.privacy");
-    if (ccdPrivacy == true) {
-        let ccdPrivacyState = prefBranch.getCharPref("task.privacy.state");
-        item.setProperty("CLASS", ccdPrivacyState);
-    }
     // apply default task priority
     let ccdPriority = prefBranch.getCharPref("task.priority");
     item.setProperty("PRIORITY", ccdPriority);
-    // apply default task showTimeAs
-    let ccdShowTimeAs = prefBranch.getBoolPref("task.showTimeAs");
-    if (ccdShowTimeAs == true) {
-        let ccdShowTimeAsState = prefBranch.getCharPref("task.showTimeAs.state");
-        item.setProperty("TRANSP", ccdShowTimeAsState);
-    }
 }
 
 function setCustomCalendarDefaultsEventDrag(item) {
     var prefService = Components.classes["@mozilla.org/preferences-service;1"]
                        .getService(Components.interfaces.nsIPrefService);
     var prefBranch = prefService.getBranch("extensions.customcalendardefaults.");
     // apply default event status
     let ccdStatus = prefBranch.getCharPref("event.status");
     item.setProperty("STATUS", ccdStatus);
-    // apply default event privacy
-    let ccdPrivacy = prefBranch.getBoolPref("event.privacy");
-    if (ccdPrivacy == true) {
-        let ccdPrivacyState = prefBranch.getCharPref("event.privacy.state");
-        item.setProperty("CLASS", ccdPrivacyState);
-    }
     // apply default event priority
     let ccdPriority = prefBranch.getCharPref("event.priority");
     item.setProperty("PRIORITY", ccdPriority);
 }
 
 /*******************************
 * Modified Lightning functions *
 *******************************/
@@ -139,17 +103,17 @@ function ccdCreateEventWithDialog(calend
 
         let refDate = currentView().initialized && currentView().selectedDay.clone();
         setDefaultItemValues(event, calendar, startDate, endDate, refDate, aForceAllday);
         if (summary) {
             event.title = summary;
         }
     }
     setCustomCalendarDefaults(event);
-    openEventDialog(event, calendar, "new", onNewEvent, null);
+    openEventDialog(event, event.calendar, "new", onNewEvent, null);
 }
 
 /**
 * calendar-item-editing.js: function createTodoWithDialog
 */
 function ccdCreateTodoWithDialog(calendar, dueDate, summary, todo, initialDate) {
     const kDefaultTimezone = calendarDefaultTimezone();
 
@@ -443,24 +407,20 @@ var ccdCalendarViewController = {
      */
     createNewEvent: function (aCalendar, aStartTime, aEndTime, aForceAllday) {
         aCalendar = aCalendar || getSelectedCalendar();
 
 
         // if we're given both times, skip the dialog
         if (aStartTime && aEndTime && !aStartTime.isDate && !aEndTime.isDate) {
             let item = cal.createEvent();
-            setDefaultItemValues(item);
-            item.startDate = aStartTime;
-            item.endDate = aEndTime;
+            setDefaultItemValues(item, aCalendar, aStartTime, aEndTime);
             item.title = calGetString("calendar", "newEvent");
-            item.calendar = aCalendar;
-            cal.alarms.setDefaultValues(item);
             setCustomCalendarDefaultsEventDrag(item);
-            doTransaction('add', item, aCalendar, null, null);
+            doTransaction('add', item, item.calendar, null, null);
         } else {
             createEventWithDialog(aCalendar, aStartTime, null, null, null, aForceAllday);
         }
     },
 
     pendingJobs: [],
 
     /**
diff -u8pdNr 1.4/chrome/locale/de/ccd-prefs.dtd 1.5/chrome/locale/de/ccd-prefs.dtd
--- 1.4/chrome/locale/de/ccd-prefs.dtd	2014-04-18 11:57:10 +0000
+++ 1.5/chrome/locale/de/ccd-prefs.dtd	2015-04-30 19:54:39 +0000
@@ -1,51 +1,39 @@
 <!-- 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 customcalendardefaults.preferences.title "Custom Calendar Defaults - Einstellungen">
 <!ENTITY customcalendardefaults.preferences.prefspane.label "Custom Calendar Defaults - Einstellungen">
-<!ENTITY customcalendardefaults.preferences.events.title "Standardeinstellungen für Termine">
+<!ENTITY customcalendardefaults.preferences.events.title "Standardeinstellungen für neue Termine">
 <!ENTITY customcalendardefaults.preferences.ccdEventStatus.accesskey "">
 <!ENTITY customcalendardefaults.preferences.ccdEventStatus "Status">
 <!ENTITY customcalendardefaults.preferences.ccdEventStatusNone "Nicht angegeben">
 <!ENTITY customcalendardefaults.preferences.ccdEventStatusTentative "Vorläufig">
 <!ENTITY customcalendardefaults.preferences.ccdEventStatusConfirmed "Bestätigt">
 <!ENTITY customcalendardefaults.preferences.ccdEventStatusCancelled "Abgesagt">
-<!ENTITY customcalendardefaults.preferences.setEventPrivacy.label "Privatsphäre angeben">
-<!ENTITY customcalendardefaults.preferences.ccdEventPrivacy.accesskey "">
-<!ENTITY customcalendardefaults.preferences.ccdEventPrivacy "Privatsphäre">
-<!ENTITY customcalendardefaults.preferences.ccdEventPrivacyPrivate "Privater Termin">
-<!ENTITY customcalendardefaults.preferences.ccdEventPrivacyConfidential "Nur Zeit und Datum anzeigen">
-<!ENTITY customcalendardefaults.preferences.ccdEventPrivacyPublic "Öffentlicher Termin">
 <!ENTITY customcalendardefaults.preferences.ccdEventPriority.accesskey "">
 <!ENTITY customcalendardefaults.preferences.ccdEventPriority "Priorität">
 <!ENTITY customcalendardefaults.preferences.ccdEventPriorityNone "Nicht angegeben">
 <!ENTITY customcalendardefaults.preferences.ccdEventPriorityLow "Niedrig">
 <!ENTITY customcalendardefaults.preferences.ccdEventPriorityNormal "Normal">
 <!ENTITY customcalendardefaults.preferences.ccdEventPriorityHigh "Hoch">
 <!ENTITY customcalendardefaults.preferences.ccdEventShowTimeAs.accesskey "">
 <!ENTITY customcalendardefaults.preferences.setEventShowTimeAs.label "&quot;Zeit anzeigen als&quot; angeben">
 <!ENTITY customcalendardefaults.preferences.ccdEventShowTimeAs "Zeit anzeigen als">
 <!ENTITY customcalendardefaults.preferences.ccdEventShowTimeAsFree "Verfügbar">
 <!ENTITY customcalendardefaults.preferences.ccdEventShowTimeAsBusy "Beschäftigt">
 <!ENTITY customcalendardefaults.preferences.ccdAlldayEventShowTimeAs.label "Ganztägige Termine - Zeit anzeigen als">
 <!ENTITY customcalendardefaults.preferences.ccdAlldayEventShowTimeAs.accesskey "">
 <!ENTITY customcalendardefaults.preferences.ccdAlldayEventShowTimeAsFree "Verfügbar">
 <!ENTITY customcalendardefaults.preferences.ccdAlldayEventShowTimeAsBusy "Beschäftigt">
-<!ENTITY customcalendardefaults.preferences.tasks.title "Standardeinstellungen für Aufgaben">
+<!ENTITY customcalendardefaults.preferences.tasks.title "Standardeinstellungen für neue Aufgaben">
 <!ENTITY customcalendardefaults.preferences.ccdTaskStatus.accesskey "">
 <!ENTITY customcalendardefaults.preferences.ccdTaskStatus "Status">
-<!ENTITY customcalendardefaults.preferences.setTaskPrivacy.label "Privatsphäre angeben">
-<!ENTITY customcalendardefaults.preferences.ccdTaskPrivacy.accesskey "">
-<!ENTITY customcalendardefaults.preferences.ccdTaskPrivacy "Privatsphäre">
-<!ENTITY customcalendardefaults.preferences.ccdTaskPrivacyPrivate "Privater Termin">
-<!ENTITY customcalendardefaults.preferences.ccdTaskPrivacyConfidential "Nur Zeit und Datum anzeigen">
-<!ENTITY customcalendardefaults.preferences.ccdTaskPrivacyPublic "Öffentlicher Termin">
 <!ENTITY customcalendardefaults.preferences.ccdTaskPriority.accesskey "">
 <!ENTITY customcalendardefaults.preferences.ccdTaskPriority "Priorität">
 <!ENTITY customcalendardefaults.preferences.ccdTaskPriorityNone "Nicht angegeben">
 <!ENTITY customcalendardefaults.preferences.ccdTaskPriorityLow "Niedrig">
 <!ENTITY customcalendardefaults.preferences.ccdTaskPriorityNormal "Normal">
 <!ENTITY customcalendardefaults.preferences.ccdTaskPriorityHigh "Hoch">
 <!ENTITY customcalendardefaults.preferences.ccdTaskStatusNone "Nicht angegeben">
 <!ENTITY customcalendardefaults.preferences.ccdTaskStatusAction "Benötigt Eingriff">
diff -u8pdNr 1.4/chrome/locale/de/ccd-prefs.properties 1.5/chrome/locale/de/ccd-prefs.properties
--- 1.4/chrome/locale/de/ccd-prefs.properties	2014-04-18 11:54:39 +0000
+++ 1.5/chrome/locale/de/ccd-prefs.properties	2015-04-30 19:55:00 +0000
@@ -7,29 +7,21 @@ preferencesLabel=Einstellungen…
 eventPriorityNone.label=Nicht angegeben
 eventPriorityLow.label=Niedrig
 eventPriorityHigh.label=Hoch
 eventPriorityNormal.label=Normal
 eventStatusNone.label=Nicht angegeben
 eventStatusTentative.label=Vorläufig
 eventStatusConfirmed.label=Bestätigt
 eventStatusCancelled.label=Abgesagt
-eventPrivacyNone.label=Nicht angegeben
-eventPrivacyPrivate.label=Privater Termin
-eventPrivacyConfidential.label=Nur Zeit und Datum anzeigen
-eventPrivacyPublic.label=Öffentlicher Termin
 eventShowTimeAsFree.label=Verfügbar
 eventShowTimeAsBusy.label=Beschäftigt
 taskPriorityNone.label=Nicht angegeben
 taskPriorityLow.label=Niedrig
 taskPriorityHigh.label=Hoch
 taskPriorityNormal.label=Normal
 taskStatusNone.label=Nicht angegeben
 taskStatusAction.label=Benötigt Eingriff
 taskStatusProcess.label=In Arbeit
 taskStatusCompleted.label=Abgeschlossen am
 taskStatusCancelled.label=Abgebrochen
-taskPrivacyNone.label=Nicht angegeben
-taskPrivacyPrivate.label=Private Aufgabe
-taskPrivacyConfidential.label=Nur Zeit und Datum anzeigen
-taskPrivacyPublic.label=Öffentlicher Termin
 taskShowTimeAsFree.label=Verfügbar
 taskShowTimeAsBusy.label=Beschäftigt
diff -u8pdNr 1.4/chrome/locale/en-US/ccd-prefs.dtd 1.5/chrome/locale/en-US/ccd-prefs.dtd
--- 1.4/chrome/locale/en-US/ccd-prefs.dtd	2014-04-18 09:46:22 +0000
+++ 1.5/chrome/locale/en-US/ccd-prefs.dtd	2015-04-30 19:53:52 +0000
@@ -1,51 +1,39 @@
 <!-- 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 customcalendardefaults.preferences.title "Custom Calendar Defaults - Preferences">
 <!ENTITY customcalendardefaults.preferences.prefspane.label "Custom Calendar Defaults - Preferences">
-<!ENTITY customcalendardefaults.preferences.events.title "Default settings for events">
+<!ENTITY customcalendardefaults.preferences.events.title "Default Values for New Events">
 <!ENTITY customcalendardefaults.preferences.ccdEventStatus.accesskey "">
 <!ENTITY customcalendardefaults.preferences.ccdEventStatus "Status">
 <!ENTITY customcalendardefaults.preferences.ccdEventStatusNone "Not specified">
 <!ENTITY customcalendardefaults.preferences.ccdEventStatusTentative "Tentative">
 <!ENTITY customcalendardefaults.preferences.ccdEventStatusConfirmed "Confirmed">
 <!ENTITY customcalendardefaults.preferences.ccdEventStatusCancelled "Cancelled">
-<!ENTITY customcalendardefaults.preferences.ccdEventPrivacy.accesskey "">
-<!ENTITY customcalendardefaults.preferences.setEventPrivacy.label "Set privacy">
-<!ENTITY customcalendardefaults.preferences.ccdEventPrivacy "Privacy">
-<!ENTITY customcalendardefaults.preferences.ccdEventPrivacyPrivate "Private">
-<!ENTITY customcalendardefaults.preferences.ccdEventPrivacyConfidential "Confidential">
-<!ENTITY customcalendardefaults.preferences.ccdEventPrivacyPublic "Public">
 <!ENTITY customcalendardefaults.preferences.ccdEventPriority.accesskey "">
 <!ENTITY customcalendardefaults.preferences.ccdEventPriority "Priority">
 <!ENTITY customcalendardefaults.preferences.ccdEventPriorityNone "Not specified">
 <!ENTITY customcalendardefaults.preferences.ccdEventPriorityLow "Low">
 <!ENTITY customcalendardefaults.preferences.ccdEventPriorityNormal "Normal">
 <!ENTITY customcalendardefaults.preferences.ccdEventPriorityHigh "High">
 <!ENTITY customcalendardefaults.preferences.ccdEventShowTimeAs.accesskey "">
 <!ENTITY customcalendardefaults.preferences.setEventShowTimeAs.label "Set &quot;Show Time as&quot;">
 <!ENTITY customcalendardefaults.preferences.ccdEventShowTimeAs "Show Time as">
 <!ENTITY customcalendardefaults.preferences.ccdEventShowTimeAsFree "Free">
 <!ENTITY customcalendardefaults.preferences.ccdEventShowTimeAsBusy "Busy">
 <!ENTITY customcalendardefaults.preferences.ccdAlldayEventShowTimeAs.label "Allday Events - Show Time as">
 <!ENTITY customcalendardefaults.preferences.ccdAlldayEventShowTimeAs.accesskey "">
 <!ENTITY customcalendardefaults.preferences.ccdAlldayEventShowTimeAsFree "Free">
 <!ENTITY customcalendardefaults.preferences.ccdAlldayEventShowTimeAsBusy "Busy">
-<!ENTITY customcalendardefaults.preferences.tasks.title "Default settings for tasks">
+<!ENTITY customcalendardefaults.preferences.tasks.title "Default Values for New Tasks">
 <!ENTITY customcalendardefaults.preferences.ccdTaskStatus.accesskey "">
 <!ENTITY customcalendardefaults.preferences.ccdTaskStatus "Status">
-<!ENTITY customcalendardefaults.preferences.ccdTaskPrivacy.accesskey "">
-<!ENTITY customcalendardefaults.preferences.setTaskPrivacy.label "Set privacy">
-<!ENTITY customcalendardefaults.preferences.ccdTaskPrivacy "Privacy">
-<!ENTITY customcalendardefaults.preferences.ccdTaskPrivacyPrivate "Private">
-<!ENTITY customcalendardefaults.preferences.ccdTaskPrivacyConfidential "Confidential">
-<!ENTITY customcalendardefaults.preferences.ccdTaskPrivacyPublic "Public">
 <!ENTITY customcalendardefaults.preferences.ccdTaskPriority.accesskey "">
 <!ENTITY customcalendardefaults.preferences.ccdTaskPriority "Priority">
 <!ENTITY customcalendardefaults.preferences.ccdTaskPriorityNone "Not specified">
 <!ENTITY customcalendardefaults.preferences.ccdTaskPriorityLow "Low">
 <!ENTITY customcalendardefaults.preferences.ccdTaskPriorityNormal "Normal">
 <!ENTITY customcalendardefaults.preferences.ccdTaskPriorityHigh "High">
 <!ENTITY customcalendardefaults.preferences.ccdTaskStatusNone "Not specified">
 <!ENTITY customcalendardefaults.preferences.ccdTaskStatusAction "Needs Action">
diff -u8pdNr 1.4/chrome/locale/en-US/ccd-prefs.properties 1.5/chrome/locale/en-US/ccd-prefs.properties
--- 1.4/chrome/locale/en-US/ccd-prefs.properties	2014-04-18 11:54:49 +0000
+++ 1.5/chrome/locale/en-US/ccd-prefs.properties	2015-04-30 19:54:12 +0000
@@ -7,29 +7,21 @@ preferencesLabel=Einstellungen…
 eventPriorityNone.label=Not specified
 eventPriorityLow.label=Low
 eventPriorityHigh.label=High
 eventPriorityNormal.label=Normal
 eventStatusNone.label=Not specified
 eventStatusTentative.label=Tentative
 eventStatusConfirmed.label=Confirmed
 eventStatusCancelled.label=Cancelled
-eventPrivacyNone.label=None
-eventPrivacyPrivate.label=Private
-eventPrivacyConfidential.label=Confidential
-eventPrivacyPublic.label=Public
 eventShowTimeAsFree.label=Free
 eventShowTimeAsBusy.label=Busy
 taskPriorityNone.label=Not specified
 taskPriorityLow.label=Low
 taskPriorityHigh.label=High
 taskPriorityNormal.label=Normal
 taskStatusNone.label=Not specified
 taskStatusAction.label=Needs Action
 taskStatusProcess.label=In Process
 taskStatusCompleted.label=Completed on
 taskStatusCancelled.label=Cancelled
-taskPrivacyNone.label=None
-taskPrivacyPrivate.label=Private
-taskPrivacyConfidential.label=Confidential
-taskPrivacyPublic.label=Public
 taskShowTimeAsFree.label=Free
 taskShowTimeAsBusy.label=Busy
diff -u8pdNr 1.4/defaults/preferences/customcalendardefaults.js 1.5/defaults/preferences/customcalendardefaults.js
--- 1.4/defaults/preferences/customcalendardefaults.js	2014-07-28 16:12:05 +0000
+++ 1.5/defaults/preferences/customcalendardefaults.js	2015-04-30 19:55:30 +0000
@@ -1,14 +1,10 @@
 /* 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/. */
 
 pref("extensions.customcalendardefaults.event.status", "");
-pref("extensions.customcalendardefaults.event.privacy", false);
-pref("extensions.customcalendardefaults.event.privacy.state", "");
 pref("extensions.customcalendardefaults.event.priority", "0");
 pref("extensions.customcalendardefaults.task.status", "");
-pref("extensions.customcalendardefaults.task.privacy", false);
-pref("extensions.customcalendardefaults.task.privacy.state", "");
 pref("extensions.customcalendardefaults.task.priority", "0");
 pref("extensions.customcalendardefaults.task.showTimeAs", false);
 pref("extensions.customcalendardefaults.task.showTimeAs.state", "");
diff -u8pdNr 1.4/install.rdf 1.5/install.rdf
--- 1.4/install.rdf	2014-07-28 16:59:58 +0000
+++ 1.5/install.rdf	2015-04-29 20:52:30 +0000
@@ -4,56 +4,56 @@
    - 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>Custom Calendar Defaults</em:name>
     <em:id>customcalendardefaults@nadelundhirn.de</em:id>
-    <em:version>1.4</em:version>
+    <em:version>1.5</em:version>
 
     <em:localized>
       <Description>
         <em:locale>de-DE</em:locale>
         <em:name>Custom Calendar Defaults</em:name>
         <em:creator>Robert Brand</em:creator>
         <em:description>Voreinstellungen für Termine und Aufgaben anpassen</em:description>
         <em:homepageURL>http://www.nadelundhirn.de/wp/tag/custom-calendar-defaults/</em:homepageURL>
       </Description>
     </em:localized>
-    <em:description>Custommize default settings for new tasks and events</em:description>
+    <em:description>Customize default settings for new tasks and events</em:description>
     <em:creator>Robert Brand</em:creator>
     <em:homepageURL>http://www.nadelundhirn.de/wp/tag/custom-calendar-defaults/</em:homepageURL>
     <em:optionsURL>chrome://customcalendardefaults/content/ccd-prefs.xul</em:optionsURL>
 	<em:updateURL>http://www.nadelundhirn.de/krams/exten/customcalendardefaults/update.rdf</em:updateURL>
 	<em:updateKey>MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC0aEUGwdymA73OVxwnZK4y6GkkP6t260QkoOOE1v+SoSC4bz8Xjqdmgb9Bs0YZNqQrB1VlvkMoAF3mnf5h/8vd2s43VverhrqXBxYehZmFiwL11f84vwPV5HsRfTwFlSgAOufY/d7/6DOoZkbhXR2/0QMxkscWtbIK0NpCZ3FCEQIDAQAB</em:updateKey>
 
     <!-- Thunderbird -->
     <em:targetApplication>
       <Description>
         <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
-        <em:minVersion>31.0a1</em:minVersion>
-        <em:maxVersion>31.*</em:maxVersion>
+        <em:minVersion>38.0a1</em:minVersion>
+        <em:maxVersion>38.*</em:maxVersion>
       </Description>
     </em:targetApplication>
     
     <!-- SeaMonkey -->
     <em:targetApplication>
       <Description>
         <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
-        <em:minVersion>2.28</em:minVersion>
-        <em:maxVersion>2.28.*</em:maxVersion>
+        <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>3.3</em:minVersion>
-        <em:maxVersion>3.3.*</em:maxVersion>
+        <em:minVersion>4.0</em:minVersion>
+        <em:maxVersion>4.0.*</em:maxVersion>
       </Description>
     </em:requires>
 
   </Description>
 
 </RDF>
