diff --git a/calendar/calendar-ubercalendar.patch b/calendar/calendar-ubercalendar.patch
index 5a350e19..d1e0d626 100644
--- a/calendar/calendar-ubercalendar.patch
+++ b/calendar/calendar-ubercalendar.patch
@@ -3197,11 +3197,15 @@ index c7127f8..657be02 100644
  				}
  			}
  		}
-@@ -808,20 +1025,90 @@ var DayAssistant = Class.create({
+@@ -808,20 +1025,100 @@ var DayAssistant = Class.create({
  		// Subject
  		ctx.fillStyle = this.colors[event.calendarColor].text;
  		if (selected) {
 -			ctx.fillStyle = "rgb(255, 255, 255)";
+-		}
+-		ctx.font = "bold 14px Prelude";
+-		var bottom = textTop;
+-		var subjectTop = top+15;
 +			ctx.fillStyle = "rgb(255, 255, 255)"; }
 +		if(this.enhancedView && this.dayViewShrink != "none") {
 +			ctx.font = (this.dayViewShrink == "strong") ? "bold 10px Prelude" : "bold 12px Prelude";
@@ -3246,7 +3250,11 @@ index c7127f8..657be02 100644
 +			ctx.font = "bold 14px Prelude";
 +			var bottom = textTop;
 +			var subjectTop = top+15;
-+
+
+-		if (bottom >= (top + height)) {
+-			subjectTop = top + 17; // no room for location or note, therefore vertically center subject text
+-		}
+-		this.fillText(event.subject, ctx, left+4, subjectTop, width, bottom, 15 /*line height*/);
 +			if (bottom >= (top + height)) {
 +				subjectTop = top + 17; // no room for location or note, therefore vertically center subject text
 +			}		
@@ -3254,7 +3262,17 @@ index c7127f8..657be02 100644
 +		}
 +		if(this.enhancedView) {
 +			// Alarm
-+			if (event.alarm  && event.alarm[0] && event.alarm[0].alarmTrigger && event.alarm[0].alarmTrigger.valueType && event.alarm[0].alarmTrigger.valueType === "DURATION" && event.alarm[0].alarmTrigger.value && event.alarm[0].alarmTrigger.value !== "" && event.alarm[0].alarmTrigger.value !== "none") {
++			var testA, xx = false, AA, ZZ = event.alarm;
++			if(ZZ){
++				for(AA=0;AA<ZZ.length;AA++){
++					testA = ZZ[AA];
++					if(testA &&  testA.alarmTrigger && testA.action === "display" && testA.alarmTrigger.valueType && testA.alarmTrigger.valueType === "DURATION" && testA.alarmTrigger.value && testA.alarmTrigger.value !== "" && testA.alarmTrigger.value !== "none"){
++						xx = true;
++						break;
++					}
++				}
++			}
++			if (xx) {
 +				if(this.dayViewShrink != "none") {
 +					try{ ctx.drawImage(this.imgAlarm, left+4+width-18, subjectTop-10, 12, 12); }catch(e) {}
 +				} else {
@@ -3275,15 +3293,7 @@ index c7127f8..657be02 100644
 +					}catch (e) {}}
 +				}
 +			}
- 		}
--		ctx.font = "bold 14px Prelude";
--		var bottom = textTop;
--		var subjectTop = top+15;
--
--		if (bottom >= (top + height)) {
--			subjectTop = top + 17; // no room for location or note, therefore vertically center subject text
--		}		
--		this.fillText(event.subject, ctx, left+4, subjectTop, width, bottom, 15 /*line height*/);
++		}
  		
  		// Location
  		if (event.location && (event.location.length > 0) && (textTop < (top + height))) {
@@ -3298,7 +3308,7 @@ index c7127f8..657be02 100644
  			bottom = textTop+15;			
  			this.fillText(event.location, ctx, left+4, textTop, width, bottom, 15 /*line height*/);
  			textTop += 15;
-@@ -829,9 +1116,18 @@ var DayAssistant = Class.create({
+@@ -829,9 +1126,18 @@ var DayAssistant = Class.create({
  		
  		// Notes
  		if (event.note && (event.note.length > 0) && (textTop < (top + height))) {
@@ -3318,7 +3328,7 @@ index c7127f8..657be02 100644
  		}
  
  		var selectedColor;		
-@@ -860,11 +1156,11 @@ var DayAssistant = Class.create({
+@@ -860,11 +1166,11 @@ var DayAssistant = Class.create({
  		var marginRight = 4;
  		//Incorporates the padding-top of the first all day event 
  		//from the old css style .dv-allday-event:first-child
@@ -3333,7 +3343,7 @@ index c7127f8..657be02 100644
  		
  		return {
  			top : (totalHeight * index + marginTop),
-@@ -899,8 +1195,34 @@ var DayAssistant = Class.create({
+@@ -899,8 +1205,44 @@ var DayAssistant = Class.create({
  		if (selected) {
  			ctx.fillStyle = "rgb(255, 255, 255)";
  		}
@@ -3353,7 +3363,17 @@ index c7127f8..657be02 100644
 +		}
 +		if(this.enhancedView) {
 +			// Alarm
-+			if (event.alarm  && event.alarm[0] &&  event.alarm[0].alarmTrigger && event.alarm[0].alarmTrigger.valueType && event.alarm[0].alarmTrigger.valueType === "DURATION" && event.alarm[0].alarmTrigger.value && event.alarm[0].alarmTrigger.value !== "" && event.alarm[0].alarmTrigger.value !== "none" ) {
++			var testA, xx = false, AA, ZZ = event.alarm;
++			if(ZZ){
++				for(AA=0;AA<ZZ.length;AA++){
++					testA = ZZ[AA];
++					if(testA &&  testA.alarmTrigger && testA.action === "display" && testA.alarmTrigger.valueType && testA.alarmTrigger.valueType === "DURATION" && testA.alarmTrigger.value && testA.alarmTrigger.value !== "" && testA.alarmTrigger.value !== "none"){
++						xx = true;
++						break;
++					}
++				}
++			}
++			if (xx) {
 +				try{ ctx.drawImage(this.imgAlarm, dim.left+dim.width-18, dim.top+(dim.height-12)/2, 12, 12); }catch(e) {}
 +			}
 +			// Icon
@@ -3370,7 +3390,7 @@ index c7127f8..657be02 100644
  		
  		if (selected) {
  			var selectedColor = "rgba(4, 4, 4, 0.5)";
-@@ -912,9 +1234,33 @@ var DayAssistant = Class.create({
+@@ -912,9 +1254,33 @@ var DayAssistant = Class.create({
  	calcEventCompression: function (day) {
  
  		// Make sure that free times, busy times, and events are sorted by start times
@@ -3405,7 +3425,7 @@ index c7127f8..657be02 100644
  
  		day.animationTop = 0;
  
-@@ -1136,7 +1482,7 @@ var DayAssistant = Class.create({
+@@ -1136,7 +1502,7 @@ var DayAssistant = Class.create({
  			}
  			//now that we have finished rendering the timelines and number 
  			//render am pm
@@ -3414,7 +3434,7 @@ index c7127f8..657be02 100644
  				//now show the am/pm indicators
  				this.calculatePosToDrawAmPm(Math.abs(this.tds[this.THIS_DAY].scroller.mojo.getScrollPosition().top));
  				Mojo.Dom.show (this.controller.get('ampm_indicator'));
-@@ -1159,7 +1505,7 @@ var DayAssistant = Class.create({
+@@ -1159,7 +1525,7 @@ var DayAssistant = Class.create({
  		// ** ALL DAY EVENTS
  		// Determine whether there are any all day events
  		if (day.allDayEvents.size() > 0) {
@@ -3423,7 +3443,7 @@ index c7127f8..657be02 100644
  			
  			// Set the height of the canvas
  			if (dayDiv.alldayevents_list.offsetHeight != newHeight) {
-@@ -1384,7 +1730,17 @@ var DayAssistant = Class.create({
+@@ -1384,16 +1750,27 @@ var DayAssistant = Class.create({
  		var calMgr	= this.calendarsManager
  		,	calendar= calMgr.getCurrentCal();
  
@@ -3442,7 +3462,10 @@ index c7127f8..657be02 100644
  			this.controller.get ("dv_current_calendar")	.update			($L("All"));
  			this.controller.get ("dv_calendar_source")	.setAttribute	("class", "header-cal-source");
  
-@@ -1394,6 +1750,7 @@ var DayAssistant = Class.create({
+ 		} else {
+ 			if ("Local" == calMgr.getCalSyncSource (calendar)) {
+-				// Special case the local calendar to always show Palm since Palm Profile always
++				// Special case the local calendar to always show Palm since HP webOS Account always
  				// gets truncated and looks ugly
  				this.controller.get ("dv_current_calendar").update ($L("Palm"));
  
@@ -3450,7 +3473,7 @@ index c7127f8..657be02 100644
  			} else {
  				this.controller.get ("dv_current_calendar").update (calMgr.getCalAccountName (calendar));
  			}
-@@ -1439,9 +1796,18 @@ var DayAssistant = Class.create({
+@@ -1439,9 +1816,18 @@ var DayAssistant = Class.create({
  		,	tzId	: this.app.getTimezoneName()
  		};
  
@@ -3470,7 +3493,7 @@ index c7127f8..657be02 100644
  		} else {
  			range.calendarId = calendarId;										// otherwise enable calendar filtering.
  		}
-@@ -1584,6 +1950,12 @@ var DayAssistant = Class.create({
+@@ -1584,6 +1970,12 @@ var DayAssistant = Class.create({
  			top: yPixel+'px'
  		}).show();
  
@@ -3483,7 +3506,7 @@ index c7127f8..657be02 100644
  	},
  	
  	calculatePosWithCompression:function(day,hour)
-@@ -1617,8 +1989,22 @@ var DayAssistant = Class.create({
+@@ -1617,8 +2009,22 @@ var DayAssistant = Class.create({
  	
  	
  	scrollToDefault: function(whichDay) {
@@ -3508,7 +3531,7 @@ index c7127f8..657be02 100644
  		}
  
  		//Mojo.Log.info('BEFORE SCROLL TOP', this.tds[whichDay].scroller.mojo.getScrollPosition().top);
-@@ -1674,10 +2060,26 @@ var DayAssistant = Class.create({
+@@ -1674,10 +2080,26 @@ var DayAssistant = Class.create({
  		this.dvScratchEventsDiv	= this.controller.get ("dv_scratch_events");
  		this.scratchEventActive	= false;
  		this.scratchEvent		= null;
@@ -3535,7 +3558,7 @@ index c7127f8..657be02 100644
  		this.firstActivated = true;
  		
  		this.buildViewHeader();
-@@ -1787,6 +2189,11 @@ var DayAssistant = Class.create({
+@@ -1787,6 +2209,11 @@ var DayAssistant = Class.create({
  		this.divs[this.NEXT_DAY].ctxAllDayEvents = this.divs[this.NEXT_DAY].alldayevents_list.getContext('2d');
  		this.divs[this.THIS_DAY].ctxAllDayEvents = this.divs[this.THIS_DAY].alldayevents_list.getContext('2d');
  		
@@ -3547,7 +3570,7 @@ index c7127f8..657be02 100644
  		this.fastScrollScrim = this.controller.get('dv_scroll_scrim');
  		this.fastScrollAnimateDiv = this.controller.get('dv_scrim_animate');
  		Mojo.Dom.hide (this.fastScrollScrim);
-@@ -1934,15 +2341,16 @@ var DayAssistant = Class.create({
+@@ -1934,15 +2361,16 @@ var DayAssistant = Class.create({
  		this.menuModel = {
  			visible:true,
  			items: [
@@ -3566,7 +3589,7 @@ index c7127f8..657be02 100644
  					]};
  			
  		this.controller.setupWidget(Mojo.Menu.commandMenu, undefined, this.menuModel);
-@@ -2075,9 +2483,10 @@ var DayAssistant = Class.create({
+@@ -2075,9 +2503,10 @@ var DayAssistant = Class.create({
  
  ,	showJumpTo: function() {
  		this.maybeCommitScratchEvent (true);
@@ -3578,7 +3601,7 @@ index c7127f8..657be02 100644
  ,	syncAllCalendars: function() {
  		this.calendarsManager.syncAllCalendars (this.controller);
  	}
-@@ -2153,14 +2562,45 @@ var DayAssistant = Class.create({
+@@ -2153,14 +2582,45 @@ var DayAssistant = Class.create({
  				Mojo.Event.stop (event);
  				this.maybeCommitScratchEvent(true);
  				this.syncAllCalendars();
@@ -3596,8 +3619,8 @@ index c7127f8..657be02 100644
 +					parameters: {
 +						id: appId
 +					},
-+					onSuccess: function(e) {Mojo.Log.error("launched Agendaview")},
-+					onFailure: function(e) {Mojo.Log.error("error launching Agenda:  " + e.errorText)}
++					onSuccess: function(e) {Mojo.Log.error("launched " + appId)},
++					onFailure: function(e) {Mojo.Log.error("error launching " + appId + ":  " + e.errorText)}
 +				});
 +				
  			}				
@@ -3626,7 +3649,7 @@ index c7127f8..657be02 100644
  			}
  		}
  			
-@@ -2337,13 +2777,45 @@ var DayAssistant = Class.create({
+@@ -2337,13 +2797,45 @@ var DayAssistant = Class.create({
  		Mojo.Event.stop (event);
  		var listItems = this.calendarsManager.buildCalendarsMenu (true /*includeAll*/, true /*includeReadOnly*/, true /*includeExcludedFromAll*/);
  
@@ -3673,7 +3696,7 @@ index c7127f8..657be02 100644
  		});
  	},
  
-@@ -2355,6 +2827,18 @@ var DayAssistant = Class.create({
+@@ -2355,6 +2847,18 @@ var DayAssistant = Class.create({
  			return;
  		}
  
@@ -3692,7 +3715,7 @@ index c7127f8..657be02 100644
  		this.maybeCommitScratchEvent (true);
  		this.calendarsManager.setCurrentCal (value);
  		this.clearCache();
-@@ -2399,6 +2883,7 @@ var DayAssistant = Class.create({
+@@ -2399,6 +2903,7 @@ var DayAssistant = Class.create({
  /*HACK*/}
  
  		this.active = true;
@@ -3700,7 +3723,7 @@ index c7127f8..657be02 100644
  		//this.resetPos(); // TEMP
  
  		if (this.compressed) {
-@@ -2414,6 +2899,10 @@ var DayAssistant = Class.create({
+@@ -2414,6 +2919,10 @@ var DayAssistant = Class.create({
  		// - If updateEmptySpacer is called while the dashboard is up, then the scroller
  		// height needs to be updated when the dashboard is brought down.
  
@@ -3711,7 +3734,7 @@ index c7127f8..657be02 100644
  		Mojo.Event.listen(this.controller.window, "resize", this.onResize);
  		this.controller.get ("dv_scroll_container").mojo.addMovementListener (this.onHorizontalScroll);
  		this.controller.get (this.tds[this.THIS_DAY].scroller).mojo.addMovementListener (this.onVerticalScroll);
-@@ -2428,6 +2917,12 @@ var DayAssistant = Class.create({
+@@ -2428,6 +2937,12 @@ var DayAssistant = Class.create({
  		// Calendar Picker
  		this.calendarTapHandler = this.CalSelectorHandler.bind (this);
  		this.controller.get ("dv_calendar_source").observe (Mojo.Event.tap, this.calendarTapHandler);
@@ -3724,7 +3747,7 @@ index c7127f8..657be02 100644
  
  		// The colors have been updated, so we clear the cache and update everything
  		if (this.pendingCalendarSettingsUpdate === true) {
-@@ -2461,14 +2956,29 @@ var DayAssistant = Class.create({
+@@ -2461,14 +2976,29 @@ var DayAssistant = Class.create({
  
  		this.keyDownHandler = this.handleKeyDown.bind(this);
  		this.controller.listen (this.controller.sceneElement, Mojo.Event.keydown, this.keyDownHandler);
@@ -3756,7 +3779,7 @@ index c7127f8..657be02 100644
  		this.tapHandler.deactivate();
  		this.tapHandlerCompressed.deactivate();
  		this.tapHandlerAllDay.deactivate();
-@@ -2497,6 +3007,7 @@ var DayAssistant = Class.create({
+@@ -2497,6 +3027,7 @@ var DayAssistant = Class.create({
  /*HACK*/this.lastScrollPosition			= this.scrollContainer.mojo.getScrollPosition();
  /*HACK*/this.lastVerticalScrollPosition	= this.tds [this.THIS_DAY].scroller.mojo.getScrollPosition();
  
@@ -3764,7 +3787,7 @@ index c7127f8..657be02 100644
  	},
  
  
-@@ -2508,6 +3019,11 @@ var DayAssistant = Class.create({
+@@ -2508,6 +3039,11 @@ var DayAssistant = Class.create({
  			//Mojo.Log.info("handleKeyUp detected ORANGE key");
  			this.orangeKeyDown = false;
  		} 
@@ -3776,7 +3799,7 @@ index c7127f8..657be02 100644
  	},
  	
  	handleKeyDown: function(event) {
-@@ -2516,6 +3032,21 @@ var DayAssistant = Class.create({
+@@ -2516,6 +3052,21 @@ var DayAssistant = Class.create({
  			//Mojo.Log.info("handleKeyDown detected ORANGE key");
  			this.orangeKeyDown = true;
  		} 
@@ -3798,7 +3821,7 @@ index c7127f8..657be02 100644
  	},
  	
  	updateSceneScrollerSize: function(event) {
-@@ -2692,6 +3223,14 @@ var DayAssistant = Class.create({
+@@ -2692,6 +3243,14 @@ var DayAssistant = Class.create({
  		}
  	},
  	
@@ -3813,7 +3836,7 @@ index c7127f8..657be02 100644
  	preCheckBeforeScratchEvent:function(newHour, newMinutes, eventTop) {
  		// Only allow creation of inline events if a non readonly calendar is selected or All
  		if (this.readOnlyCalendar === false) {
-@@ -2724,7 +3263,6 @@ var DayAssistant = Class.create({
+@@ -2724,7 +3283,6 @@ var DayAssistant = Class.create({
  		}
  
  		Mojo.Event.stop (event);
@@ -3821,7 +3844,7 @@ index c7127f8..657be02 100644
  		var eventStartTime	= new Date (this.scratchEvent.dtstart);
  		var subject			= this.scratchEventField.mojo.getValue();
  
-@@ -2990,7 +3528,30 @@ var DayAssistant = Class.create({
+@@ -2990,7 +3548,30 @@ var DayAssistant = Class.create({
  			}
  			*/
  		}
@@ -3853,7 +3876,7 @@ index c7127f8..657be02 100644
  		if (!this.scratchEvent) {
  			this.preCheckBeforeScratchEvent(newHour, newMinute, eventTop);
  		} 
-@@ -3007,14 +3568,14 @@ var DayAssistant = Class.create({
+@@ -3007,14 +3588,14 @@ var DayAssistant = Class.create({
  	
  	handleAllDayTap: function(index, event) {
  		this.deletedEventId = undefined;
@@ -3871,7 +3894,7 @@ index c7127f8..657be02 100644
  			//this.db.getEvent(event._id, this.gotEventInlineDelete.bind(this),this.gotEventInlineDeleteFailed.bind(this));
  			this.gotEventInlineDelete(event);
  		} else {
-@@ -3090,6 +3651,22 @@ var DayAssistant = Class.create({
+@@ -3090,6 +3671,22 @@ var DayAssistant = Class.create({
  		}
  	},
  	
@@ -3894,7 +3917,7 @@ index c7127f8..657be02 100644
  	handleEventsTap: function(event, tapEvent) {
  		//Mojo.Log.info("day-assistant: handleEventsTap event_being_held " + Object.toJSON(this.event_being_held));
  		
-@@ -3118,23 +3695,45 @@ var DayAssistant = Class.create({
+@@ -3118,23 +3715,45 @@ var DayAssistant = Class.create({
              }
          }
          else {
@@ -3950,7 +3973,7 @@ index c7127f8..657be02 100644
          }
  	},
  	
-@@ -3514,6 +4113,66 @@ var DayAssistant = Class.create({
+@@ -3514,6 +4133,66 @@ var DayAssistant = Class.create({
  		}
  	},
  	
@@ -4017,7 +4040,7 @@ index c7127f8..657be02 100644
  	recurrenceCancel:function(){
  		//Mojo.Log.info('inside day- recurrene canceled %o',this.draggedEventTop);
  		this.event_being_held.top = this.event_being_held.origDragTop;
-@@ -3576,6 +4235,16 @@ var DayAssistant = Class.create({
+@@ -3576,6 +4255,16 @@ var DayAssistant = Class.create({
  		//Mojo.Log.info("day-assistant handleEventsDragEnd");
  		
  		if (this.event_being_dragged) {
@@ -4034,7 +4057,7 @@ index c7127f8..657be02 100644
  			var itemTop = this.event_being_dragged.positionedOffset().top;
  			
  			// Calculate how much "time" the user has moved the event.  When the event is retrieved
-@@ -3600,12 +4269,12 @@ var DayAssistant = Class.create({
+@@ -3600,12 +4289,12 @@ var DayAssistant = Class.create({
  	
  				// Retrieve the event from the calendar service so we can set the new start time
  				this.gotEventForUpdateTime(this.event_being_held);	
@@ -4050,7 +4073,7 @@ index c7127f8..657be02 100644
  		}
  	},
  	
-@@ -3810,7 +4479,9 @@ var DayAssistant = Class.create({
+@@ -3810,7 +4499,9 @@ var DayAssistant = Class.create({
  				this.animationValue = value;
  				scrollOffset		*= this.compressed ? value : -value;
  				this.renderDay (this.THIS_DAY, day, false);
@@ -6664,7 +6687,16 @@ diff --git a/usr/palm/applications/com.palm.app.calendar/app/controllers/prefs-a
 index bb28b12..22621f2 100644
 --- a/usr/palm/applications/com.palm.app.calendar/app/controllers/prefs-assistant.js
 +++ b/usr/palm/applications/com.palm.app.calendar/app/controllers/prefs-assistant.js
-@@ -8,7 +8,7 @@
+@@ -1,14 +1,13 @@
+ /* Copyright 2010 Palm, Inc.  All rights reserved. */
+
+-/*jslint laxbreak: true, white: false, devel: true */
+-/*global Class
+-	, $L, Mojo, Template, getAppAssistant, DatabaseManager, Event, MojoLoader, AccountsUI, _
++
++/*global Class, $L, Mojo, Template, getAppAssistant, DatabaseManager, Event, MojoLoader, AccountsUI, _
+ */
+
  var THIRTY_MINUTES	= $L("30 minutes");
  var ONE_HOUR		= $L("1 hour");
  var TWO_HOURS		= $L("2 hours");
@@ -6673,7 +6705,7 @@ index bb28b12..22621f2 100644
  
  var PrefsAssistant	= Class.create({
  
-@@ -60,8 +60,18 @@ var PrefsAssistant	= Class.create({
+@@ -60,8 +59,18 @@ var PrefsAssistant	= Class.create({
  			ned.duration = THIRTY_MINUTES;
  		} else if (this.prefs.defaultEventDuration == 60) {
  			ned.duration = ONE_HOUR;
@@ -6693,7 +6725,7 @@ index bb28b12..22621f2 100644
  		}
  		
  		this.controller.get('pv_new_event_duration').update(ned.duration);
-@@ -156,7 +166,7 @@ var PrefsAssistant	= Class.create({
+@@ -156,7 +165,7 @@ var PrefsAssistant	= Class.create({
  		var index = 0;
  		var currentTimedAlarmStr = "";
  		var currentAllDayAlarmStr = "";
@@ -6702,7 +6734,7 @@ index bb28b12..22621f2 100644
  		var alarmStr;
  		for (index = 0; index < this.alarms.size() + this.allDayAlarms.size() - 1; index++) {
  			alarmStr = response[index];
-@@ -197,6 +207,7 @@ var PrefsAssistant	= Class.create({
+@@ -197,6 +206,7 @@ var PrefsAssistant	= Class.create({
  	
  	buildAlarmsMenu: function() {
  		//Mojo.Log.info('prefs-assistant: buildAlarmsMenu');
@@ -6710,22 +6742,22 @@ index bb28b12..22621f2 100644
  		var params =[this.alarms[0].command, 
  					 this.alarms[1].command, 
  					 this.alarms[2].command,
-@@ -210,6 +221,14 @@ var PrefsAssistant	= Class.create({
+@@ -210,6 +220,14 @@ var PrefsAssistant	= Class.create({
  					 this.allDayAlarms[2].command,
  					 this.allDayAlarms[3].command,
  					 this.allDayAlarms[4].command];
 +		*/
-+		var params = [];
-+		for (var i=0; i<this.alarms.size(); i++) {
++		var i, params = [];
++		for (i=0; i<this.alarms.size(); i++) {
 +			params.push(this.alarms[i].command);
 +		}
-+		for (var i=1; i<this.allDayAlarms.size(); i++) {
++		for (i=1; i<this.allDayAlarms.size(); i++) {
 +			params.push(this.allDayAlarms[i].command);
 +		}
  		
  		this.formatAlarmStringsCallback (this.app.getFormatterService().getAlarmStrings(params));
  		
-@@ -230,7 +249,8 @@ var PrefsAssistant	= Class.create({
+@@ -230,7 +248,8 @@ var PrefsAssistant	= Class.create({
  	calendarSettingsUpdated: function() {
  		this.renderDefaultCalendar();
  	},
@@ -6735,281 +6767,11 @@ index bb28b12..22621f2 100644
  	chooseNotificationRingtone: function() {
  		var params = {
  			actionType: "attach",
-@@ -282,14 +302,1580 @@ var PrefsAssistant	= Class.create({
- 		}
- 	},
- 	
-+	getTweaksAdvReq: function(){
-+		if(this.validReqAccounts && this.validReqAccounts.length > 0){
-+			this.controller.serviceRequest("palm://org.webosinternals.tweaks.prefs/", {
-+					method: "get", 
-+					parameters: { owner: "google-first-sync", 
-+								keys: ["advancedSyncEnabled", "syncStringField"]},
-+					onSuccess: this.gotTweaksReply.bind(this),
-+					onFailure: this.gotTweaksReply.bind(this)
-+			});
-+		} else { //no valid sync accounts, skip
-+			this.advSyncReq = {};
-+		}
-+	},
-+	
-+	getDefaultSync: function (Id){
-+		var timeMachine = new Date(2000, 0, 1, 0, 0, 0, 0);
-+		timeMachine.setHours(7);
-+		var start = timeMachine.getTime();
-+		timeMachine.setHours(18);
-+		var end = timeMachine.getTime();
-+		var defaults = [false /*onoff*/, false /*contacts*/, false /*wifi*/, false /*cell*/, 0 /*battery*/, "20m" /*0d0h20m0s*/, false /*charging*/, false /*docked*/, true /*all day*/, start, end];
-+		var acct, idx, len = this.advReqAccounts.length;
-+		for(var i=0;i<len;i++){
-+			acct = this.advReqAccounts[i];
-+			if(acct && acct._id === Id){
-+				idx = i;
-+				if((acct.accountName.toLowerCase()).indexOf("facebook") !== -1){
-+					defaults[5] = "24h";
-+				}
-+				break;
-+			}
-+		}
-+		return defaults.slice(0);
-+	},
-+	
-+	gotTweaksReply: function(response){
-+		console.error("got tweaks response: " + JSON.stringify(response));
-+		var fromDefault = false, reqs = {},
-+		defaults,
-+		acctOps;
-+		
-+		this.advSyncReq = {};
-+		this.needTweaksSave = false;
-+		if(response){
-+			if(response.advancedSyncEnabled){
-+				this.advancedSyncEnabled = true;
-+				this.controller.get('uber-cal-advreq-disabled').hide();
-+				this.controller.get('uber-cal-advreq-setsyncbtn').show();
-+				if(response.syncStringField && response.syncStringField !== ""){
-+					try{
-+						reqs = JSON.parse(response.syncStringField);
-+						if(reqs && reqs !== undefined){
-+							for(var prop in reqs){// saved accountIds
-+								if(this.validReqAccounts.indexOf(prop) !== -1 && reqs.hasOwnProperty(prop) && !this.advSyncReq.hasOwnProperty(prop)){
-+									//valid account, not previously added, so add
-+									this.advSyncReq[prop] = [];
-+									defaults = this.getDefaultSync(prop);
-+									if(reqs[prop] && reqs[prop] !== undefined && reqs[prop].length){
-+										//has a valid array
-+										acctOps = reqs[prop].slice(0);
-+										for(var j=0;j<defaults.length;j++){
-+											if(acctOps[j] != undefined && acctOps[j] !== null ){
-+												this.advSyncReq[prop][j] = acctOps[j];
-+											} else {
-+												this.advSyncReq[prop][j] = defaults[j];
-+												this.needTweaksSave = true;
-+											}
-+										}
-+									} else {
-+										this.needTweaksSave = true;
-+										this.advSyncReq[prop] = defaults.slice(0);
-+									}
-+									//console.error("TWEAKS adv req results: " + prop + ",values: " + JSON.stringify(this.advSyncReq[prop]) );
-+								} else {
-+									//not valid account or duplicate
-+									console.error("TWEAKS adv req results skipping account Id: " + prop);
-+								}
-+							}
-+						}
-+					} catch(err){//parsing error set defaults
-+						console.error("TWEAKS adv req parsing response error!!! " + JSON.stringify(err) );
-+						var id,len = this.validReqAccounts.length;
-+						this.needTweaksSave = true;
-+						for(var i=0;i<len;i++){
-+							id = this.validReqAccounts[i];
-+							this.advSyncReq[id] = this.getDefaultSync(id);
-+						}
-+						fromDefault = true;
-+					}
-+				} else { // enabled but nothing saved, set defaults
-+					console.error("TWEAKS adv req no saved requirements");
-+					this.needTweaksSave = true;
-+					var id,len = this.validReqAccounts.length;
-+					for(var i=0;i<len;i++){
-+						id = this.validReqAccounts[i];
-+						this.advSyncReq[id] = this.getDefaultSync(id);
-+					}
-+					fromDefault = true;
-+				}
-+				// have an object from tweaks, did a calendar get added?
-+				if(!fromDefault){
-+					var acctOps, def, id,len = this.validReqAccounts.length;
-+					for(var i=0;i<len;i++){
-+						id = this.validReqAccounts[i];
-+						def = this.getDefaultSync(id);
-+						if(!this.advSyncReq.hasOwnProperty(id) || this.advSyncReq[id] === undefined){
-+							this.advSyncReq[id] = def.slice(0);
-+							this.needTweaksSave = true;
-+							console.error("TWEAKS adv req added an account or reset account: " + id);
-+						} else {
-+							acctOps = this.advSyncReq[id].slice(0);
-+							for(var j=0;j<def.length;j++){
-+								if(acctOps[j] != undefined && acctOps[j] !== null ){
-+									this.advSyncReq[id][j] = acctOps[j];
-+								} else {
-+									this.advSyncReq[id][j] = def[j];
-+									this.needTweaksSave = true;
-+								}
-+							}
-+						}
-+						//console.error("TWEAKS adv req results: " + id + ",values: " + JSON.stringify(this.advSyncReq[id]) );
-+					}
-+				}
-+				this.buildAdvReqModels();
-+			} else {
-+				console.error("TWEAKS adv req not enabled");
-+				this.advancedSyncEnabled = false;
-+				this.controller.get('uber-cal-advreq-disabled').show();
-+				this.controller.get('uber-cal-advreq-setsyncbtn').hide();
-+			}
-+			
-+		}
-+	},
-+	
-+	buildAdvReqModels: function (){
-+		this.advReqAcctListItems = [];
-+		if(this.validReqAccounts && this.validReqAccounts.length > 0){
-+			var hrs, mins, sDate, eDate, acctId, allDay, allDayDisabled, openStartEnd, interval, obj = {}, acctOps =[], len = this.validReqAccounts.length;
-+			var timeMachine = new Date();
-+			for(var i=0;i<len;i++){
-+				acctId = this.validReqAccounts[i];
-+				acctOps = this.advSyncReq[acctId].slice(0);
-+				this.advReqAcctListItems[i] = {};
-+				this.advReqAcctListItems[i].Id = i;
-+				interval = acctOps[5];
-+				timeMachine.setTime(acctOps[9]);
-+				hrs = timeMachine.getUTCHours();
-+				mins = timeMachine.getUTCMinutes();
-+				sDate = new Date(2000, 0, 1, hrs, mins, 0, 0);
-+				timeMachine.setTime(acctOps[10]);
-+				hrs = timeMachine.getUTCHours();
-+				mins = timeMachine.getUTCMinutes();
-+				eDate = new Date(2000, 0, 1, hrs, mins, 0, 0);
-+				if(interval.indexOf("m") !== -1 || (interval.indexOf("h") !== -1 && parseInt(interval,10) <= 6)){
-+					allDay = acctOps[8];
-+					allDayDisabled = false;
-+					openStartEnd = !allDay;
-+				} else {
-+					openStartEnd =false;
-+					allDayDisabled = true;
-+					allDay = true;
-+				}
-+				if(i === 0){
-+					if(len===1){
-+						this.advReqAcctListItems[i].listplace = "single";
-+					}else{
-+						this.advReqAcctListItems[i].listplace = "first";
-+					}
-+				} else if(i=== len-1){
-+					this.advReqAcctListItems[i].listplace = "last";
-+				} else {
-+					this.advReqAcctListItems[i].listplace = " ";
-+				}
-+				this.advReqAcctListItems[i]._id = this.advReqAccounts[i]._id;
-+				this.advReqAcctListItems[i].alias = this.advReqAccounts[i].alias;
-+				this.advReqAcctListItems[i].username = this.advReqAccounts[i].username;
-+				this.advReqAcctListItems[i].accountName = this.advReqAccounts[i].accountName;
-+				this.advReqAcctListItems[i].icon = this.advReqAccounts[i].icon;
-+				this.advReqAcctListItems[i].advReqTitle = $L("Enable Requirements");
-+				this.advReqAcctListItems[i].advReqConTitle = $L("Use for contacts");
-+				this.advReqAcctListItems[i].advReqWifiTitle = $L("Wifi only");
-+				this.advReqAcctListItems[i].advReq3gTitle = $L("Cell data only");
-+				this.advReqAcctListItems[i].advReqBattTitle = $L("Min. battery %");
-+				this.advReqAcctListItems[i].advReqChargingTitle = $L("Charging");
-+				this.advReqAcctListItems[i].advReqDockedTitle = $L("On touchstone");
-+				this.advReqAcctListItems[i].advReqAllDayTitle = $L("Sync all day");
-+				this.advReqAcctListItems[i].bigOpen = false;
-+				this.advReqAcctListItems[i].onoff = acctOps[0];
-+				this.advReqAcctListItems[i].contacts  = acctOps[1];
-+				this.advReqAcctListItems[i].wifi = acctOps[2];
-+				this.advReqAcctListItems[i].cell = acctOps[3];
-+				this.advReqAcctListItems[i].batt = parseInt(acctOps[4], 10);
-+				this.advReqAcctListItems[i].interval = acctOps[5];
-+				this.advReqAcctListItems[i].charging = acctOps[6];
-+				this.advReqAcctListItems[i].docked = acctOps[7];
-+				this.advReqAcctListItems[i].allday = allDay;
-+				this.advReqAcctListItems[i].openStartEnd = openStartEnd;
-+				this.advReqAcctListItems[i].allDayDisabled = allDayDisabled;
-+				this.advReqAcctListItems[i].starttime = sDate;
-+				this.advReqAcctListItems[i].endtime = eDate;
-+				//console.error("build adv req models, account: " + acctId + ", ops: " + JSON.stringify(this.advReqAcctListItems[i]));
-+			}
-+		}
-+		
-+		this.setupAdvReqList();
-+	},
-+	
-+	setupAdvReqList: function (){
-+		var len = this.advReqAcctListItems.length;
-+		if(len >0){
-+			//console.error("setupAdvReqList 425 ");
-+			var Id;
-+			for(var i=0;i<len;i++){
-+				Id = this.advReqAcctListItems[i].Id;
-+				this.controller.setupWidget("uber-cal-advreq-drawer"+i,{modelProperty:'bigOpen'},{Id: Id, label : "",	disabled: false, bigOpen:this.advReqAcctListItems[i].open});
-+				this.controller.setupWidget("uber-cal-timedrawer"+i,{modelProperty:'openStartEnd', drawerOpenerOffset: 800, drawerBottomOffset: 1000},{Id: Id, label : "",	disabled: false, open:this.advReqAcctListItems[i].openStartEnd});
-+				this.controller.setupWidget('uber-cal-advreq-onoff'+i, this.onOffAttr={modelProperty:'onoff'}, this.onOffModel={type:"onoff", Id: Id, value: this.advReqAcctListItems[i].onoff});
-+				this.controller.setupWidget('uber-cal-advreq-contacts'+i, this.contactsAttr={modelProperty:'contacts'}, this.contactsModel={type:"contacts", Id: Id, value: this.advReqAcctListItems[i].contacts});
-+				this.controller.setupWidget('uber-cal-advreq-wifi'+i, this.wifiAttr={modelProperty:'wifi'}, this.wifiModel={type:"wifi", Id: Id, value: this.advReqAcctListItems[i].wifi});
-+				this.controller.setupWidget('uber-cal-advreq-cell'+i, this.cellAttr={modelProperty:'cell'}, this.cellModel={type:"cell", Id: Id, value: this.advReqAcctListItems[i].cell});
-+				this.controller.setupWidget('uber-cal-advreq-charging'+i, this.chargingAttr={modelProperty:'charging'}, this.chargingModel={type:"charging", Id: Id, value: this.advReqAcctListItems[i].charging});
-+				this.controller.setupWidget('uber-cal-advreq-docked'+i, this.dockedAttr={modelProperty:'docked'}, this.dockedModel={type:"docked", Id: Id, value: this.advReqAcctListItems[i].docked});
-+				this.controller.setupWidget('uber-cal-advreq-allday'+i, this.alldayAttr={modelProperty:'allday', disabledProperty:"allDayDisabled"},this.alldayModel={type:"allday", Id: Id, value: this.advReqAcctListItems[i].allday, disabled: this.advReqAcctListItems[i].allDayDisabled});
-+				this.controller.setupWidget('uber-cal-advreq-starttime'+i, this.starttimeAttr={modelProperty:'starttime', label:$L("Start")}, this.advreqstarttimeModel={type:"starttime", Id: Id, value: this.advReqAcctListItems[i].starttime});
-+				this.controller.setupWidget('uber-cal-advreq-endtime'+i, this.endtimeAttr={modelProperty:'endtime', label:$L("End")}, this.advreqendtimeModel={type:"endtime", Id: Id, value: this.advReqAcctListItems[i].endtime});
-+				this.controller.setupWidget('uber-cal-advreq-batt'+i, this.battAttr={label:"", modelProperty:'batt', min:0, max:100}, this.battModel={type:"batt", Id: Id, value: this.advReqAcctListItems[i].batt});
-+				this.controller.setupWidget('uber-cal-advreq-interval'+i,
-+									this.advReqIntAttr = {
-+										modelProperty: 'interval',
-+										label: $L("Interval"),
-+								      	choices: this.advReqIntOptions
-+									},
-+									this.advReqIntModel = {
-+										type: "interval",
-+										Id: Id,
-+										value: this.advReqAcctListItems[i].interval
-+									});
-+			}
-+			this.advReqAcctListModel.items = this.advReqAcctListItems;
-+			this.controller.get('uber-cal-advreqList').mojo.noticeUpdatedItems(0, this.advReqAcctListItems);
-+			for(var i=0;i<len;i++){
-+				this.controller.get(i+"uber-cal-advreq-btn").observe('mojo-tap', this.ucDrawerBtnHandler);
-+				this.controller.get(i+"uber-cal-advreq-timebtn").observe('mojo-tap', this.ucDrawerBtnHandler);
-+			}
-+			this.controller.get("uber-cal-advreq-setsyncbtn").observe('mojo-tap', this.ucDrawerBtnHandler);
-+		}
-+		
-+	},
-+	
- 	setup: function() {
+@@ -286,6 +305,1273 @@ var PrefsAssistant	= Class.create({
  		// Retrieve the prefs from the service
  		this.prefs		= this.prefsManager.getPrefs();
  		this.db			= new DatabaseManager();
 +		this.reminders = getAppAssistant().getReminderManager();
-+		// advanced requirements for sync
-+		this.advReqAccounts = this.calendarsManager.getAdvReqCalList();
-+		this.validReqAccounts = [];
-+		if(this.advReqAccounts && this.advReqAccounts.length > 0){
-+			var acct, len = this.advReqAccounts.length;
-+			for(var i=0;i<len;i++){
-+				acct = this.advReqAccounts[i] && this.advReqAccounts[i]._id;
-+				if(acct && acct !== undefined && acct !== ""){
-+					if(this.validReqAccounts.indexOf(acct) === -1){
-+						this.validReqAccounts.push(acct);
-+					}
-+				}
-+			}
-+		}
-+		this.advancedSyncEnabled = false;
-+		this.getTweaksAdvReq();
-+		
 +				//get default snooze duration from cookie
 +		this.showSnoozedForBanner = true;
 +		this.showReminderDashboard = true;
@@ -7338,9 +7100,9 @@ index bb28b12..22621f2 100644
 +		newDiv12.appendChild(newDiv13);
 +		dList.appendChild(newDiv12); // add snooze dur to drawer list
 +
-+		var newDiv12 = document.createElement('div');
-+		var newDiv13 = document.createElement('div');
-+		var newDiv14 = document.createElement('div');
++		newDiv12 = document.createElement('div');
++		newDiv13 = document.createElement('div');
++		newDiv14 = document.createElement('div');
 +		newDiv12.setAttribute('class', "palm-row");
 +		newDiv12.setAttribute('x-mojo-tap-highlight', "momentary");
 +		newDiv13.setAttribute('class', "palm-row-wrapper");
@@ -7350,9 +7112,9 @@ index bb28b12..22621f2 100644
 +		newDiv12.appendChild(newDiv13);
 +		dList.appendChild(newDiv12); // add repeat to drawer list
 +
-+		var newDiv12 = document.createElement('div');
-+		var newDiv13 = document.createElement('div');
-+		var newDiv14 = document.createElement('div');
++		newDiv12 = document.createElement('div');
++		newDiv13 = document.createElement('div');
++		newDiv14 = document.createElement('div');
 +		newDiv12.setAttribute('class', "palm-row");
 +		newDiv12.setAttribute('x-mojo-tap-highlight', "momentary");
 +		newDiv13.setAttribute('class', "palm-row-wrapper");
@@ -7362,9 +7124,9 @@ index bb28b12..22621f2 100644
 +		newDiv12.appendChild(newDiv13);
 +		dList.appendChild(newDiv12); // add max repeat to drawer list
 +		
-+		var newDiv12 = document.createElement('div');
-+		var newDiv13 = document.createElement('div');
-+		var newDiv14 = document.createElement('div');
++		newDiv12 = document.createElement('div');
++		newDiv13 = document.createElement('div');
++		newDiv14 = document.createElement('div');
 +		newDiv12.setAttribute('class', "palm-row");
 +		newDiv12.setAttribute('x-mojo-tap-highlight', "momentary");
 +		newDiv13.setAttribute('class', "palm-row-wrapper");
@@ -7374,9 +7136,9 @@ index bb28b12..22621f2 100644
 +		newDiv12.appendChild(newDiv13);
 +		dList.appendChild(newDiv12); // add alarm dura to drawer list
 +		
-+		var newDiv12 = document.createElement('div');
-+		var newDiv13 = document.createElement('div');
-+		var newDiv14 = document.createElement('div');
++		newDiv12 = document.createElement('div');
++		newDiv13 = document.createElement('div');
++		newDiv14 = document.createElement('div');
 +		newDiv12.setAttribute('class', "palm-row");
 +		newDiv12.setAttribute('x-mojo-tap-highlight', "momentary");
 +		newDiv13.setAttribute('class', "palm-row-wrapper");
@@ -7386,9 +7148,9 @@ index bb28b12..22621f2 100644
 +		newDiv12.appendChild(newDiv13);
 +		dList.appendChild(newDiv12); // add open in view to drawer list
 +
-+		var newDiv12 = document.createElement('div');
-+		var newDiv13 = document.createElement('div');
-+		var newDiv14 = document.createElement('div');
++		newDiv12 = document.createElement('div');
++		newDiv13 = document.createElement('div');
++		newDiv14 = document.createElement('div');
 +		newDiv12.setAttribute('class', "palm-row");
 +		newDiv12.setAttribute('x-mojo-tap-highlight', "momentary");
 +		newDiv13.setAttribute('class', "palm-row-wrapper");
@@ -7398,9 +7160,9 @@ index bb28b12..22621f2 100644
 +		newDiv12.appendChild(newDiv13);
 +		dList.appendChild(newDiv12); // add back gesture to drawer list
 +
-+		var newDiv12 = document.createElement('div');
-+		var newDiv13 = document.createElement('div');
-+		var newDiv14 = document.createElement('div');
++		newDiv12 = document.createElement('div');
++		newDiv13 = document.createElement('div');
++		newDiv14 = document.createElement('div');
 +		newDiv12.setAttribute('class', "palm-row");
 +		newDiv12.setAttribute('x-mojo-tap-highlight', "momentary");
 +		newDiv13.setAttribute('class', "palm-row-wrapper");
@@ -7410,9 +7172,9 @@ index bb28b12..22621f2 100644
 +		newDiv12.appendChild(newDiv13);
 +		dList.appendChild(newDiv12); // add minute interval to drawer list
 +
-+		var newDiv12 = document.createElement('div');
-+		var newDiv13 = document.createElement('div');
-+		var newDiv14 = document.createElement('div');
++		newDiv12 = document.createElement('div');
++		newDiv13 = document.createElement('div');
++		newDiv14 = document.createElement('div');
 +		newDiv12.setAttribute('class', "palm-row");
 +		newDiv12.setAttribute('x-mojo-tap-highlight', "momentary");
 +		newDiv13.setAttribute('class', "palm-row-wrapper");
@@ -7422,9 +7184,9 @@ index bb28b12..22621f2 100644
 +		newDiv12.appendChild(newDiv13);
 +		dList.appendChild(newDiv12); // add weeknumber offset to drawer list
 +
-+		var newDiv12 = document.createElement('div');
-+		var newDiv13 = document.createElement('div');
-+		var newDiv14 = document.createElement('div');
++		newDiv12 = document.createElement('div');
++		newDiv13 = document.createElement('div');
++		newDiv14 = document.createElement('div');
 +		newDiv12.setAttribute('class', "palm-row");
 +		newDiv12.setAttribute('x-mojo-tap-highlight', "momentary");
 +		newDiv13.setAttribute('class', "palm-row-wrapper");
@@ -7435,9 +7197,9 @@ index bb28b12..22621f2 100644
 +		dList.appendChild(newDiv12); // add weeknumber modulus to drawer list
 +		
 +		var newDiv11 = document.createElement('div');
-+		var newDiv12 = document.createElement('div');
-+		var newDiv13 = document.createElement('div');
-+		var newDiv14 = document.createElement('div');
++		newDiv12 = document.createElement('div');
++		newDiv13 = document.createElement('div');
++		newDiv14 = document.createElement('div');
 +		newDiv11.setAttribute('class', "palm-row");
 +		newDiv12.setAttribute('class', "palm-row-wrapper");
 +		newDiv13.setAttribute('x-mojo-element', "ToggleButton");
@@ -7450,10 +7212,10 @@ index bb28b12..22621f2 100644
 +		newDiv11.appendChild(newDiv12);
 +		dList.appendChild(newDiv11); // add week number to drawer list
 +		
-+		var newDiv11 = document.createElement('div');
-+		var newDiv12 = document.createElement('div');
-+		var newDiv13 = document.createElement('div');
-+		var newDiv14 = document.createElement('div');
++		newDiv11 = document.createElement('div');
++		newDiv12 = document.createElement('div');
++		newDiv13 = document.createElement('div');
++		newDiv14 = document.createElement('div');
 +		newDiv11.setAttribute('class', "palm-row");
 +		newDiv12.setAttribute('class', "palm-row-wrapper");
 +		newDiv13.setAttribute('x-mojo-element', "ToggleButton");
@@ -7466,10 +7228,10 @@ index bb28b12..22621f2 100644
 +		newDiv11.appendChild(newDiv12);
 +		dList.appendChild(newDiv11); // add iso week number to drawer list
 +		
-+		var newDiv11 = document.createElement('div');
-+		var newDiv12 = document.createElement('div');
-+		var newDiv13 = document.createElement('div');
-+		var newDiv14 = document.createElement('div');
++		newDiv11 = document.createElement('div');
++		newDiv12 = document.createElement('div');
++		newDiv13 = document.createElement('div');
++		newDiv14 = document.createElement('div');
 +		newDiv11.setAttribute('class', "palm-row");
 +		newDiv12.setAttribute('class', "palm-row-wrapper");
 +		newDiv13.setAttribute('x-mojo-element', "ToggleButton");
@@ -7482,10 +7244,10 @@ index bb28b12..22621f2 100644
 +		newDiv11.appendChild(newDiv12);
 +		dList.appendChild(newDiv11); // add agendaZ to drawer list
 +		
-+		var newDiv11 = document.createElement('div');
-+		var newDiv12 = document.createElement('div');
-+		var newDiv13 = document.createElement('div');
-+		var newDiv14 = document.createElement('div');
++		newDiv11 = document.createElement('div');
++		newDiv12 = document.createElement('div');
++		newDiv13 = document.createElement('div');
++		newDiv14 = document.createElement('div');
 +		newDiv11.setAttribute('class', "palm-row");
 +		newDiv12.setAttribute('class', "palm-row-wrapper");
 +		newDiv13.setAttribute('x-mojo-element', "ToggleButton");
@@ -7498,10 +7260,10 @@ index bb28b12..22621f2 100644
 +		newDiv11.appendChild(newDiv12);
 +		dList.appendChild(newDiv11); // add snooze banner to drawer list
 +		
-+		var newDiv11 = document.createElement('div');
-+		var newDiv12 = document.createElement('div');
-+		var newDiv13 = document.createElement('div');
-+		var newDiv14 = document.createElement('div');
++		newDiv11 = document.createElement('div');
++		newDiv12 = document.createElement('div');
++		newDiv13 = document.createElement('div');
++		newDiv14 = document.createElement('div');
 +		newDiv11.setAttribute('class', "palm-row");
 +		newDiv12.setAttribute('class', "palm-row-wrapper");
 +		newDiv13.setAttribute('x-mojo-element', "ToggleButton");
@@ -7514,10 +7276,10 @@ index bb28b12..22621f2 100644
 +		newDiv11.appendChild(newDiv12);
 +		dList.appendChild(newDiv11); // add reminder dash to drawer list
 +
-+		var newDiv11 = document.createElement('div');
-+		var newDiv12 = document.createElement('div');
-+		var newDiv13 = document.createElement('div');
-+		var newDiv14 = document.createElement('div');
++		newDiv11 = document.createElement('div');
++		newDiv12 = document.createElement('div');
++		newDiv13 = document.createElement('div');
++		newDiv14 = document.createElement('div');
 +		newDiv11.setAttribute('class', "palm-row");
 +		newDiv12.setAttribute('class', "palm-row-wrapper");
 +		newDiv13.setAttribute('x-mojo-element', "ToggleButton");
@@ -7530,10 +7292,10 @@ index bb28b12..22621f2 100644
 +		newDiv11.appendChild(newDiv12);
 +		dList.appendChild(newDiv11); // add stop auto to drawer list
 +		
-+		var newDiv11 = document.createElement('div');
-+		var newDiv12 = document.createElement('div');
-+		var newDiv13 = document.createElement('div');
-+		var newDiv14 = document.createElement('div');
++		newDiv11 = document.createElement('div');
++		newDiv12 = document.createElement('div');
++		newDiv13 = document.createElement('div');
++		newDiv14 = document.createElement('div');
 +		newDiv11.setAttribute('class', "palm-row");
 +		newDiv12.setAttribute('class', "palm-row-wrapper");
 +		newDiv13.setAttribute('x-mojo-element', "ToggleButton");
@@ -7548,13 +7310,13 @@ index bb28b12..22621f2 100644
 +		
 +		var d2List = document.createElement('div');  // list for 2nd level day drawer
 +		d2List.setAttribute('class', "palm-list");
-+		var newDiv01 = document.createElement('div'); 
++		newDiv01 = document.createElement('div');
 +		newDiv01.setAttribute('class', 'palm-row');
 +		newDiv01.setAttribute('x-mojo-tap-highlight', "momentary");
 +		newDiv01.setAttribute('id', 'dayuberCprefsbutton'); // button for 2nd level day drawer
-+		var newDiv12 = document.createElement('div');
-+		var newDiv13 = document.createElement('div');
-+		var newDiv14 = document.createElement('div');
++		newDiv12 = document.createElement('div');
++		newDiv13 = document.createElement('div');
++		newDiv14 = document.createElement('div');
 +		newDiv12.setAttribute('class', "palm-row-wrapper");
 +		newDiv13.setAttribute('x-mojo-element', "ToggleButton");
 +		newDiv13.setAttribute('id', "prefs-dayviewenhanced-toggle"); //toggle
@@ -7572,10 +7334,10 @@ index bb28b12..22621f2 100644
 +		dList.appendChild(newDrawer2); // add day drawer2 to drawer1 list
 +		newDrawer2.appendChild(d2List); // add second list to day drawer2
 +		
-+		var newDiv11 = document.createElement('div');
-+		var newDiv12 = document.createElement('div');
-+		var newDiv13 = document.createElement('div');
-+		var newDiv14 = document.createElement('div');
++		newDiv11 = document.createElement('div');
++		newDiv12 = document.createElement('div');
++		newDiv13 = document.createElement('div');
++		newDiv14 = document.createElement('div');
 +		newDiv11.setAttribute('class', "palm-row");
 +		newDiv12.setAttribute('class', "palm-row-wrapper");
 +		newDiv13.setAttribute('x-mojo-element', "ToggleButton");
@@ -7588,10 +7350,10 @@ index bb28b12..22621f2 100644
 +		newDiv11.appendChild(newDiv12);
 +		d2List.appendChild(newDiv11); // add day view compression to second drawer list
 +
-+		var newDiv11 = document.createElement('div');
-+		var newDiv12 = document.createElement('div');
-+		var newDiv13 = document.createElement('div');
-+		var newDiv14 = document.createElement('div');
++		newDiv11 = document.createElement('div');
++		newDiv12 = document.createElement('div');
++		newDiv13 = document.createElement('div');
++		newDiv14 = document.createElement('div');
 +		newDiv11.setAttribute('class', "palm-row");
 +		newDiv11.setAttribute('x-mojo-tap-highlight', "momentary");
 +		newDiv12.setAttribute('class', "palm-row-wrapper");
@@ -7601,10 +7363,10 @@ index bb28b12..22621f2 100644
 +		newDiv11.appendChild(newDiv12);
 +		d2List.appendChild(newDiv11); // add day view shrink to second drawer list
 +		
-+		var newDiv11 = document.createElement('div');
-+		var newDiv12 = document.createElement('div');
-+		var newDiv13 = document.createElement('div');
-+		var newDiv14 = document.createElement('div');
++		newDiv11 = document.createElement('div');
++		newDiv12 = document.createElement('div');
++		newDiv13 = document.createElement('div');
++		newDiv14 = document.createElement('div');
 +		newDiv11.setAttribute('class', "palm-row");
 +		newDiv12.setAttribute('class', "palm-row-wrapper");
 +		newDiv13.setAttribute('x-mojo-element', "ToggleButton");
@@ -7617,10 +7379,10 @@ index bb28b12..22621f2 100644
 +		newDiv11.appendChild(newDiv12);
 +		d2List.appendChild(newDiv11); // add day view icons to second drawer list
 +		
-+		var newDiv11 = document.createElement('div');
-+		var newDiv12 = document.createElement('div');
-+		var newDiv13 = document.createElement('div');
-+		var newDiv14 = document.createElement('div');
++		newDiv11 = document.createElement('div');
++		newDiv12 = document.createElement('div');
++		newDiv13 = document.createElement('div');
++		newDiv14 = document.createElement('div');
 +		newDiv11.setAttribute('class', "palm-row");
 +		newDiv12.setAttribute('class', "palm-row-wrapper");
 +		newDiv13.setAttribute('x-mojo-element', "ToggleButton");
@@ -7633,9 +7395,9 @@ index bb28b12..22621f2 100644
 +		newDiv11.appendChild(newDiv12);
 +		d2List.appendChild(newDiv11); // add day minute popup to second drawer list
 +		
-+		var newDiv12 = document.createElement('div');
-+		var newDiv13 = document.createElement('div');
-+		var newDiv14 = document.createElement('div');
++		newDiv12 = document.createElement('div');
++		newDiv13 = document.createElement('div');
++		newDiv14 = document.createElement('div');
 +		newDiv12.setAttribute('class', "palm-row");
 +		newDiv12.setAttribute('x-mojo-tap-highlight', "momentary");
 +		newDiv13.setAttribute('class', "palm-row-wrapper");
@@ -7647,13 +7409,13 @@ index bb28b12..22621f2 100644
 +		
 +		var d3List = document.createElement('div');  // list for 3rd level drawer
 +		d3List.setAttribute('class', "palm-list");
-+		var newDiv01 = document.createElement('div'); 
++		newDiv01 = document.createElement('div');
 +		newDiv01.setAttribute('class', 'palm-row');
 +		newDiv01.setAttribute('x-mojo-tap-highlight', "momentary");
 +		newDiv01.setAttribute('id', 'monthuberCprefsbutton'); // button for 3rd level drawer
-+		var newDiv12 = document.createElement('div');
-+		var newDiv13 = document.createElement('div');
-+		var newDiv14 = document.createElement('div');
++		newDiv12 = document.createElement('div');
++		newDiv13 = document.createElement('div');
++		newDiv14 = document.createElement('div');
 +		newDiv12.setAttribute('class', "palm-row-wrapper");
 +		newDiv13.setAttribute('x-mojo-element', "ToggleButton");
 +		newDiv13.setAttribute('id', "prefs-monthviewenhanced-toggle"); //toggle
@@ -7671,10 +7433,10 @@ index bb28b12..22621f2 100644
 +		dList.appendChild(newDrawer3); // add drawer3 to drawer1 list
 +		newDrawer3.appendChild(d3List); // add 3 list to 3 drawer
 +		
-+		var newDiv11 = document.createElement('div');
-+		var newDiv12 = document.createElement('div');
-+		var newDiv13 = document.createElement('div');
-+		var newDiv14 = document.createElement('div');
++		newDiv11 = document.createElement('div');
++		newDiv12 = document.createElement('div');
++		newDiv13 = document.createElement('div');
++		newDiv14 = document.createElement('div');
 +		newDiv11.setAttribute('class', "palm-row");
 +		newDiv12.setAttribute('class', "palm-row-wrapper");
 +		newDiv13.setAttribute('x-mojo-element', "ToggleButton");
@@ -7687,10 +7449,10 @@ index bb28b12..22621f2 100644
 +		newDiv11.appendChild(newDiv12);
 +		d3List.appendChild(newDiv11); // add all day color to month drawer3 list
 +		
-+		var newDiv11 = document.createElement('div');
-+		var newDiv12 = document.createElement('div');
-+		var newDiv13 = document.createElement('div');
-+		var newDiv14 = document.createElement('div');
++		newDiv11 = document.createElement('div');
++		newDiv12 = document.createElement('div');
++		newDiv13 = document.createElement('div');
++		newDiv14 = document.createElement('div');
 +		newDiv11.setAttribute('class', "palm-row");
 +		newDiv12.setAttribute('class', "palm-row-wrapper");
 +		newDiv13.setAttribute('x-mojo-element', "ToggleButton");
@@ -7703,10 +7465,10 @@ index bb28b12..22621f2 100644
 +		newDiv11.appendChild(newDiv12);
 +		d3List.appendChild(newDiv11); // add show icons to month drawer3 list
 +		
-+		var newDiv11 = document.createElement('div');
-+		var newDiv12 = document.createElement('div');
-+		var newDiv13 = document.createElement('div');
-+		var newDiv14 = document.createElement('div');
++		newDiv11 = document.createElement('div');
++		newDiv12 = document.createElement('div');
++		newDiv13 = document.createElement('div');
++		newDiv14 = document.createElement('div');
 +		newDiv11.setAttribute('class', "palm-row");
 +		newDiv12.setAttribute('class', "palm-row-wrapper");
 +		newDiv13.setAttribute('x-mojo-element', "ToggleButton");
@@ -7719,10 +7481,10 @@ index bb28b12..22621f2 100644
 +		newDiv11.appendChild(newDiv12);
 +		d3List.appendChild(newDiv11); // add show icons to month drawer3 list
 +		
-+		var newDiv11 = document.createElement('div');
-+		var newDiv12 = document.createElement('div');
-+		var newDiv13 = document.createElement('div');
-+		var newDiv14 = document.createElement('div');
++		newDiv11 = document.createElement('div');
++		newDiv12 = document.createElement('div');
++		newDiv13 = document.createElement('div');
++		newDiv14 = document.createElement('div');
 +		newDiv11.setAttribute('class', "palm-row");
 +		newDiv12.setAttribute('class', "palm-row-wrapper");
 +		newDiv13.setAttribute('x-mojo-element', "ToggleButton");
@@ -7737,13 +7499,13 @@ index bb28b12..22621f2 100644
 +
 +		var d4List = document.createElement('div');  // list for week level drawer
 +		d4List.setAttribute('class', "palm-list");
-+		var newDiv01 = document.createElement('div'); 
++		newDiv01 = document.createElement('div');
 +		newDiv01.setAttribute('class', 'palm-row');
 +		newDiv01.setAttribute('x-mojo-tap-highlight', "momentary");
 +		newDiv01.setAttribute('id', 'weekuberCprefsbutton'); // button for week level 
-+		var newDiv12 = document.createElement('div');
-+		var newDiv13 = document.createElement('div');
-+		var newDiv14 = document.createElement('div');
++		newDiv12 = document.createElement('div');
++		newDiv13 = document.createElement('div');
++		newDiv14 = document.createElement('div');
 +		newDiv12.setAttribute('class', "palm-row-wrapper");
 +		newDiv13.setAttribute('x-mojo-element', "ToggleButton");
 +		newDiv13.setAttribute('id', "prefs-weekviewenhanced-toggle");
@@ -7761,10 +7523,10 @@ index bb28b12..22621f2 100644
 +		dList.appendChild(newDrawer4); // add week drawer4 to drawer1 list
 +		newDrawer4.appendChild(d4List); // add week list to week drawer
 +		
-+		var newDiv11 = document.createElement('div');
-+		var newDiv12 = document.createElement('div');
-+		var newDiv13 = document.createElement('div');
-+		var newDiv14 = document.createElement('div');
++		newDiv11 = document.createElement('div');
++		newDiv12 = document.createElement('div');
++		newDiv13 = document.createElement('div');
++		newDiv14 = document.createElement('div');
 +		newDiv11.setAttribute('class', "palm-row");
 +		newDiv12.setAttribute('class', "palm-row-wrapper");
 +		newDiv13.setAttribute('x-mojo-element', "ToggleButton");
@@ -7777,10 +7539,10 @@ index bb28b12..22621f2 100644
 +		newDiv11.appendChild(newDiv12);
 +		d4List.appendChild(newDiv11); // add show event subject to week drawer4 list
 +		
-+		var newDiv11 = document.createElement('div');
-+		var newDiv12 = document.createElement('div');
-+		var newDiv13 = document.createElement('div');
-+		var newDiv14 = document.createElement('div');
++		newDiv11 = document.createElement('div');
++		newDiv12 = document.createElement('div');
++		newDiv13 = document.createElement('div');
++		newDiv14 = document.createElement('div');
 +		newDiv11.setAttribute('class', "palm-row");
 +		newDiv12.setAttribute('class', "palm-row-wrapper");
 +		newDiv13.setAttribute('x-mojo-element', "ToggleButton");
@@ -7793,10 +7555,10 @@ index bb28b12..22621f2 100644
 +		newDiv11.appendChild(newDiv12);
 +		d4List.appendChild(newDiv11); // add work week to drawer list
 +		
-+		var newDiv11 = document.createElement('div');
-+		var newDiv12 = document.createElement('div');
-+		var newDiv13 = document.createElement('div');
-+		var newDiv14 = document.createElement('div');
++		newDiv11 = document.createElement('div');
++		newDiv12 = document.createElement('div');
++		newDiv13 = document.createElement('div');
++		newDiv14 = document.createElement('div');
 +		newDiv11.setAttribute('class', "palm-row");
 +		newDiv12.setAttribute('class', "palm-row-wrapper");
 +		newDiv13.setAttribute('x-mojo-element', "ToggleButton");
@@ -7809,9 +7571,9 @@ index bb28b12..22621f2 100644
 +		newDiv11.appendChild(newDiv12);
 +		d4List.appendChild(newDiv11); // add show icons to week drawer4 list
 +	
-+		var newDiv11 = document.createElement('div');
-+		var newDiv12 = document.createElement('div');
-+		var newDiv13 = document.createElement('div');
++		newDiv11 = document.createElement('div');
++		newDiv12 = document.createElement('div');
++		newDiv13 = document.createElement('div');
 +		newDiv11.setAttribute('class', "palm-row");
 +		newDiv12.setAttribute('class', "palm-row-wrapper");
 +		newDiv13.setAttribute('x-mojo-element', "ListSelector");
@@ -7820,9 +7582,9 @@ index bb28b12..22621f2 100644
 +		newDiv11.appendChild(newDiv12);
 +		d4List.appendChild(newDiv11); // add week view shrink to week drawer4 list
 +		
-+		var newDiv11 = document.createElement('div');
-+		var newDiv12 = document.createElement('div');
-+		var newDiv13 = document.createElement('div');
++		newDiv11 = document.createElement('div');
++		newDiv12 = document.createElement('div');
++		newDiv13 = document.createElement('div');
 +		newDiv11.setAttribute('class', "palm-row");
 +		newDiv12.setAttribute('class', "palm-row-wrapper");
 +		newDiv13.setAttribute('x-mojo-element', "ListSelector");
@@ -7834,11 +7596,11 @@ index bb28b12..22621f2 100644
 +		var d5List = document.createElement('div');  // container for cat level drawer
 +		d5List.setAttribute('id', "uber-cat-list-container");
 +		d5List.innerHTML = '<div id="uberCatList" x-mojo-element="IndexedList" class="palm-list" > </div>';
-+		var newDiv01 = document.createElement('div'); 
++		newDiv01 = document.createElement('div');
 +		newDiv01.setAttribute('class', 'palm-row');
 +		newDiv01.setAttribute('x-mojo-tap-highlight', "momentary");
 +		newDiv01.setAttribute('id', 'catuberCprefsbutton'); // button for week level 
-+		var newDiv14 = document.createElement('div');
++		newDiv14 = document.createElement('div');
 +		newDiv14.setAttribute('class', "title");
 +		newDiv14.setAttribute('x-mojo-loc', '""');
 +		newDiv14.innerHTML = $L('Categories');
@@ -7851,10 +7613,10 @@ index bb28b12..22621f2 100644
 +		dList.appendChild(newDrawer5); // add cat drawer5 to drawer1 list
 +		newDrawer5.appendChild(d5List); // add cat list container to cat drawer
 +		
-+		var newDiv11 = document.createElement('div');
-+		var newDiv12 = document.createElement('div');
-+		var newDiv13 = document.createElement('div');
-+		var newDiv14 = document.createElement('div');
++		newDiv11 = document.createElement('div');
++		newDiv12 = document.createElement('div');
++		newDiv13 = document.createElement('div');
++		newDiv14 = document.createElement('div');
 +		newDiv11.setAttribute('class', "palm-row");
 +		newDiv12.setAttribute('class', "palm-row-wrapper");
 +		newDiv13.setAttribute('x-mojo-element', "ToggleButton");
@@ -7867,10 +7629,10 @@ index bb28b12..22621f2 100644
 +		newDiv11.appendChild(newDiv12);
 +		dList.appendChild(newDiv11); // add Goto edit from Template drawer list
 +		
-+		var newDiv11 = document.createElement('div');
-+		var newDiv12 = document.createElement('div');
-+		var newDiv13 = document.createElement('div');
-+		var newDiv14 = document.createElement('div');
++		newDiv11 = document.createElement('div');
++		newDiv12 = document.createElement('div');
++		newDiv13 = document.createElement('div');
++		newDiv14 = document.createElement('div');
 +		newDiv11.setAttribute('class', "palm-row");
 +		newDiv12.setAttribute('class', "palm-row-wrapper");
 +		newDiv13.setAttribute('x-mojo-element', "ToggleButton");
@@ -7883,10 +7645,10 @@ index bb28b12..22621f2 100644
 +		newDiv11.appendChild(newDiv12);
 +		dList.appendChild(newDiv11); // add duration btn on top drawer list
 +		
-+		var newDiv11 = document.createElement('div');
-+		var newDiv12 = document.createElement('div');
-+		var newDiv13 = document.createElement('div');
-+		var newDiv14 = document.createElement('div');
++		newDiv11 = document.createElement('div');
++		newDiv12 = document.createElement('div');
++		newDiv13 = document.createElement('div');
++		newDiv14 = document.createElement('div');
 +		newDiv11.setAttribute('class', "palm-row");
 +		newDiv12.setAttribute('class', "palm-row-wrapper");
 +		newDiv13.setAttribute('x-mojo-element', "ToggleButton");
@@ -7899,10 +7661,10 @@ index bb28b12..22621f2 100644
 +		newDiv11.appendChild(newDiv12);
 +		dList.appendChild(newDiv11); // add blink to drawer list
 +		
-+		var newDiv11 = document.createElement('div');
-+		var newDiv12 = document.createElement('div');
-+		var newDiv13 = document.createElement('div');
-+		var newDiv14 = document.createElement('div');
++		newDiv11 = document.createElement('div');
++		newDiv12 = document.createElement('div');
++		newDiv13 = document.createElement('div');
++		newDiv14 = document.createElement('div');
 +		newDiv11.setAttribute('class', "palm-row");
 +		newDiv12.setAttribute('class', "palm-row-wrapper");
 +		newDiv13.setAttribute('x-mojo-element', "ToggleButton");
@@ -7915,10 +7677,10 @@ index bb28b12..22621f2 100644
 +		newDiv11.appendChild(newDiv12);
 +		dList.appendChild(newDiv11); // add ucgroupsfirst to drawer list
 +		
-+		var newDiv11 = document.createElement('div');
-+		var newDiv12 = document.createElement('div');
-+		var newDiv13 = document.createElement('div');
-+		var newDiv14 = document.createElement('div');
++		newDiv11 = document.createElement('div');
++		newDiv12 = document.createElement('div');
++		newDiv13 = document.createElement('div');
++		newDiv14 = document.createElement('div');
 +		newDiv11.setAttribute('class', "palm-row");
 +		newDiv12.setAttribute('class', "palm-row-wrapper");
 +		newDiv13.setAttribute('x-mojo-element', "ToggleButton");
@@ -7931,10 +7693,10 @@ index bb28b12..22621f2 100644
 +		newDiv11.appendChild(newDiv12);
 +		dList.appendChild(newDiv11); // add Per Cal Alarms to drawer list
 +		
-+		var newDiv11 = document.createElement('div');
-+		var newDiv12 = document.createElement('div');
-+		var newDiv13 = document.createElement('div');
-+		var newDiv14 = document.createElement('div');
++		newDiv11 = document.createElement('div');
++		newDiv12 = document.createElement('div');
++		newDiv13 = document.createElement('div');
++		newDiv14 = document.createElement('div');
 +		newDiv11.setAttribute('class', "palm-row");
 +		newDiv12.setAttribute('class', "palm-row-wrapper");
 +		newDiv13.setAttribute('x-mojo-element', "ToggleButton");
@@ -7947,10 +7709,10 @@ index bb28b12..22621f2 100644
 +		newDiv11.appendChild(newDiv12);
 +		dList.appendChild(newDiv11); // add alarmsFollowGroups to drawer list
 +		
-+		var newDiv11 = document.createElement('div');
-+		var newDiv12 = document.createElement('div');
-+		var newDiv13 = document.createElement('div');
-+		var newDiv14 = document.createElement('div');
++		newDiv11 = document.createElement('div');
++		newDiv12 = document.createElement('div');
++		newDiv13 = document.createElement('div');
++		newDiv14 = document.createElement('div');
 +		newDiv11.setAttribute('class', "palm-row");
 +		newDiv12.setAttribute('class', "palm-row-wrapper");
 +		newDiv13.setAttribute('x-mojo-element', "ToggleButton");
@@ -7963,10 +7725,10 @@ index bb28b12..22621f2 100644
 +		newDiv11.appendChild(newDiv12);
 +		dList.appendChild(newDiv11); // add bridge call dialer to drawer list
 +		
-+		var newDiv11 = document.createElement('div');
-+		var newDiv12 = document.createElement('div');
-+		var newDiv13 = document.createElement('div');
-+		var newDiv14 = document.createElement('div');
++		newDiv11 = document.createElement('div');
++		newDiv12 = document.createElement('div');
++		newDiv13 = document.createElement('div');
++		newDiv14 = document.createElement('div');
 +		newDiv11.setAttribute('class', "palm-row last");
 +		newDiv12.setAttribute('class', "palm-row-wrapper");
 +		newDiv13.setAttribute('x-mojo-element', "ToggleButton");
@@ -7984,36 +7746,7 @@ index bb28b12..22621f2 100644
 +		newGroup1.appendChild(newList1);
 +		
 +		this.controller.get('pv_alarmsound_div').parentNode.insertBefore(newGroup1, this.controller.get('pv_accounts_div')); //add first list to prefs
-+		var newGroup3 = document.createElement('div');
-+		var newGroup4 = document.createElement('div');
-+		newGroup3.setAttribute('class', 'palm-group');
-+		newGroup3.setAttribute('id', 'uber-cal-advreq-grp');
-+		newGroup4.setAttribute('class', 'palm-group-title');
-+		newGroup4.setAttribute('x-mojo-loc', '""');
-+		newGroup4.innerHTML = $L('Advanced Sync Requirements');
-+		newGroup3.appendChild(newGroup4);
-+		
-+		var d6List = document.createElement('div');  // container for cat level drawer
-+		d6List.setAttribute('id', "uber-cal-advreq-container");
-+		d6List.setAttribute('class', "palm-list");
-+		d6List.innerHTML = '<div id="uber-cal-advreq-disabled" class="title" x-mojo-loc="">' + $L("Tweaks Not Enabled") +'</div><div id="uber-cal-advreqList" x-mojo-element="IndexedList" > </div>';
-+		newGroup3.appendChild(d6List);
-+		
-+		this.controller.get('pv_accounts_div').appendChild(newGroup3);
-+		
-+		newDiv11 = document.createElement('div');
-+		newDiv11.setAttribute('class', "palm-button");
-+		newDiv11.setAttribute('id', "uber-cal-advreq-setsyncbtn");
-+		newDiv11.setAttribute('x-mojo-tap-highlight', "momentary");
-+		newDiv11.setAttribute('x-mojo-loc', "");
-+		newDiv11.innerHTML = $L("Set sync requirements");
-+		this.controller.get('pv_accounts_div').appendChild(newDiv11);
-+		
-+		this.advReqAcctListItems = [];
-+		this.advReqAcctListModel = {listTitle: $L("Advanced Requirements"), items:this.advReqAcctListItems};
-+		this.controller.setupWidget('uber-cal-advreqList', 
-+									this.uberAdvReqAttrs = {itemTemplate: 'shared/ubercaladvreqitem'},
-+									this.advReqAcctListModel);
++
 +		this.uberCalendarPrefs = {
 +			showsnoozedforbanner: { id: "ShowSnoozedForBanner", value: this.showSnoozedForBanner },
 +			showreminderdashboard: { id: "ShowReminderDashboard", value: this.showReminderDashboard },
@@ -8308,15 +8041,7 @@ index bb28b12..22621f2 100644
  		this.requests	= [];
  		this.syncSources= [];
  		this.dirty		= false;
- 		
-+		//adv req section
-+		this.advReqsChangeHandler = this.handleAdvReqsChange.bindAsEventListener(this);
-+		this.userChangedAdvReqs = false;
-+		
- 		//Mojo.Log.info("prefs-assistant: setup");
- 		//Mojo.Log.info("prefs :%j" ,this.prefs);
- 		this.calendarsManager.observeCalendars ("prefs", this);
-@@ -392,6 +1978,7 @@ var PrefsAssistant	= Class.create({
+@@ -392,6 +1678,7 @@ var PrefsAssistant	= Class.create({
  	},
  	
  	activate: function() {
@@ -8324,7 +8049,7 @@ index bb28b12..22621f2 100644
  		//Mojo.Log.info('prefs-assistant: activate');
  		this.prefsManager.validateDefaultCalPref();
  		
-@@ -423,17 +2010,204 @@ var PrefsAssistant	= Class.create({
+@@ -423,17 +1710,195 @@ var PrefsAssistant	= Class.create({
  		
  		this.chooseNotificationRingtone = this.chooseNotificationRingtone.bindAsEventListener(this);
  		this.controller.listen('currentringtonerow',Mojo.Event.tap, this.chooseNotificationRingtone);		
@@ -8395,16 +8120,7 @@ index bb28b12..22621f2 100644
 +		this.controller.listen(this.uberCatList, Mojo.Event.listChange, this.uberCatListChangeHandler);
 +		this.controller.listen(this.uberCatList, Mojo.Event.listAdd, this.uberCatListAddHandler);
 +		this.controller.listen(this.uberCatList, Mojo.Event.listDelete, this.uberCatListDeleteHandler);
-+		this.controller.listen(this.uberCatList, Mojo.Event.listReorder, this.uberCatListReorderHandler);	
-+		this.controller.listen('uber-cal-advreqList' , Mojo.Event.propertyChange, this.advReqsChangeHandler);
-+		if(this.advancedSyncEnabled && this.advReqAcctListItems && this.advReqAcctListItems.length){
-+			var len = this.advReqAcctListItems.length;
-+			for(var i=0;i<len;i++){
-+				this.controller.get(i+"uber-cal-advreq-btn").observe('mojo-tap', this.ucDrawerBtnHandler);
-+				this.controller.get(i+"uber-cal-advreq-timebtn").observe('mojo-tap', this.ucDrawerBtnHandler);
-+			}
-+			this.controller.get("uber-cal-advreq-setsyncbtn").observe('mojo-tap', this.ucDrawerBtnHandler);
-+		}
++		this.controller.listen(this.uberCatList, Mojo.Event.listReorder, this.uberCatListReorderHandler);
 +		this.keyUpHandler = this.handleKeyUp.bind(this);
 +		this.controller.listen(this.controller.sceneElement, Mojo.Event.keyup, this.keyUpHandler);
 +		this.keyDownHandler = this.handleKeyDown.bind(this);
@@ -8529,7 +8245,7 @@ index bb28b12..22621f2 100644
  		//Mojo.Log.info('prefs-assistant: deactivate');
  		this.controller.get('pv_start_of_week').stopObserving('mojo-tap', this.startOfWeekClickHandler);
  		
-@@ -456,6 +2230,68 @@ var PrefsAssistant	= Class.create({
+@@ -456,6 +1921,60 @@ var PrefsAssistant	= Class.create({
  		
  		this.controller.stopListening('currentringtonerow',Mojo.Event.tap, this.chooseNotificationRingtone);		
  
@@ -8580,25 +8296,17 @@ index bb28b12..22621f2 100644
 +		this.controller.get('monthuberCprefsbutton').stopObserving('mojo-tap', this.ucDrawerBtnHandler);
 +		this.controller.get('weekuberCprefsbutton').stopObserving('mojo-tap', this.ucDrawerBtnHandler);
 +		this.controller.get('catuberCprefsbutton').stopObserving('mojo-tap', this.ucDrawerBtnHandler);
-+		if(this.advancedSyncEnabled){
-+			this.controller.get('uber-cal-advreq-setsyncbtn').stopObserving('mojo-tap', this.ucDrawerBtnHandler);
-+			for(var i=0;i<this.advReqAcctListItems.length;i++){
-+				this.controller.get(i+"uber-cal-advreq-btn").stopObserving('mojo-tap', this.ucDrawerBtnHandler);
-+				this.controller.get(i+"uber-cal-advreq-timebtn").stopObserving('mojo-tap', this.ucDrawerBtnHandler);
-+			}
-+		}
 +		this.controller.stopListening(this.uberCatList, Mojo.Event.listChange, this.uberCatListChangeHandler);
 +		this.controller.stopListening(this.uberCatList, Mojo.Event.listAdd, this.uberCatListAddHandler);
 +		this.controller.stopListening(this.uberCatList, Mojo.Event.listDelete, this.uberCatListDeleteHandler);
 +		this.controller.stopListening(this.uberCatList, Mojo.Event.listReorder, this.uberCatListReorderHandler);
-+		this.controller.stopListening('uber-cal-advreqList' , Mojo.Event.propertyChange, this.advReqsChangeHandler);
 +		
 +		this.controller.stopListening(this.controller.sceneElement, Mojo.Event.keyup, this.keyUpHandler);
 +		this.controller.stopListening(this.controller.sceneElement, Mojo.Event.keydown, this.keyDownHandler);
  	},
  	
  	// *** EVENT HANDLERS ***
-@@ -492,13 +2328,309 @@ var PrefsAssistant	= Class.create({
+@@ -492,13 +2011,253 @@ var PrefsAssistant	= Class.create({
  		}
  	},
  
@@ -8773,13 +8481,12 @@ index bb28b12..22621f2 100644
 +				]
 +			});
 +			return;
-+		} else {
-+			var newItem = {name:"newcategory"};
-+			this.uberCatModel.items.push(newItem);
-+			var catLength = this.uberCatModel.items.length;
-+			this.uberCatList.mojo.noticeAddedItems(catLength, [newItem]);
-+			this.uberCatList.mojo.focusItem(this.uberCatModel.items[catLength-1]);
 +		}
++		var newItem = {name:"newcategory"};
++		this.uberCatModel.items.push(newItem);
++		var catLength = this.uberCatModel.items.length;
++		this.uberCatList.mojo.noticeAddedItems(catLength, [newItem]);
++		this.uberCatList.mojo.focusItem(this.uberCatModel.items[catLength-1]);
 +	},
 +	
 +	handleUberCatListDelete: function(event) {
@@ -8810,62 +8517,7 @@ index bb28b12..22621f2 100644
 +			}
 +		}
 +	},
-+	
-+	handleAdvReqsChange: function(event){
-+		//console.error("handle adv req change:2472 model: " + JSON.stringify((event && event.model)))
-+		if(event.model !== undefined && event.target.id !== undefined && event.model._id !== undefined) {
-+			//var model = event.model;
-+			var Id = event.model.Id;
-+			var _id = event.model._id;
-+			var targetId = event.target.id;
-+			var patt=/uber-cal-advreq-([a-z]+)\d+/g;
-+			var typ, result = patt.exec(targetId);
-+			var idx, map = ["onoff", "contacts","wifi","cell","batt","interval","charging", "docked", "allday", "starttime", "endtime"];
-+			if(result && result[1]){
-+				typ = result[1];
-+				idx = map.indexOf(typ);
-+				if(typ === "interval"){
-+					var val = event.model.interval;
-+					if(val !== undefined){
-+						var needUpdate = false;
-+						//console.error("why here val: " +val + ", disabled: " + event.model.allDayDisabled+ ", openStartEnd: " + event.model.openStartEnd);
-+						if(val.indexOf("m") !== -1 || (val.indexOf("h") !== -1 && parseInt(val,10) <= 6)){
-+							//console.error("is minutes: " + val + ", disabled: " + event.model.allDayDisabled );
-+							this.advReqAcctListItems[Id].allDayDisabled = false;
-+							//this.advReqAcctListItems[Id].allday = !(event.model.allday);
-+							this.advReqAcctListItems[Id].openStartEnd = !this.advReqAcctListItems[Id].allday;
-+							//this.controller.get('uber-cal-timedrawer'+Id).mojo.setOpenState(!this.advReqAcctListItems[Id].allday);
-+							this.controller.get('uber-cal-advreq-drawer'+Id).mojo.setOpenState(true);
-+							needUpdate = true;
-+						} else {
-+							//set old values
-+							//console.error("not minutes val: " + val + ", disabled: " + event.model.allDayDisabled );
-+							this.advReqAcctListItems[Id].allday = true;
-+							this.advReqAcctListItems[Id].allDayDisabled = true;
-+							//this.advReqAcctListItems[Id].openStartEnd = false;
-+							//this.advReqAcctListItems[Id].bigOpen = true;
-+							this.controller.get('uber-cal-advreq-drawer'+Id).mojo.setOpenState(true);
-+							//this.controller.get(('uber-cal-timedrawer'+Id)).mojo.setOpenState(false);
-+							needUpdate = true;
-+						}
-+						if(needUpdate === true){
-+							this.controller.get('uber-cal-advreqList').mojo.noticeUpdatedItems(0, this.advReqAcctListModel.items);
-+							for(var i=0;i<this.advReqAcctListItems.length;i++){
-+								this.controller.get(i+"uber-cal-advreq-btn").observe('mojo-tap', this.ucDrawerBtnHandler);
-+								this.controller.get(i+"uber-cal-advreq-timebtn").observe('mojo-tap', this.ucDrawerBtnHandler);
-+							}
-+						}
-+					}
-+				} else if(typ === "allday"){
-+					this.advReqAcctListItems[Id].openStartEnd = !(event.model.allday);
-+					this.controller.get('uber-cal-timedrawer'+Id).mojo.setOpenState(!(event.model.allday));
-+				}
-+				this.userChangedAdvReqs = true;
-+				//console.error("handle adv req change:2487 model: " + JSON.stringify(this.advReqAcctListItems[Id]))
-+			}
-+		}
-+	},
-+	
++
 +	uberClearCookies: function() {
 +		// clear cookies
 +		//Event.stop(event);
@@ -8888,13 +8540,13 @@ index bb28b12..22621f2 100644
 +		if(this.notificationCookie) { this.notificationCookie.remove(); }
 +		this.notificationCookie = new Mojo.Model.Cookie("notificationCookie");
 +		var cookie = new Mojo.Model.Cookie("BackGesture");
-+		if(cookie) {cookie.remove()};
-+		var cookie = new Mojo.Model.Cookie("ucGroupsCookie");
-+		if(cookie) {cookie.remove()};
-+		var cookie = new Mojo.Model.Cookie("uberGrpsCookie");
-+		if(cookie) {cookie.remove()};
-+		var cookie = new Mojo.Model.Cookie("origExCookie");
-+		if(cookie) {cookie.remove()};
++		if(cookie) {cookie.remove();}
++		cookie = new Mojo.Model.Cookie("ucGroupsCookie");
++		if(cookie) {cookie.remove();}
++		cookie = new Mojo.Model.Cookie("uberGrpsCookie");
++		if(cookie) {cookie.remove();}
++		cookie = new Mojo.Model.Cookie("origExCookie");
++		if(cookie) {cookie.remove();}
 +	},
 +
 +
@@ -8909,7 +8561,7 @@ index bb28b12..22621f2 100644
  			this.renderStartOfWeek();
  			this.dirty = true;
  		}
-@@ -558,8 +2690,23 @@ var PrefsAssistant	= Class.create({
+@@ -558,8 +2317,23 @@ var PrefsAssistant	= Class.create({
  					label: ONE_HOUR,
  					command: 60
  				}, {
@@ -8933,7 +8585,58 @@ index bb28b12..22621f2 100644
  				}]
  			});
  	},
-@@ -639,6 +2786,82 @@ var PrefsAssistant	= Class.create({
+@@ -606,10 +2380,49 @@ var PrefsAssistant	= Class.create({
+
+ 	handleAccountsListTap: function(account, template){
+ 		var capabilityProvider = this.getCalendarCapabilityProvider(account);
+-		var accountSettingsUI;
++		var accountSettingsUI, scene = this.controller;
+
+ 		if(capabilityProvider && capabilityProvider.id === "com.palm.palmprofile.calendar"){
+ 			//do nothing
++		} else if(template && template.config && template.config.oauth2_config && capabilityProvider && capabilityProvider.config && capabilityProvider.config.auth_type === "oauth2"){
++			var msg, param = {};
++			msg = capabilityProvider.capability + " requires Oauth2 credentials";
++			_.extend(param, template.config.oauth2_config);
++			param.template = template;
++			param.account = account;
++			param.launchOauth2 = true;
++			function choiceMade(val){
++				if(parseInt(val,10) === 0){
++					if(scene){
++						scene.serviceRequest("palm://com.palm.applicationManager", {
++							  method:"launch",
++							  parameters:{
++									 id:'com.palm.app.accounts', params: param
++							  }
++							});
++					} else {
++						console.error("failed to launch account app");
++					}
++					return;
++				}
++				scene.stageController.pushScene("accountlogin", {
++					account: account,
++					template: template
++				});
++				return;
++			}
++			scene.showAlertDialog({
++					title: "Oauth2 Authentication",
++					message: msg,
++					choices: [{label:"Configure Oauth2", value: 0}, {label: "Skip", value: 1}],
++					onChoose: function(value) {
++						if(value !== undefined && value !== "" && value != -1) {
++							choiceMade(value);
++							console.error("In dialog choice was ::::: " + value);
++						}
++						return;
++					}
++				});
+ 		}
+ 		//If a transport has a custom account login screen, use that
+ 		else if (capabilityProvider && capabilityProvider.settingsUI) {
+@@ -639,6 +2452,26 @@ var PrefsAssistant	= Class.create({
  		});
  	},
  	
@@ -8954,69 +8657,13 @@ index bb28b12..22621f2 100644
 +			this.controller.get('weekuberCaldrawer').mojo.setOpenState(!this.controller.get('weekuberCaldrawer').mojo.getOpenState());
 +		} else if(curBtn == "catuberCprefsbutton") {
 +			this.controller.get('catuberCaldrawer').mojo.setOpenState(!this.controller.get('catuberCaldrawer').mojo.getOpenState());
-+		} else if(curBtn == "uber-cal-advreq-setsyncbtn") {
-+			this.saveAdvReq();
-+		} else if(curBtn.indexOf("uber-cal-advreq-btn") !== -1) {
-+			var idx = parseInt(curBtn, 10);
-+			var val = this.controller.get('uber-cal-advreq-drawer'+idx).mojo.getOpenState();
-+			this.advReqAcctListItems[idx].bigOpen = !val;
-+			this.controller.get('uber-cal-advreq-drawer'+idx).mojo.setOpenState(!val);
-+		} else if(curBtn.indexOf("uber-cal-advreq-timebtn") !== -1) {
-+			var idx = parseInt(curBtn, 10);
-+			var val = this.controller.get('uber-cal-timedrawer'+idx).mojo.getOpenState();
-+			this.advReqAcctListItems[idx].openStartEnd = !val;
-+			this.controller.get('uber-cal-timedrawer'+idx).mojo.setOpenState(!val);
-+		}
-+	},
-+	
-+	saveAdvReq: function(){
-+		if(this.advancedSyncEnabled){
-+			var hrs, mins, acct = {}, acctId, tempList = [], obj = {}, len, _id;
-+			var map = ["onoff", "contacts","wifi","cell","batt","interval","charging","docked", "allday", "starttime", "endtime"];
-+			
-+			len = this.advReqAcctListItems.length;
-+			for(var i=0;i<len;i++){
-+				acct = this.advReqAcctListItems[i];
-+				_id = acct._id;
-+				for(var j=0;j<map.length;j++){
-+					if(j === 9 || j === 10){
-+						hrs = (acct[map[j]]).getHours();
-+						mins = (acct[map[j]]).getMinutes();
-+						tempList[j] = Date.UTC(2000, 0, 1, hrs, mins, 0, 0);
-+					} else {
-+						tempList[j] = acct[map[j]];
-+					}
-+				}
-+				obj[_id] = tempList.slice(0);
-+			}
-+			if(obj){
-+				var objJson = JSON.stringify(obj);
-+				console.error("prefs saving tweaks: " + objJson)
-+				this.controller.serviceRequest("palm://org.webosinternals.tweaks.prefs/", {
-+						method: "set", 
-+						parameters: { owner: "google-first-sync", 
-+									"syncStringField": objJson},
-+						onSuccess: this.setAdvReq.bind(this),
-+						onFailure: function(response){console.error("prefs saved tweaks failed : " + JSON.stringify(response ) );}
-+				});
-+			}
 +		}
 +	},
-+	
-+	setAdvReq: function(result){
-+		console.error("prefs saved tweaks result: " + JSON.stringify(result) );
-+		this.controller.serviceRequest("palm://com.palm.connectionmanager", {
-+						method: "getStatus", 
-+						parameters: { },
-+						onSuccess: function(response){console.error("prefs saved tweaks success : " + JSON.stringify(response ) );},
-+						onFailure: function(response){console.error("prefs saved tweaks failed : " + JSON.stringify(response ) );}
-+		});
-+	},
 +
  	// *** WIDGET ATTRS & MODELS
  
  	
-@@ -651,22 +2874,338 @@ var PrefsAssistant	= Class.create({
+@@ -651,22 +2484,320 @@ var PrefsAssistant	= Class.create({
  		listTitle: $L('Accounts'),
  		items: []
  	},
@@ -9068,14 +8715,14 @@ index bb28b12..22621f2 100644
 +		{label:$L('10'), value:10},
 +		{label:$L('15'), value:15},
 +		{label:$L('20'), value:20},
-+		{label:$L('30'), value:30},
++		{label:$L('30'), value:30}
 +	],
 +	
 +	uberDayMinIntervals: [
 +		{label:$L('10'), value:10},
 +		{label:$L('15'), value:15},
 +		{label:$L('20'), value:20},
-+		{label:$L('30'), value:30},
++		{label:$L('30'), value:30}
 +	],
 +	
 +	uberShrinkDayOptions: [
@@ -9109,24 +8756,6 @@ index bb28b12..22621f2 100644
 +		{label:$L('Week'), value:'week'},
 +		{label:$L('Month'), value:'month'}
 +	],
-+	advReqIntOptions: [
-+		{label:$L('5 Minutes'), value:'5m'},
-+		{label:$L('10 Minutes'), value:'10m'},
-+		{label:$L('15 Minutes'), value:'15m'},
-+		{label:$L('20 Minutes'), value:'20m'},
-+		{label:$L('30 Minutes'), value:'30m'},
-+		{label:$L('1 Hour'), value:'60m'},
-+		{label:$L('3 Hours'), value:'3h'},
-+		{label:$L('6 Hours'), value:'6h'},
-+		{label:$L('12 Hours'), value:'12h'},
-+		{label:$L('1 Day'), value:'24h'},
-+		{label:$L('2 Days'), value:'2d'},
-+		{label:$L('4 Days'), value:'4d'},
-+		{label:$L('6 Days'), value:'6d'},
-+		{label:$L('8 Days'), value:'8d'},
-+		{label:$L('10 Days'), value:'10d'},
-+		{label:$L('14 Days'), value:'14d'}
-+	],
 +	notificationMaxRepeats: [
 +		{label:$L('Unlimited'), value:'99999'}, //this should be a large enough value to be conisdered unlimited for our purpose.
 +		{label:$L('1'), value:'1'},
@@ -9347,7 +8976,7 @@ index bb28b12..22621f2 100644
 +		{name: 'kids'},
 +		{name: 'party'},
 +		{name: 'plane'},
-+		{name: 'vacation'},
++		{name: 'vacation'}
 +	],
 +	
 +	uberAlarmDuration: [
@@ -10208,7 +9837,7 @@ index 65ecc4e..5252c8c 100644
 +					method: 'open',
 +					parameters: {
 +						id: "de.metaviewsoft.mwatch",
-+						params: {command: "SMS", icon: "CAL", info: data.subject + "\n" + data.time +" / " + data.location}
++						params: {command: "SMS", icon: "CAL", "appid": "com.palm.app.calendar", info: data.subject + "\n" + data.time +" / " + data.location}
 +					 },
 +					onSuccess: function() {},
 +					onFailure: function() {}		
@@ -12159,7 +11788,7 @@ index 4fa6e78..6a62916 100644
  				display: 'block'
  			});
  		} else {
-@@ -285,8 +567,19 @@ var WeekAssistant = Class.create({
+@@ -285,15 +567,26 @@ var WeekAssistant = Class.create({
  		//Mojo.Log.info("week-assistant: currentCalendarUpdated");
  		var calMgr	= this.calendarsManager
  		,	calendar= calMgr.getCurrentCal();
@@ -12181,6 +11810,14 @@ index 4fa6e78..6a62916 100644
  			this.controller.get ("wv_current_calendar")	.update			($L("All"));
  			this.controller.get ("wv_calendar_source")	.setAttribute	("class", "header-cal-source");
  			return;
+ 		}
+
+ 		if ("Local" == calMgr.getCalSyncSource (calendar)) {
+-			// Special case the local calendar to always show Palm since Palm Profile always
++			// Special case the local calendar to always show Palm since HP webOS Account always
+ 			// gets truncated and looks ugly
+ 			this.controller.get ("wv_current_calendar").update ($L("Palm"));
+ 		} else {
 @@ -403,10 +696,18 @@ var WeekAssistant = Class.create({
  		};
  
@@ -12310,7 +11947,7 @@ index 4fa6e78..6a62916 100644
  		var ctx = this.weeks[whichWeek].ctxEvents;
  		var marginLeft = 4;
  		var marginRight = 4;
-@@ -564,6 +911,84 @@ var WeekAssistant = Class.create({
+@@ -564,6 +911,94 @@ var WeekAssistant = Class.create({
  		
  		ctx.fillStyle = "rgba(255, 255, 255, 0.10)";
  		ctx.fillRect(left+1, top+height-3, width-2, 1);
@@ -12374,7 +12011,17 @@ index 4fa6e78..6a62916 100644
 +				}
 +			}
 +			// Alarm
-+			if (event.alarm  && event.alarm[0] &&  event.alarm[0].alarmTrigger && event.alarm[0].alarmTrigger.valueType && event.alarm[0].alarmTrigger.valueType === "DURATION" && event.alarm[0].alarmTrigger.value && event.alarm[0].alarmTrigger.value !== "" && event.alarm[0].alarmTrigger.value !== "none" && this.weekViewIcons) {
++			var testA, xx = false, AA, ZZ = event.alarm;
++			if(ZZ){
++				for(AA=0;AA<ZZ.length;AA++){
++					testA = ZZ[AA];
++					if(testA &&  testA.alarmTrigger && testA.action === "display" && testA.alarmTrigger.valueType && testA.alarmTrigger.valueType === "DURATION" && testA.alarmTrigger.value && testA.alarmTrigger.value !== "" && testA.alarmTrigger.value !== "none"){
++						xx = true;
++						break;
++					}
++				}
++			}
++			if (xx && this.weekViewIcons) {
 +				try{ ctx.drawImage(this.imgAlarm, left+1, top+2, 12, 12); }catch (e) {}
 +			}
 +			// Icon
@@ -12395,7 +12042,7 @@ index 4fa6e78..6a62916 100644
  	},
  	
  	renderBusyTime: function(whichWeek, whichDay, busy) {
-@@ -584,12 +1009,79 @@ var WeekAssistant = Class.create({
+@@ -584,12 +1019,89 @@ var WeekAssistant = Class.create({
  	renderAllDayEvent: function(whichWeek, whichDay, row, allday) {
  		var ctx = this.weeks[whichWeek].ctxAllDay;
  		var marginLeft = 4;
@@ -12452,7 +12099,17 @@ index 4fa6e78..6a62916 100644
 +				}
 +			}
 +			// Alarm
-+			if (allday.alarm  && allday.alarm[0] &&  allday.alarm[0].alarmTrigger && allday.alarm[0].alarmTrigger.valueType && allday.alarm[0].alarmTrigger.valueType === "DURATION" && allday.alarm[0].alarmTrigger.value && allday.alarm[0].alarmTrigger.value !== "" && allday.alarm[0].alarmTrigger.value !== "none" && this.weekViewIcons) {
++			var testA, xx = false, AA, ZZ = allday.alarm;
++			if(ZZ){
++				for(AA=0;AA<ZZ.length;AA++){
++					testA = ZZ[AA];
++					if(testA &&  testA.alarmTrigger && testA.action === "display" && testA.alarmTrigger.valueType && testA.alarmTrigger.valueType === "DURATION" && testA.alarmTrigger.value && testA.alarmTrigger.value !== "" && testA.alarmTrigger.value !== "none"){
++						xx = true;
++						break;
++					}
++				}
++			}
++			if (xx && this.weekViewIcons) {
 +				try{ ctx.drawImage(this.imgAlarm, left+eventMaxWidth-4, top+2, 10, 10); }catch (e) {}
 +			}
 +			// Icon
@@ -12477,7 +12134,7 @@ index 4fa6e78..6a62916 100644
  	},
  
  
-@@ -598,10 +1090,14 @@ var WeekAssistant = Class.create({
+@@ -598,10 +1110,14 @@ var WeekAssistant = Class.create({
  		var ctx;
  		var ctxAllDay;
  		this.renderEmptyWeek(whichWeek);
@@ -12494,7 +12151,7 @@ index 4fa6e78..6a62916 100644
  		// Erase any existing all day events and any selection highlighting
  		if (this.weeks[whichWeek].alldayHeight) {
  			ctx = this.weeks[whichWeek].ctxAllDay;
-@@ -621,53 +1117,76 @@ var WeekAssistant = Class.create({
+@@ -621,53 +1137,76 @@ var WeekAssistant = Class.create({
  		    ctxAllDay.fillRect(this.COL_POS[this.selectedCol], 0, this.COL_WIDTH[this.selectedCol], this.weeks[whichWeek].alldayHeight);
  		}	
  
@@ -12586,7 +12243,7 @@ index 4fa6e78..6a62916 100644
  		this.renderStartEndDayLabels(whichWeek);
  	},
  	
-@@ -682,8 +1201,9 @@ var WeekAssistant = Class.create({
+@@ -682,8 +1221,9 @@ var WeekAssistant = Class.create({
  
  		var i;
  		this.clearCache();
@@ -12597,7 +12254,7 @@ index 4fa6e78..6a62916 100644
  
  		this.reminders.observeReminders	("week", this);
  		this.app.observeCurrentDateTime	("week", this);
-@@ -706,6 +1226,61 @@ var WeekAssistant = Class.create({
+@@ -706,6 +1246,61 @@ var WeekAssistant = Class.create({
  		this.scrollMakerPos	= this.controller.get ("wv_scroll_marker");
  		this.scrollDataDiv	= this.controller.get ("wv_scroll_data");
  		
@@ -12659,7 +12316,7 @@ index 4fa6e78..6a62916 100644
  		this.weeks = [];
  		this.weeks[this.PREV_WEEK] = {};
  		this.weeks[this.THIS_WEEK] = {};
-@@ -721,9 +1296,20 @@ var WeekAssistant = Class.create({
+@@ -721,9 +1316,20 @@ var WeekAssistant = Class.create({
  		this.weeks[this.THIS_WEEK].ctxEvents.font = "14px Prelude Bold";
  		this.weeks[this.NEXT_WEEK].ctxEvents.font = "14px Prelude Bold";
  		
@@ -12681,7 +12338,7 @@ index 4fa6e78..6a62916 100644
  			this.eventHandler.addHandler(this.COL_POS[i], 
  										 0, 
  										 this.COL_POS[i] + this.COL_WIDTH[i],
-@@ -746,7 +1332,7 @@ var WeekAssistant = Class.create({
+@@ -746,7 +1352,7 @@ var WeekAssistant = Class.create({
  		this.weeks[this.THIS_WEEK].ctxAllDay = this.weeks[this.THIS_WEEK].all_day_events.getContext('2d');
  		this.weeks[this.NEXT_WEEK].ctxAllDay = this.weeks[this.NEXT_WEEK].all_day_events.getContext('2d');
  		this.allDayEventHandler = new TapHandler(this.weeks[this.THIS_WEEK].all_day_events);
@@ -12690,7 +12347,7 @@ index 4fa6e78..6a62916 100644
  			this.allDayEventHandler.addHandler(this.COL_POS[i], 
  													0, 
  													this.COL_POS[i] + this.COL_WIDTH[i],
-@@ -770,7 +1356,12 @@ var WeekAssistant = Class.create({
+@@ -770,7 +1376,12 @@ var WeekAssistant = Class.create({
  		this.controller.setupWidget ("wv_scroll_events"		, {}							, this.vertScrollerModel);	
  
  //		this.sceneWidth = this.controller.get('wv_scroll_container').getDimensions().width;
@@ -12704,7 +12361,7 @@ index 4fa6e78..6a62916 100644
  		
  		this.buildViewHeader();
  		this.title = this.controller.get('wv_title');
-@@ -797,16 +1388,17 @@ var WeekAssistant = Class.create({
+@@ -797,16 +1408,17 @@ var WeekAssistant = Class.create({
  		this.menuModel =
  		{	visible	:	true
  		,	items	:
@@ -12725,7 +12382,7 @@ index 4fa6e78..6a62916 100644
  			]
  		};
  
-@@ -816,10 +1408,47 @@ var WeekAssistant = Class.create({
+@@ -816,10 +1428,47 @@ var WeekAssistant = Class.create({
  		this.remindersUpdated(); // Update missed reminders menu item
  
  		this.isScrolling = false;
@@ -12774,7 +12431,7 @@ index 4fa6e78..6a62916 100644
  	}
  
  ,	syncAllCalendars: function() {
-@@ -840,6 +1469,12 @@ var WeekAssistant = Class.create({
+@@ -840,6 +1489,12 @@ var WeekAssistant = Class.create({
  			} else if (event.command == Mojo.Menu.prefsCmd) {
  				Mojo.Event.stop (event);
  				this.controller.stageController.pushScene('prefs');
@@ -12787,7 +12444,7 @@ index 4fa6e78..6a62916 100644
  			} else if(event.command == Mojo.Menu.helpCmd){
  				this.app.getAppManagerService().launchHelp (this.controller);
  			} else if (event.command == 'sync') {
-@@ -855,11 +1490,50 @@ var WeekAssistant = Class.create({
+@@ -855,11 +1510,50 @@ var WeekAssistant = Class.create({
  			} else if (event.command == 'reminders') {
  				Mojo.Event.stop (event);
  				this.controller.stageController.pushScene('reminder-list');
@@ -12838,7 +12495,7 @@ index 4fa6e78..6a62916 100644
  		}
  	}
  
-@@ -916,7 +1590,19 @@ var WeekAssistant = Class.create({
+@@ -916,7 +1610,19 @@ var WeekAssistant = Class.create({
  
  ,	scrollToDefault: function(animate) {
  		if (this.scroller) {
@@ -12859,7 +12516,7 @@ index 4fa6e78..6a62916 100644
  		}
  	},
  
-@@ -1019,8 +1705,54 @@ var WeekAssistant = Class.create({
+@@ -1019,8 +1725,54 @@ var WeekAssistant = Class.create({
  	
  	activate: function() {
  		this.active = true;
@@ -12914,7 +12571,7 @@ index 4fa6e78..6a62916 100644
  
  		// Tap JumpTo:
  		this.controller.get('wv_view_header').observe(Mojo.Event.tap, this.showJumpTo);
-@@ -1049,10 +1781,29 @@ var WeekAssistant = Class.create({
+@@ -1049,10 +1801,29 @@ var WeekAssistant = Class.create({
  
  	deactivate: function(){
  		this.active = false;
@@ -12945,7 +12602,7 @@ index 4fa6e78..6a62916 100644
  		this.controller.get ('wv_view_header')		.stopObserving (Mojo.Event.tap, this.showJumpTo);
  		this.controller.get ('wv_calendar_source')	.stopObserving (Mojo.Event.tap, this.showCalendarPicker);
  
-@@ -1063,6 +1814,446 @@ var WeekAssistant = Class.create({
+@@ -1063,6 +1834,446 @@ var WeekAssistant = Class.create({
  		this.controller.get				("wv_scroll_container").mojo.removeMovementListener	(this.onMove);
  	},
  	
@@ -13392,7 +13049,7 @@ index 4fa6e78..6a62916 100644
  	showSelectedHandler: function(col) {
  		this.selectedCol = col;
  		
-@@ -1079,7 +2270,66 @@ var WeekAssistant = Class.create({
+@@ -1079,7 +2290,66 @@ var WeekAssistant = Class.create({
  		this.renderWeek(this.THIS_WEEK, week);
  	},
  	
@@ -13459,7 +13116,7 @@ index 4fa6e78..6a62916 100644
  		var dayofweek= this.getFirstDayOfWeek (this.app.getCurrentDateTime());
  		dayofweek.addDays(col);
  			
-@@ -1110,14 +2360,46 @@ var WeekAssistant = Class.create({
+@@ -1110,14 +2380,46 @@ var WeekAssistant = Class.create({
  		Mojo.Event.stop (event);
  
  		var listItems = this.calendarsManager.buildCalendarsMenu (true /*includeAll*/, true /*includeReadOnly*/, true /*includeExcludedFromAll*/);
@@ -13508,7 +13165,7 @@ index 4fa6e78..6a62916 100644
  	    });
  	}
  
-@@ -1126,9 +2408,35 @@ var WeekAssistant = Class.create({
+@@ -1126,9 +2428,35 @@ var WeekAssistant = Class.create({
  
  		if (value == "viewOptions"){
  			this.controller.stageController.pushScene ("prefs-options");
@@ -13545,7 +13202,7 @@ index 4fa6e78..6a62916 100644
  		this.calendarsManager.setCurrentCal (value);
  		this.clearCache();
  		this.updateAll();
-@@ -1142,11 +2450,15 @@ var WeekAssistant = Class.create({
+@@ -1142,11 +2470,15 @@ var WeekAssistant = Class.create({
  
  		var firstDayOfWeek	= new Date(week);
  		var prefs			= this.prefsManager.getPrefs();
@@ -13564,7 +13221,7 @@ index 4fa6e78..6a62916 100644
  		return firstDayOfWeek;
  	},
  
-@@ -1156,20 +2468,45 @@ var WeekAssistant = Class.create({
+@@ -1156,20 +2488,45 @@ var WeekAssistant = Class.create({
  		var prefs			= this.prefsManager.getPrefs();
  		var lastDay			= 6;
  
@@ -13612,7 +13269,7 @@ index 4fa6e78..6a62916 100644
  	
  	isCacheEntrySubscribed: function(weekDate) {
  		return WeekAssistant.cacheSubscribed.get(this.keyFromDate(weekDate));
-@@ -1219,12 +2556,12 @@ var WeekAssistant = Class.create({
+@@ -1219,12 +2576,12 @@ var WeekAssistant = Class.create({
  		// TODO: Extract this and all other views' reminder handling to common component:
  		// i.e. reminder-assistant*.js, new app.menu.js
  		if (this.reminders.getNumReminders() === 0) {
@@ -14297,30 +13954,30 @@ index 0000000..d271aea
 --- /dev/null
 +++ b/usr/palm/applications/com.palm.app.calendar/app/views/prefs-options/ubercalgroupitem.html
 @@ -0,0 +1,25 @@
-+<div id="ubercalgroup#{-rId}" class="calendar-row">
-+	<div  style="height:200px; width:80%" x-mojo-element="Scroller" id="ubercalscroller#{-rId}" >
-+	<div class="palm-row-wrapper">
-+		<div class="palm-group">
-+			<div class="palm-group-title truncating-text" x-mojo-loc="">#{-groupname}</div>
-+			<div class="palm-row" id="ubercalgroupbtn#{-rId}" >
-+				<div id="ubercalgroup-text#{-rId}" x-mojo-element="TextField" style="overflow: hidden; max-height:30px;"></div>
-+			</div>
-+			<div class="palm-row-wrapper" >
-+				<div class="palm-row">
-+				<div id="uber-cal-workweek-toggle#{-rId}" x-mojo-element="ToggleButton" ></div>
-+				<div class="title" x-mojo-loc="">#{-workWeekTitle}</div>
-+				</div>
-+			</div>
-+			<div class="palm-row-wrapper" >
-+			<div class="palm-row">
-+			<div class="palm-list">
-+				<div id="ubercallist#{-rId}" class="pav-calendars-list" x-mojo-element="IndexedList"></div>
-+			</div>
-+			</div>
-+			</div>
-+		</div>
-+	</div>
-+	</div>
++<div id="ubercalgroup#{-rId}" class="calendar-row">
++	<div  style="height:200px; width:80%" x-mojo-element="Scroller" id="ubercalscroller#{-rId}" >
++	<div class="palm-row-wrapper">
++		<div class="palm-group">
++			<div class="palm-group-title truncating-text" x-mojo-loc="">#{-groupname}</div>
++			<div class="palm-row" id="ubercalgroupbtn#{-rId}" >
++				<div id="ubercalgroup-text#{-rId}" x-mojo-element="TextField" style="overflow: hidden; max-height:30px;"></div>
++			</div>
++			<div class="palm-row-wrapper" >
++				<div class="palm-row">
++				<div id="uber-cal-workweek-toggle#{-rId}" x-mojo-element="ToggleButton" ></div>
++				<div class="title" x-mojo-loc="">#{-workWeekTitle}</div>
++				</div>
++			</div>
++			<div class="palm-row-wrapper" >
++			<div class="palm-row">
++			<div class="palm-list">
++				<div id="ubercallist#{-rId}" class="pav-calendars-list" x-mojo-element="IndexedList"></div>
++			</div>
++			</div>
++			</div>
++		</div>
++	</div>
++	</div>
 +</div>
 \ No newline at end of file
 diff --git a/usr/palm/applications/com.palm.app.calendar/app/views/prefs-options/ubercalitem.html b/usr/palm/applications/com.palm.app.calendar/app/views/prefs-options/ubercalitem.html
@@ -14329,10 +13986,10 @@ index 0000000..5cf1995
 --- /dev/null
 +++ b/usr/palm/applications/com.palm.app.calendar/app/views/prefs-options/ubercalitem.html
 @@ -0,0 +1,5 @@
-+<div class="palm-row">
-+<div class="palm-row-wrapper" >
-+	<div id="uber-cal-list-toggle" x-mojo-element="ToggleButton"></div>
-+	<div class="title" x-mojo-loc="">#{-name}</div>
++<div class="palm-row">
++<div class="palm-row-wrapper" >
++	<div id="uber-cal-list-toggle" x-mojo-element="ToggleButton"></div>
++	<div class="title" x-mojo-loc="">#{-name}</div>
 +</div></div>
 \ No newline at end of file
 diff --git a/usr/palm/applications/com.palm.app.calendar/app/views/shared/uber-timezone.html b/usr/palm/applications/com.palm.app.calendar/app/views/shared/uber-timezone.html
@@ -14481,16 +14138,16 @@ index 0000000..0740083
 --- /dev/null
 +++ b/usr/palm/applications/com.palm.app.calendar/app/views/shared/ubercat-item.html
 @@ -0,0 +1,10 @@
-+<div class="palm-row-wrapper" >
-+	<div class="palm-row">
-+		<div class="textfield" >
-+			<table width="100%"><tr style="margin-top:0;">
-+			<td width="10%" style="margin-left:0px; padding:0;"> <div width="20" height="40" ><img src="#{-nameFormatted}"/></div></td>
-+			<td width="90%"><input type="text" value="#{name}" maxlength="20" style="background:transparent; margin-left:-5px; padding:0;" /> </td>
-+			</tr></table>
-+		</div>
-+	</div>
-+</div>
++<div class="palm-row-wrapper" >
++	<div class="palm-row">
++		<div class="textfield" >
++			<table width="100%"><tr style="margin-top:0;">
++			<td width="10%" style="margin-left:0px; padding:0;"> <div width="20" height="40" ><img src="#{-nameFormatted}"/></div></td>
++			<td width="90%"><input type="text" value="#{name}" maxlength="20" style="background:transparent; margin-left:-5px; padding:0;" /> </td>
++			</tr></table>
++		</div>
++	</div>
++</div>
 diff --git a/usr/palm/applications/com.palm.app.calendar/app/views/shared/ubercat-list-container.html b/usr/palm/applications/com.palm.app.calendar/app/views/shared/ubercat-list-container.html
 new file mode 100644
 index 0000000..ee75a9d
@@ -14516,16 +14173,16 @@ index 0000000..1aa3533
 --- /dev/null
 +++ b/usr/palm/applications/com.palm.app.calendar/app/views/shared/ubertemplateitem.html
 @@ -0,0 +1,10 @@
-+<div class="palm-row-wrapper"  style="padding:0; margin:2; height:43px"  x-mojo-gesture='Mojo.Gesture.HorizontalDrag'>
-+	<div class="palm-row"  style="padding:0; margin:2; height:43px" x-mojo-tap-highlight="momentary" >
-+		<div >
-+			<table width="100%" height="30px"><tr style="margin-top:0; height:30px">
-+			<td width="10%" height="30px" style="margin-left:-5px; padding:0; background-color:#{-bgcolor}"> <div  style="font:12px bold prelude;">#{-startT}</div><div  style="font:12px bold prelude;">#{-endT}</div></td>
-+			<td width="90%" height="30px"style="background:#{-catFormatted}"><div  style="font:14px bold prelude;max-width:235px; margin-left:5px; padding:0px;overflow:hidden;white-space:nowrap; text-overflow: ellipsis;">#{-subject}</div><div  style="max-width:120px;font:10px prelude; margin-left:5px; padding:0px;overflow:hidden;white-space:nowrap; text-overflow: ellipsis; float:left;">#{-location}</div><div  style="max-width:140px;font:10px prelude; margin-left:5px; padding:0px;overflow:hidden;white-space:nowrap; text-overflow: ellipsis; float:right">#{-note}</div> </td>
-+			</tr></table>
-+		</div>
-+	</div>
-+</div>
++<div class="palm-row-wrapper"  style="padding:0; margin:2; height:43px"  x-mojo-gesture='Mojo.Gesture.HorizontalDrag'>
++	<div class="palm-row"  style="padding:0; margin:2; height:43px" x-mojo-tap-highlight="momentary" >
++		<div >
++			<table width="100%" height="30px"><tr style="margin-top:0; height:30px">
++			<td width="10%" height="30px" style="margin-left:-5px; padding:0; background-color:#{-bgcolor}"> <div  style="font:12px bold prelude;">#{-startT}</div><div  style="font:12px bold prelude;">#{-endT}</div></td>
++			<td width="90%" height="30px"style="background:#{-catFormatted}"><div  style="font:14px bold prelude;max-width:235px; margin-left:5px; padding:0px;overflow:hidden;white-space:nowrap; text-overflow: ellipsis;">#{-subject}</div><div  style="max-width:120px;font:10px prelude; margin-left:5px; padding:0px;overflow:hidden;white-space:nowrap; text-overflow: ellipsis; float:left;">#{-location}</div><div  style="max-width:140px;font:10px prelude; margin-left:5px; padding:0px;overflow:hidden;white-space:nowrap; text-overflow: ellipsis; float:right">#{-note}</div> </td>
++			</tr></table>
++		</div>
++	</div>
++</div>
 diff --git a/usr/palm/applications/com.palm.app.calendar/app/views/shared/ubertemplatelistcontainer.html b/usr/palm/applications/com.palm.app.calendar/app/views/shared/ubertemplatelistcontainer.html
 new file mode 100644
 index 0000000..8e5536f
@@ -16677,15 +16334,17 @@ index e1ed3b4..481042e 100755
  //@ sourceURL=calendar/utils.js
  
  /* Copyright 2010 Palm, Inc.  All rights reserved. */
-@@ -411,6 +413,7 @@ Utils.prototype = {
+@@ -411,6 +413,9 @@ Utils.prototype = {
  		return singleton;
  	};
  
++
++
 +
  })();
  
  exports.Utils = Utils;
-@@ -565,6 +568,11 @@ var TimezoneManager = Class.create ({
+@@ -565,6 +570,11 @@ var TimezoneManager = Class.create ({
  			this.gotLocalTz = true;
  		}			
  					
@@ -16697,7 +16356,7 @@ index e1ed3b4..481042e 100755
  		tzYearPairs = this.findTzYearPairsNotInCache(tzIds, years);
  		if(tzYearPairs.length > 0){
  			future = PalmCall.call("palm://com.palm.systemservice/timezone/", "getTimeZoneRules", tzYearPairs);
-@@ -971,6 +979,68 @@ RRuleManager.prototype = {
+@@ -971,6 +981,68 @@ RRuleManager.prototype = {
  	},
  
  	/*
@@ -16766,7 +16425,7 @@ index e1ed3b4..481042e 100755
  	 * byDayTest: Sets the rulesPresent flag for byDay flag position
  	 * Tests if todayDate matches the recurrence specified by rule and sets rulesTrue.
  	 * param rule      a BYDAY rule
-@@ -985,38 +1055,49 @@ RRuleManager.prototype = {
+@@ -985,38 +1057,49 @@ RRuleManager.prototype = {
  		var negativeMonthPosition;
  		var monthPosition;
  		var ruleLength = rule.ruleValue.length;
@@ -16841,7 +16500,32 @@ index e1ed3b4..481042e 100755
  		}
  	},
  
-@@ -1694,7 +1775,7 @@ var EventManagerUtils = Class.create ({
+@@ -1102,7 +1185,7 @@ RRuleManager.prototype = {
+ 	 * returns: true if todayDate is in the exception list
+ 	 */
+ 	evaluateExceptions: function(date, exdates, eventStart, tzId) {
+-		var exdateType;
++		var exdateType, patt, res;
+ 		var exdatesLength = exdates.length;
+ 		var exdate;
+ 		var testDate = new Date(date);
+@@ -1117,7 +1200,14 @@ RRuleManager.prototype = {
+
+ 		if (exdates && exdatesLength !== 0) {
+ 			for (var i = 0; i < exdatesLength; i++) {
+-
++				patt = new RegExp("(?:[\\d]{8})(?:T[\\d]{6})?(?:Z)?");
++				res = patt.exec(exdates[i]);
++				//console.error("EXdate eval:: " + res);
++				if(!!res){
++					exdates[i] = res +"";
++				} else {
++					return false;
++				}
+ 				//Figure out the format of the exdate based on the length of the string
+ 				switch (exdates[i].length) {
+ 					//date type
+@@ -1694,7 +1784,7 @@ var EventManagerUtils = Class.create ({
  		var freq = event.rrule.freq;
  		var interval = event.rrule.interval || 1;
  		var numExdates = (event.exdates && event.exdates.length) || 0;
@@ -16850,7 +16534,7 @@ index e1ed3b4..481042e 100755
  		var bonusPadding = 3;
  		var base;
  		switch(freq){
-@@ -1980,7 +2061,9 @@ var EventManagerUtils = Class.create ({
+@@ -1980,7 +2070,9 @@ var EventManagerUtils = Class.create ({
  			//Did the event's repeat cycle already end?			
  			if(this.repeatEndedBeforeDate(event.rrule, event.countInfo, date)){
  				//this.evlog(this.logLevels.repeatDetails, "findRepeatsInRange: exit: repeat already ended 2");
@@ -16861,7 +16545,7 @@ index e1ed3b4..481042e 100755
  			}
  	
  			//Has the event's repeat cycle even started yet?
-@@ -1996,6 +2079,10 @@ var EventManagerUtils = Class.create ({
+@@ -1996,6 +2088,10 @@ var EventManagerUtils = Class.create ({
  			
  			if(event.dtstart > nextMidnight) {
  				//this.evlog(this.logLevels.repeatDetails, "findRepeatsInRange: exit: repeat hasn't started yet 2");
@@ -16872,7 +16556,7 @@ index e1ed3b4..481042e 100755
  				continue;
  			}		
  						
-@@ -2082,6 +2169,44 @@ var EventManagerUtils = Class.create ({
+@@ -2082,6 +2178,44 @@ var EventManagerUtils = Class.create ({
  									
  				eventOccurrences.push (nextOccurrence);
  
@@ -16917,7 +16601,7 @@ index e1ed3b4..481042e 100755
  				if (eventOccurrences.length === limit) {
  					//this.evlog(this.logLevels.repeatDetails, "findRepeatsInRange: hit limit");
  					return eventOccurrences;
-@@ -2811,7 +2936,7 @@ var EventManager = Class.create ({
+@@ -2811,7 +2945,7 @@ var EventManager = Class.create ({
  		future.years	= this.utils.getYearsInRange			(tempRange);
  
  		//load the timezone data needed to process this event set
@@ -16926,7 +16610,7 @@ index e1ed3b4..481042e 100755
  		future.then	(this.timezoneManager, this.timezoneManager.getTimezones);
  
  		future.then	(this, function (future) {
-@@ -2826,10 +2951,19 @@ var EventManager = Class.create ({
+@@ -2826,10 +2960,19 @@ var EventManager = Class.create ({
  			//We process in chunks and yield periodically to avoid Webkit's JS timeout.
  			function findOccurrences(){