diff --git a/plugins/calendar/skins/elastic/templates/calendar.html b/plugins/calendar/skins/elastic/templates/calendar.html
index 9c65e02c..6e204d31 100644
--- a/plugins/calendar/skins/elastic/templates/calendar.html
+++ b/plugins/calendar/skins/elastic/templates/calendar.html
@@ -1,388 +1,384 @@
 <roundcube:include file="includes/layout.html" />
 <roundcube:include file="includes/menu.html" />
 
 <h1 class="voice"><roundcube:label name="calendar.calendar" /></h1>
 
 <!-- calendars list -->
 <div class="sidebar listbox" role="navigation" aria-labelledby="arial-label-calendars">
 	<div class="header">
 		<a class="button icon back-content-button" href="#back" data-hidden="big"><span class="inner"><roundcube:label name="back" /></span></a>
 		<span id="aria-label-calendars" class="header-title"><roundcube:label name="calendar.calendars" /></span>
+		<roundcube:button name="calendaractionsmenu" id="calendaroptionsmenulink" type="link"
+			title="calendar.calendaractions" class="button icon sidebar-menu" data-popup="calendaractions-menu"
+			innerClass="inner" label="actions" />
 	</div>
 	<roundcube:object name="libkolab.folder_search_form" id="calendarlistsearch" wrapper="searchbar toolbar"
 		ariatag="h2" label="calsearchform" label-domain="calendar" buttontitle="findcalendars" />
 	<div id="calendars-content" class="scroller">
 		<roundcube:object name="plugin.calendar_list" id="calendarslist" class="treelist listing iconized" />
 	</div>
 	<h2 id="aria-label-minical" class="voice"><roundcube:label name="calendar.arialabelminical" /></h2>
 	<div id="datepicker" class="calendar-datepicker" role="presentation"></div>
-	<div class="footer toolbar" role="toolbar">
-		<roundcube:button command="calendar-create" type="link"
-			title="calendar.createcalendar" label="calendar.addcalendar"
-			class="button create disabled" classAct="button create" innerClass="inner" />
-		<roundcube:button name="calendaractionsmenu" id="calendaroptionsmenulink" type="link"
-			title="calendar.calendaractions" class="button actions" data-popup="calendaractions-menu"
-			innerClass="inner" label="actions" />
-	</div>
 </div>
 
 <!-- calendar -->
 <div class="content selected no-navbar" role="main">
 	<h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2>
 	<div class="header" role="toolbar" aria-labelledby="aria-label-toolbar">
 		<a class="button icon menu-button" href="#menu"><span class="inner"><roundcube:label name="menu" /></span></a>
 		<a class="button icon back-sidebar-button folders" href="#sidebar" data-hidden="big"><span class="inner"><roundcube:label name="calendar.calendars" /></span></a>
 		<span class="header-title"></span>
 		<!-- toolbar -->
 		<div id="calendartoolbar" class="toolbar">
 			<roundcube:button command="addevent" type="link"
 				class="button create disabled" classAct="button create"
 				label="create" title="calendar.new_event" innerClass="inner" />
 			<roundcube:button command="print" type="link" data-hidden="small"
 				class="button print disabled" classAct="button print"
 				label="calendar.print" title="calendar.printtitle" innerClass="inner" />
 			<span class="spacer"></span>
 			<roundcube:button command="events-import" type="link"
 				class="button import disabled" classAct="button import"
 				label="import" title="calendar.importevents" innerClass="inner" />
 			<roundcube:button command="export" type="link"
 				class="button export disabled" classAct="button export"
 				label="calendar.export" title="calendar.exporttitle" innerClass="inner" />
 			<roundcube:container name="toolbar" id="calendartoolbar" />
 		</div>
 	</div>
 	<roundcube:object name="plugin.searchform" id="searchform" wrapper="searchbar toolbar"
 		label="searchform" buttontitle="calendar.findevents" label-domain="calendar" ariatag="h2" />
 	<h2 id="aria-label-calendarview" class="voice"><roundcube:label name="calendar.arialabelcalendarview" /></h2>
 	<div id="calendar" class="content" role="main" aria-labelledby="aria-label-calendarview" data-elastic-mode="true">
 		<roundcube:object name="plugin.agenda_options" id="agendaoptions" />
 		<div id="searchcontrols" class="search-controls"></div>
 	</div>
 	<div class="footer toolbar" role="toolbar" data-hidden="big">
 		<a href="#" class="button prev" onclick="$('.fc-button-prev').click()"><span class="inner"><roundcube:label name="previous" /></span></a>
 		<a href="#" class="button today" onclick="$('.fc-button-today').click()"><span class="inner"><roundcube:label name="today" /></span></a>
 		<a href="#" class="button date" onclick="window.calendar_datepicker()"><span class="inner"><roundcube:label name="date" /></span></a>
 		<a href="#" class="button next" onclick="$('.fc-button-next').click()"><span class="inner"><roundcube:label name="next" /></span></a>
 	</div>
 </div>
 
 <div id="timezone-display" class="hidden"><roundcube:var name="env:timezone" /></div>
 
 <div id="eventshow" class="popupmenu formcontent propform text-only">
 	<h1 id="event-title" class="event-title form-group">Event Title</h1>
 	<div id="event-status-badge"><span></span></div>
 	<div class="event-location form-group" id="event-location">Location</div>
 	<div class="event-date form-group" id="event-date">From-To</div>
 	<div class="event-description form-group" id="event-description">
 		<div class="event-text"></div>
 	</div>
 	<div class="event-attendees form-group" id="event-attendees">
 		<div class="event-text"></div>
 	</div>
 	<div id="event-url" class="form-group row">
 		<label class="col-sm-4 col-form-label"><roundcube:label name="calendar.url" /></label>
 		<span class="event-text col-sm-8 form-control-plaintext"></span>
 	</div>
 	<div id="event-repeat" class="form-group row">
 		<label class="col-sm-4 col-form-label"><roundcube:label name="calendar.repeat" /></label>
 		<span class="event-text col-sm-8 form-control-plaintext"></span>
 	</div>
 	<div id="event-alarm" class="form-group row">
 		<label class="col-sm-4 col-form-label"><roundcube:label name="calendar.alarms" /></label>
 		<span class="event-text col-sm-8 form-control-plaintext"></span>
 	</div>
 	<div id="event-partstat" class="form-group row event-partstat">
 		<label class="col-sm-4 col-form-label"><roundcube:label name="calendar.mystatus" /></label>
 		<span class="col-sm-8 form-control-plaintext">
 			<span class="event-text rsvp-status"></span>
 			<a class="changersvp button edit" href="#" title="<roundcube:label name='calendar.changepartstat' />"><span class="inner"><roundcube:label name='calendar.changepartstat' /></span></a>
 		</span>
 	</div>
 	<div id="event-calendar" class="form-group row">
 		<label class="col-sm-4 col-form-label"><roundcube:label name="calendar.calendar" /></label>
 		<span class="col-sm-8 form-control-plaintext event-text">Default</span>
 	</div>
 	<div id="event-category" class="form-group row">
 		<label class="col-sm-4 col-form-label"><roundcube:label name="calendar.category" /></label>
 		<span class="col-sm-8 form-control-plaintext event-text"></span>
 	</div>
 	<div id="event-status" class="form-group row">
 		<label class="col-sm-4 col-form-label"><roundcube:label name="calendar.status" /></label>
 		<span class="event-text col-sm-8 form-control-plaintext"></span>
 	</div>
 	<div id="event-free-busy" class="form-group row">
 		<label class="col-sm-4 col-form-label"><roundcube:label name="calendar.freebusy" /></label>
 		<span class="event-text col-sm-8 form-control-plaintext"></span>
 	</div>
 	<div id="event-priority" class="form-group row">
 		<label class="col-sm-4 col-form-label"><roundcube:label name="calendar.priority" /></label>
 		<span class="event-text col-sm-8 form-control-plaintext"></span>
 	</div>
 	<div id="event-rsvp-comment" class="form-group row">
 		<label class="col-sm-4 col-form-label"><roundcube:label name="calendar.rsvpcomment" /></label>
 		<span class="event-text col-sm-8 form-control-plaintext"></span>
 	</div>
 	<div id="event-links" class="form-group row">
 		<label class="col-sm-4 col-form-label"><roundcube:label name="calendar.links" /></label>
 		<span class="event-text col-sm-8"></span>
 	</div>
 	<div id="event-attachments" class="form-group row">
 		<label class="col-sm-4 col-form-label"><roundcube:label name="attachments" /></label>
 		<span class="event-text col-sm-8"></span>
 	</div>
 	<div id="event-created" class="form-group row faded">
 		<label class="col-sm-4 col-form-label"><roundcube:label name="calendar.created" /></label>
 		<span class="event-text event-created col-sm-8 form-control-plaintext"></span>
 	</div>
 	<div id="event-changed" class="form-group row faded">
 		<label class="col-sm-4 col-form-label"><roundcube:label name="calendar.changed" /></label>
 		<span class="event-text event-changed col-sm-8 form-control-plaintext"></span>
 	</div>
 	<roundcube:object name="plugin.event_rsvp_buttons" id="event-rsvp" class="calendar-invitebox invitebox boxinformation" style="display:none" />
 </div>
 
 <roundcube:include file="/templates/eventedit.html" />
 
 <div id="calendaractions-menu" class="popupmenu">
 	<h3 id="aria-label-calendaroptions" class="voice"><roundcube:label name="calendar.calendaractions" /></h3>
 	<ul class="toolbarmenu listing" role="menu" aria-labelledby="aria-label-calendaroptions">
+		<roundcube:button type="link-menuitem" command="calendar-create" label="calendar.addcalendar" class="create disabled" classAct="create active" />
 		<roundcube:button type="link-menuitem" command="calendar-edit" label="calendar.edit" class="edit disabled" classAct="edit active" />
 		<roundcube:button type="link-menuitem" command="calendar-delete" label="delete" class="delete disabled" classAct="delete active" />
 		<roundcube:if condition="env:calendar_driver == 'kolab'" />
 			<roundcube:button type="link-menuitem" command="calendar-remove" label="calendar.removelist" class="remove disabled" classAct="remove active" />
 		<roundcube:endif />
 		<roundcube:button type="link-menuitem" command="calendar-showurl" label="calendar.showurl" class="showurl disabled" classAct="showurl active" />
 		<roundcube:if condition="!empty(env:calendar_settings['freebusy_url'])" />
 			<roundcube:button type="link-menuitem" command="calendar-showfburl" label="calendar.showfburl" class="showurl disabled" classAct="showurl active" />
 		<roundcube:endif />
 		<roundcube:if condition="env:calendar_driver == 'kolab'" />
 			<roundcube:button type="link-menuitem" command="folders" task="settings" label="managefolders" class="folders disabled" classAct="folders active" />
 		<roundcube:endif />
 	</ul>
 </div>
 
 <div id="eventoptionsmenu" class="popupmenu">
 	<h3 id="aria-label-eventoptions" class="voice"><roundcube:label name="calendar.eventoptions" /></h3>
 	<ul class="toolbarmenu listing" role="menu" aria-labelledby="aria-label-eventoptions">
 		<roundcube:button type="link-menuitem" command="event-download" label="download" class="download disabled" classAct="download active" />
 		<roundcube:button type="link-menuitem" command="event-sendbymail" label="send" class="send disabled" classAct="send active" />
 		<roundcube:button type="link-menuitem" command="event-copy" label="copy" class="copy disabled" classAct="copy active" />
 		<roundcube:if condition="env:calendar_driver == 'kolab' && config:kolab_bonnie_api" />
 			<roundcube:button type="link-menuitem" command="event-history" label="calendar.eventhistory" class="history disabled" classAct="history active" />
 		<roundcube:endif />
 	</ul>
 </div>
 
 <div id="eventresourcesdialog" class="popupmenu">
 	<h3 class="voice" id="aria-label-resourceselection"><roundcube:label name="calendar.arialabelresourceselection" /></h3>
 	<div class="resource-selection selection-list" role="navigation" aria-labelledby="aria-label-resourceselection">
 		<div class="header">
 			<span class="header-title"><roundcube:label name="calendar.tabresources" /></span>
-			<roundcube:object name="plugin.resources_searchform" id="resourcesearchbox"
-				wrapper="searchbar toolbar" ariatag="h4" buttontitle="calendar.findresources"
-				label="resourcesearchform" label-domain="calendar" />
 		</div>
+		<roundcube:object name="plugin.resources_searchform" id="resourcesearchbox"
+			wrapper="searchbar toolbar" ariatag="h4" buttontitle="calendar.findresources"
+			label="resourcesearchform" label-domain="calendar" />
 		<div class="scroller">
 			<roundcube:object name="plugin.resources_list" id="resources-list" class="listing treelist" />
 		</div>
 	</div>
 	<div class="resource-content selection-content">
 		<div class="header" data-hidden="normal,big">
 			<a class="button icon back" href="#back" onclick="$('#eventresourcesdialog .resource-content').hide(); $('#eventresourcesdialog .resource-selection').show()">
 				<span class="inner"><roundcube:label name="back" /></span>
 			</a>
 			<span class="header-title"><roundcube:label name="calendar.resourceprops" /></span>
 		</div>
 		<ul class="nav nav-tabs" role="tablist">
 			<li class="nav-item">
 				<a class="nav-link active" href="#resource-availability" data-toggle="tab" role="tab">
 					<roundcube:label name="calendar.resourceavailability" />
 				</a>
 			</li>
 			<li class="nav-item">
 				<a class="nav-link" href="#resource-info" data-toggle="tab" role="tab">
 					<roundcube:label name="calendar.resourcedetails" />
 				</a>
 			</li>
 		</ul>
 		<div class="tab-content">
 			<div id="resource-availability" class="tab-pane active" role="tabpanel" aria-labelledby="aria-label-resourceavailability">
 				<h3 class="voice" id="aria-label-resourceavailability"><roundcube:label name="calendar.resourceavailability" /></h3>
 				<roundcube:object name="plugin.resource_calendar" id="resource-freebusy-calendar" class="raw-tables" />
 				<div class="slot-nav">
 					<roundcube:button name="resource-cal-prev" id="resource-calendar-prev" type="link"
 						class="icon prevpage" title="calendar.prevslot" label="calendar.prevweek" />
 					<roundcube:button name="resource-cal-next" id="resource-calendar-next" type="link"
 						class="icon nextpage" title="calendar.nextslot" label="calendar.nextweek" />
 				</div>
 			</div>
 			<div id="resource-info" class="tab-pane" role="tabpanel" aria-labelledby="aria-label-resourcedetails">
 				<h3 class="voice" id="aria-label-resourcedetails"><roundcube:label name="calendar.resourcedetails" /></h3>
 				<roundcube:object name="plugin.resource_info" id="resource-details" class="propform text-only"
 					aria-live="polite" aria-relevant="text" aria-atomic="true" />
 			</div>
 		</div>
 	</div>
 </div>
 
 <div id="eventfreebusy" class="popupmenu calendar-scheduler formcontent">
 	<roundcube:object name="plugin.attendees_freebusy_table" id="attendees-freebusy-table"
 		class="schedule-table" data-h-margin="-1" data-v-margin="1" />
 	<div class="nav">
 		<div class="schedule-buttons">
 			<button id="schedule-find-prev" class="btn btn-secondary prev-slot"><roundcube:label name="calendar.prevslot" /></button>
 			<button id="schedule-find-next" class="btn btn-secondary next-slot"><roundcube:label name="calendar.nextslot" /></button>
 		</div>
 		<div class="schedule-options">
 			<label><input type="checkbox" id="schedule-freebusy-workinghours" value="1" class="pretty-checkbox" /><roundcube:label name="calendar.onlyworkinghours" /></label>
 		</div>
 		<div class="schedule-nav">
 			<button id="schedule-freebusy-prev" title="<roundcube:label name='previouspage' />">&#9668;</button>
 			<button id="schedule-freebusy-next" title="<roundcube:label name='nextpage' />">&#9658;</button>
 		</div>
 	</div>
 	<div class="schedule-range">
 		<div class="form-group row">
 			<label for="schedule-startdate" class="col-form-label col-sm-2"><roundcube:label name="calendar.start" /></label>
 			<span class="col-sm-10 datetime">
 				<input type="text" name="startdate" size="11" id="schedule-startdate" class="form-control" disabled="true" /> &nbsp;
 				<input type="text" name="starttime" size="6" id="schedule-starttime" class="form-control" disabled="true" />
 			</span>
 		</div>
 		<div class="form-group row">
 			<label for="schedule-enddate" class="col-form-label col-sm-2"><roundcube:label name="calendar.end" /></label>
 			<span class="col-sm-10 datetime">
 				<input type="text" name="enddate" size="11" id="schedule-enddate" class="form-control" disabled="true" /> &nbsp;
 				<input type="text" name="endtime" size="6" id="schedule-endtime" class="form-control" disabled="true" />
 			</span>
 		</div>
 		<div class="schedule-legend form-group row">
 			<label class="col-form-label col-sm-2"><roundcube:label name="calendar.legend" /></label>
 			<span class="col-sm-10 form-control-plaintext">
 				<roundcube:include file="/templates/freebusylegend.html" />
 				<span class="attendee organizer"><roundcube:label name="calendar.roleorganizer" /></span>
 				<span class="attendee req-participant"><roundcube:label name="calendar.rolerequired" /></span>
 				<span class="attendee opt-participant"><roundcube:label name="calendar.roleoptional" /></span>
 				<span class="attendee non-participant"><roundcube:label name="calendar.rolenonparticipant" /></span>
 				<span class="attendee chair"><roundcube:label name="calendar.rolechair" /></span>
 			</span>
 		</div>
 	</div>
 </div>
 
 <div id="eventsimport" class="popupmenu formcontent">
 	<roundcube:object name="plugin.events_import_form" id="events-import-form" />
 </div>
 
 <div id="eventsexport" class="popupmenu formcontent">
 	<roundcube:object name="plugin.events_export_form" id="events-export-form" />
 </div>
 
 <div id="calendarurlbox" class="popupmenu">
 	<p><roundcube:label name="calendar.showurldescription" /></p>
 	<textarea id="calfeedurl" rows="2" readonly="readonly"></textarea>
 	<div id="calendarcaldavurl" style="display:none; margin-top:1rem">
 		<p><roundcube:label name="calendar.caldavurldescription" html="yes" /></p>
 		<textarea id="caldavurl" rows="2" readonly="readonly"></textarea>
 	</div>
 </div>
 
 <div id="fburlbox" class="popupmenu">
 	<p><roundcube:label name="calendar.fburldescription" /></p>
 	<textarea id="fburl" rows="2" readonly="readonly"></textarea>
 </div>
 
 <roundcube:if condition="config:kolab_bonnie_api" />
 
 <div id="eventhistory" class="popupmenu" aria-hidden="true">
 	<roundcube:object name="plugin.object_changelog_table" id="event-changelog-table" class="changelog-table" />
 	<div class="compare-button"><input type="button" class="button" value="<roundcube:label name='libkolab.compare' />" /></div>
 </div>
 
 <div id="eventdiff" class="popupmenu formcontent text-only">
 	<h1 class="event-title">Event Title</h1>
 	<h1 class="event-title-new event-text-new"></h1>
 	<div class="form-group row event-date"></div>
 	<div class="form-group row event-location">
 		<h5 class="label"><roundcube:label name="calendar.location" /></h5>
 		<div class="event-text-old"></div>
 		<div class="event-text-new"></div>
 	</div>
 	<div class="form-group row event-description">
 		<h5 class="label"><roundcube:label name="calendar.description" /></h5>
 		<div class="event-text-diff" style="white-space:pre-wrap"></div>
 		<div class="event-text-old"></div>
 		<div class="event-text-new"></div>
 	</div>
 	<div class="form-group row event-url">
 		<h5 class="label"><roundcube:label name="calendar.url" /></h5>
 		<div class="event-text-old"></div>
 		<div class="event-text-new"></div>
 	</div>
 	<div class="form-group row event-recurrence">
 		<h5 class="label"><roundcube:label name="calendar.repeat" /></h5>
 		<div class="event-text-old"></div>
 		<div class="event-text-new"></div>
 	</div>
 	<div class="form-group row event-alarms">
 		<h5 class="label"><roundcube:label name="calendar.alarms" /><span class="index"></span></h5>
 		<div class="event-text-old"></div>
 		<div class="event-text-new"></div>
 	</div>
 	<div class="event-line event-start">
 		<label><roundcube:label name="calendar.start" /></label>
 		<span class="event-text-old"></span> &#8674;
 		<span class="event-text-new"></span>
 	</div>
 	<div class="event-line event-end">
 		<label><roundcube:label name="calendar.end" /></label>
 		<span class="event-text-old"></span> &#8674;
 		<span class="event-text-new"></span>
 	</div>
 	<div class="event-line event-attendees">
 		<label><roundcube:label name="calendar.tabattendees" /><span class="index"></span></label>
 		<span class="event-text-old"></span> &#8674;
 		<span class="event-text-new"></span>
 	</div>
 	<div class="event-line event-calendar">
 		<label><roundcube:label name="calendar.calendar" /></label>
 		<span class="event-text-old"></span> &#8674;
 		<span class="event-text-new"></span>
 	</div>
 	<div class="event-line event-categories">
 		<label><roundcube:label name="calendar.category" /></label>
 		<span class="event-text-old"></span> &#8674;
 		<span class="event-text-new"></span>
 	</div>
 	<div class="event-line event-status">
 		<label><roundcube:label name="calendar.status" /></label>
 		<span class="event-text-old"></span> &#8674;
 		<span class="event-text-new"></span>
 	</div>
 	<div class="event-line event-free_busy">
 		<label><roundcube:label name="calendar.freebusy" /></label>
 		<span class="event-text-old"></span> &#8674;
 		<span class="event-text-new"></span>
 	</div>
 	<div class="event-line event-priority">
 		<label><roundcube:label name="calendar.priority" /></label>
 		<span class="event-text-old"></span> &#8674;
 		<span class="event-text-new"></span>
 	</div>
 	<div class="event-line event-sensitivity">
 		<label><roundcube:label name="calendar.sensitivity" /></label>
 		<span class="event-text-old"></span> &#8674;
 		<span class="event-text-new"></span>
 	</div>
 	<div class="form-group row event-attachments">
 		<label><roundcube:label name="attachments" /><span class="index"></span></label>
 		<div class="event-text-old"></div>
 		<div class="event-text-new"></div>
 	</div>
 </div>
 
 <roundcube:endif />
 
 <roundcube:object name="plugin.calendar_css" folder-class="div.$class a.calname:before" folder-fallback-color="#161b1d" />
 
 <roundcube:include file="includes/footer.html" />
diff --git a/plugins/kolab_files/skins/elastic/templates/files.html b/plugins/kolab_files/skins/elastic/templates/files.html
index 5e4f16e9..111d52a9 100644
--- a/plugins/kolab_files/skins/elastic/templates/files.html
+++ b/plugins/kolab_files/skins/elastic/templates/files.html
@@ -1,220 +1,216 @@
 <roundcube:include file="includes/layout.html" />
 <roundcube:include file="includes/menu.html" />
 
 <h1 class="voice"><roundcube:label name="kolab_files.files" /></h1>
 
 <!-- folders list -->
 <div class="sidebar listbox" role="navigation" aria-labelledby="arial-label-folders">
 	<div class="header">
 		<a class="button icon back-content-button" href="#back" data-hidden="big"><span class="inner"><roundcube:label name="back" /></span></a>
 		<span id="aria-label-folders" class="header-title"><roundcube:label name="folders" /></span>
+		<roundcube:button name="folderoptions" id="folderoptionslink" type="link"
+			title="moreactions" label="actions"
+			class="button icon sidebar-menu" innerClass="inner" data-popup="folderoptions-menu" />
 	</div>
 	<roundcube:object name="libkolab.folder_search_form" id="foldersearch" wrapper="searchbar toolbar"
 		ariatag="h2" label="foldersearchform" buttontitle="kolab_files.findfolders" />
 	<div id="files-folder-list" class="scroller"></div>
-	<div class="footer toolbar" role="toolbar">
-		<roundcube:button command="folder-create" type="link"
-			title="kolab_files.foldercreate" label="kolab_files.addfolder"
-			class="button create disabled" classAct="button create" innerClass="inner" />
-		<roundcube:button name="folderoptions" id="folderoptionslink" type="link"
-			title="moreactions" label="actions"
-			class="button actions" innerClass="inner" data-popup="folderoptions-menu" />
-	</div>
 <roundcube:if condition="env:files_quota" />
 	<div class="footer toolbar small">
 		<div id="quotadisplay" class="quota-widget">
 			<span class="voice"><roundcube:label name="quota"></span>
 			<roundcube:object name="filequotadisplay" class="count" display="text" />
 		</div>
 	</div>
 <roundcube:endif />
 </div>
 
 <!-- files -->
 <div class="content selected no-navbar" role="main">
 	<h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2>
 	<div class="header" role="toolbar" aria-labelledby="aria-label-toolbar">
 		<a class="button icon menu-button" href="#menu"><span class="inner"><roundcube:label name="menu" /></span></a>
 		<a class="button icon back-sidebar-button folders" href="#sidebar" data-hidden="big"><span class="inner"><roundcube:label name="folders" /></span></a>
 		<span class="header-title"></span>
 		<!-- toolbar -->
 		<div id="filestoolbar" class="toolbar">
 			<roundcube:button id="fileslistmenu-link" name="fileslistmenu-link"
 				type="link" onclick="kolab_files_listoptions('files')"
 				label="options" class="button settings" innerClass="inner" />
 			<roundcube:button id="sessionslistmenu-link" name="sessionslistmenu-link"
 				type="link" onclick="kolab_files_listoptions('sessions')"
 				label="options" class="button hidden settings" innerClass="inner" />
 			<span class="spacer"></span>
 			<roundcube:button command="files-upload" type="link" onclick="$('#filesuploadform').click()"
 				class="button upload disabled" classAct="button upload"
 				label="kolab_files.upload" title="kolab_files.uploadfile" innerClass="inner" />
 			<roundcube:button command="files-get" type="link"
 				class="button download disabled" classAct="button download"
 				label="kolab_files.get" title="kolab_files.getfile" innerClass="inner" />
 			<roundcube:button command="files-open" type="link"
 				class="button open disabled" classAct="button open"
 				label="kolab_files.view" title="kolab_files.viewfile" innerClass="inner" />
 			<roundcube:button command="files-edit" type="link"
 				class="button edit disabled" classAct="button edit"
 				label="kolab_files.edit" title="kolab_files.editfile" innerClass="inner" />
 			<roundcube:button command="files-create" type="link" data-fab="true"
 				class="button create disabled" classAct="button create"
 				label="kolab_files.create" title="kolab_files.createfile" innerClass="inner "/>
 			<roundcube:button command="files-delete" type="link"
 				class="button delete disabled" classAct="button delete"
 				label="delete" title="kolab_files.deletefile" innerClass="inner" />
 			<roundcube:button name="filemenulink" id="filemenulink" type="link"
 				class="button more" label="more" title="moreactions"
 				data-popup="file-menu" innerclass="inner" />
 		</div>
 	</div>
 	<roundcube:object name="file-search-form" id="searchform" wrapper="searchbar toolbar"
 		label="searchform" buttontitle="kolab_files.findfiles" label-domain="kolab_files"
 		ariatag="h3" options="filesearchmenu" />
 	<div id="filesearchmenu" class="hidden searchoptions scroller propform formcontainer" aria-labelledby="aria-label-search-menu" aria-controls="filelist">
 		<h3 id="aria-label-search-menu" class="voice"><roundcube:label name="searchmod" /></h3>
 		<div class="formcontent">
 			<ul class="proplist">
 				<li><label><input type="checkbox" name="all_folders" value="1" id="search_all_folders" /><roundcube:label name="kolab_files.allfolders" /></label></li>
 			</ul>
 		</div>
 		<div class="formbuttons">
 			<button class="btn btn-primary icon search" href="#" onclick="return rcmail.command('files-search')"><roundcube:label name="search" /></button>
 		</div>
 	</div>
 	<div id="filelistcontainer" class="content" role="main" aria-labelledby="aria-label-filelist" data-elastic-mode="true">
 		<h2 id="aria-label-filelist" class="voice"><roundcube:label name="kolab_files.arialabelfilelist" /></h2>
 		<div id="filelistbox" class="droptarget">
 			<roundcube:object name="filelist" id="filelist" class="records-table listing filelist sortheader fixedheader"
 				aria-labelledby="aria-label-filelist" data-list="fileslist"
 				data-label-msg="listempty" data-label-ext="listusebutton" data-create-command="files-create" />
 		</div>
 		<h2 id="aria-label-sessionslist" class="voice"><roundcube:label name="kolab_files.arialabelsessionslist" /></h2>
 		<div id="sessionslistbox" class="boxlistcontent" style="display:none">
 		<roundcube:object name="sessionslist" id="sessionslist" class="records-table listing filelist sortheader fixedheader"
 			optionsmenuIcon="true" aria-labelledby="aria-label-sessionslist" data-label-msg="listempty" />
 		</div>
 	</div>
 </div>
 
 <form id="filesuploadform" class="smart-upload"></form>
 
 <div id="files-folder-create-dialog" class="popupmenu formcontent" role="dialog" aria-labelledby="aria-label-foldercreateform">
 	<h3 id="aria-label-foldercreateform" class="voice"><roundcube:label name="kolab_files.arialabelfoldercreateform" /></h3>
 	<roundcube:object name="folder-create-form" />
 </div>
 <div id="files-folder-edit-dialog" class="popupmenu formcontent" role="dialog" aria-labelledby="aria-label-foldereditform">
 	<h3 id="aria-label-foldereditform" class="voice"><roundcube:label name="kolab_files.arialabelfoldereditform" /></h3>
 	<roundcube:object name="folder-edit-form" />
 </div>
 <div id="files-folder-mount-dialog" class="popupmenu formcontent" role="dialog" aria-labelledby="aria-label-foldermountform">
 	<h3 id="aria-label-foldermountform" class="voice"><roundcube:label name="kolab_files.arialabelfoldermountform" /></h3>
 	<roundcube:object name="folder-mount-form" />
 </div>
 <div id="files-file-rename-dialog" class="popupmenu formcontent" role="dialog" aria-labelledby="aria-label-filerenameform">
 	<h3 id="aria-label-filerenameform" class="voice"><roundcube:label name="kolab_files.arialabelfilerenameform" /></h3>
 	<roundcube:object name="file-rename-form" />
 </div>
 <div id="files-file-create-dialog" class="popupmenu formcontent" role="dialog" aria-labelledby="aria-label-filecreateform">
 	<h3 id="aria-label-filecreateform" class="voice"><roundcube:label name="kolab_files.arialabelfilecreateform" /></h3>
 	<roundcube:object name="file-create-form" />
 </div>
 <div id="files-folder-auth-dialog" class="popupmenu formcontent" role="dialog" aria-labelledby="aria-label-folderauthform">
 	<h3 id="aria-label-folderauthform" class="voice"><roundcube:label name="kolab_files.arialabelfolderauthform" /></h3>
 	<roundcube:object name="folder-auth-options" />
 </div>
 <div id="files-file-edit-dialog" class="popupmenu formcontent" role="dialog" aria-labelledby="aria-label-fileeditdialog">
 	<h3 id="aria-label-fileeditdialog" class="voice"><roundcube:label name="kolab_files.arialabelfileeditdialog" /></h3>
 	<roundcube:object name="file-edit-dialog" />
 </div>
 <div id="files-session-dialog" class="popupmenu formcontent" role="dialog" aria-labelledby="aria-label-filesessiondialog">
 	<h3 id="aria-label-filesessiondialog" class="voice"><roundcube:label name="kolab_files.arialabelfilesessiondialog" /></h3>
 	<roundcube:object name="file-session-dialog" />
 </div>
 
 <div id="folderoptions-menu" class="popupmenu" data-editable="true">
 	<h3 id="aria-label-folderoptions" class="voice"><roundcube:label name="kolab_files.folderoptions" /></h3>
 	<ul class="toolbarmenu listing" role="menu" aria-labelledby="aria-label-folderoptions">
+		<roundcube:button type="link-menuitem" command="folder-create" label="kolab_files.addfolder" class="create disabled" classAct="create active" />
 		<roundcube:button type="link-menuitem" command="folder-rename" label="rename" class="rename" classAct="rename active" />
 		<roundcube:button type="link-menuitem" command="files-folder-delete" label="delete" class="delete" classAct="delete active" />
 		<roundcube:if condition="!empty(env:external_sources)" />
 			<roundcube:button type="link-menuitem" command="folder-mount" label="kolab_files.foldermount" class="mount storage" classAct="mount storage active" />
 		<roundcube:endif />
 		<roundcube:button type="link-menuitem" command="folders" task="settings" label="managefolders" class="folders" classAct="folders active" />
 	</ul>
 </div>
 
 <roundcube:add_label name="kolab_files.arialabellistoptions" />
 <div id="fileslistoptions" class="propform popupmenu" role="dialog" aria-labelledby="aria-label-fileslistoptions">
 	<h3 id="aria-label-fileslistoptions" class="voice"><roundcube:label name="kolab_files.arialabellistoptions" /></h3>
 	<roundcube:if condition="!in_array('kolab_files_sort_col', (array)config:dont_override)" />
 	<div class="form-group row">
 		<label for="listoptions-sortcol" class="col-form-label col-sm-4"><roundcube:label name="listsorting" /></label>
 		<div class="col-sm-8">
 			<select name="sort_col" class="form-control">
 				<option value="name"><roundcube:label name="kolab_files.name" /></option>
 				<option value="mtime"><roundcube:label name="kolab_files.mtime" /></option>
 				<option value="size"><roundcube:label name="size" /></option>
 			</select>
 		</div>
 	</div>
 	<roundcube:endif />
 	<roundcube:if condition="!in_array('kolab_files_sort_order', (array)config:dont_override)" />
 	<div class="form-group row">
 		<label for="listoptions-sortcol" class="col-form-label col-sm-4"><roundcube:label name="listorder" /></label>
 		<div class="col-sm-8">
 			<select class="form-control">
 				<option value="ASC"><roundcube:label name="asc" /></option>
 				<option value="DESC"><roundcube:label name="desc" /></option>
 			</select>
 		</div>
 	</div>
 	<roundcube:endif />
 </div>
 
 <roundcube:add_label name="kolab_files.arialabelsessionslistoptions" />
 <div id="sessionslistoptions" class="propform popupmenu" role="dialog" aria-labelledby="aria-label-sessionslistoptions">
 	<h3 id="aria-label-sessionslistoptions" class="voice"><roundcube:label name="kolab_files.arialabelsessionslistoptions" /></h3>
 	<roundcube:if condition="!in_array('kolab_files_sessions_sort_col', (array)config:dont_override)" />
 	<div class="form-group row">
 		<label for="listoptions-sortcol" class="col-form-label col-sm-4"><roundcube:label name="listsorting" /></label>
 		<div class="col-sm-8">
 			<select name="sort_col" class="form-control">
 				<option value="name"><roundcube:label name="kolab_files.name" /></option>
 			</select>
 		</div>
 	</div>
 	<roundcube:endif />
 	<roundcube:if condition="!in_array('kolab_files_sessions_sort_order', (array)config:dont_override)" />
 	<div class="form-group row">
 		<label for="listoptions-sortcol" class="col-form-label col-sm-4"><roundcube:label name="listorder" /></label>
 		<div class="col-sm-8">
 			<select class="form-control">
 				<option value="ASC"><roundcube:label name="asc" /></option>
 				<option value="DESC"><roundcube:label name="desc" /></option>
 			</select>
 		</div>
 	</div>
 	<roundcube:endif />
 </div>
 
 <div id="dragfilemenu" class="popupmenu">
 	<ul class="toolbarmenu listing" role="menu">
 		<roundcube:button type="link-menuitem" command="files-move" onclick="return kolab_files_drag_menu_action('files-move')" label="move" classAct="active" />
 		<roundcube:button type="link-menuitem" command="files-copy" onclick="return kolab_files_drag_menu_action('files-copy')" label="copy" classAct="active" />
 	</ul>
 </div>
 
 <div id="file-menu" class="popupmenu">
 	<h3 id="aria-label-message-menu" class="voice"><roundcube:label name="kolab_files.arialabelmorefileactions" /></h3>
 	<ul class="toolbarmenu listing" role="menu" aria-labelledby="aria-label-file-menu">
 		<roundcube:button type="link-menuitem" command="files-rename" label="kolab_files.rename" class="rename" classAct="rename active" />
 		<roundcube:button type="link-menuitem" command="files-move" label="moveto" class="move" classAct="move active" innerclass="folder-selector-link" aria-haspopup="true" />
 		<roundcube:button type="link-menuitem" command="files-copy" label="copyto" class="copy" classAct="copy active" innerclass="folder-selector-link" aria-haspopup="true" />
 	</ul>
 </div>
 
 <script src="plugins/kolab_files/skins/elastic/ui.js" type="text/javascript"></script>
 
 <roundcube:include file="includes/footer.html" />
diff --git a/plugins/kolab_notes/skins/elastic/templates/notes.html b/plugins/kolab_notes/skins/elastic/templates/notes.html
index 07f6f4fb..89f1dcc4 100644
--- a/plugins/kolab_notes/skins/elastic/templates/notes.html
+++ b/plugins/kolab_notes/skins/elastic/templates/notes.html
@@ -1,152 +1,149 @@
 <roundcube:include file="includes/layout.html" />
 <roundcube:include file="includes/menu.html" />
 
 <h1 class="voice"><roundcube:label name="kolab_notes.navtitle" /></h1>
 
 <!-- notebooks list -->
 <div class="sidebar listbox" role="navigation" aria-labelledby="arial-label-notebooks">
 	<div class="header">
 		<a class="button icon back-list-button" href="#back"><span class="inner"><roundcube:label name="back" /></span></a>
 		<span id="aria-label-notebooks" class="header-title"><roundcube:label name="kolab_notes.lists" /></span>
+		<roundcube:button name="notebookactionsmenu" id="notesoptionsmenulink" type="link"
+			title="kolab_notes.listactions" class="button icon sidebar-menu" data-popup="notebookactions-menu"
+			innerClass="inner" label="actions" />
 	</div>
 	<roundcube:object name="libkolab.folder_search_form" id="notebooksearch" wrapper="searchbar toolbar"
 		ariatag="h2" label="foldersearchform" label-domain="kolab_notes" buttontitle="findnotebooks" />
 	<div id="notebooks-content" class="scroller">
 		<roundcube:object name="plugin.notebooks" id="notebooks" class="listing treelist iconized" />
 	</div>
-	<div class="footer toolbar" role="toolbar">
-		<roundcube:button command="list-create" type="link" title="kolab_notes.newnotebook"
-			class="button create disabled" classAct="button create" innerClass="inner" label="kolab_notes.addnotebook" />
-		<roundcube:button name="notebookactionsmenu" id="notesoptionsmenulink" type="link"
-			title="kolab_notes.listactions" class="button actions" data-popup="notebookactions-menu"
-			innerClass="inner" label="actions" />
-	</div>
 </div>
 
 <!-- notes list -->
 <div class="list listbox selected" aria-labelledby="aria-label-noteslist">
 	<div class="header">
 		<a class="button icon menu-button" href="#menu"><span class="inner"><roundcube:label name="menu" /></span></a>
 		<a class="button icon back-sidebar-button folders" href="#sidebar"><span class="inner"><roundcube:label name="kolab_notes.notebooks" /></span></a>
 		<span id="aria-label-noteslist" class="header-title"><roundcube:label name="kolab_notes.notes" /></span>
 		<div id="listcontrols" class="toolbar" role="toolbar">
 			<roundcube:button name="optionsmenu" id="listmenulink" type="link" class="button settings"
 				label="options" innerClass="inner" onclick="return kolab_notes_options_menu()" />
 		</div>
 		<a class="button icon toolbar-menu-button" href="#list-menu"><span class="inner"><roundcube:label name="menu" /></span></a>
 	</div>
 	<roundcube:object name="plugin.searchform" id="searchform" wrapper="searchbar toolbar"
 		label="notesearchform" label-domain="kolab_notes" buttontitle="kolab_notes.findnotes" ariatag="h2" />
 	<div class="scroller">
 		<h2 id="aria-label-noteslist" class="voice"><roundcube:label name="kolab_notes.notes" /></h2>
 		<roundcube:object name="plugin.listing" id="kolabnoteslist"
 			class="listing" summary="kolab_notes.arialabelnoteslist"
 			role="listbox" data-list="noteslist"
 			data-label-msg="listempty" data-label-ext="listusebutton" data-create-command="createnote" />
 	</div>
 </div>
 
 <!-- note details frame -->
 <div class="content" role="main">
 	<h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2>
 	<div class="header" role="toolbar" aria-labelledby="aria-label-toolbar">
 		<a class="button icon back-list-button" href="#back"><span class="inner"><roundcube:label name="back" /></span></a>
 		<span class="header-title"></span>
 		<!-- toolbar -->
 		<div id="notestoolbar" class="toolbar">
 			<roundcube:button command="createnote" type="link"
 				class="button create disabled" classAct="button create"
 				label="create" title="kolab_notes.createnote" innerclass="inner" data-fab="true" />
 			<roundcube:button command="print" type="link" data-hidden="small"
 				class="button print disabled" classAct="button print"
 				label="print" title="print" innerClass="inner" />
 			<roundcube:button command="delete" type="link"
 				class="button delete disabled" classAct="button delete"
 				title="delete" label="delete" innerClass="inner" />
 			<roundcube:button command="sendnote" type="link"
 				class="button send disabled" classAct="button send"
 				label="kolab_notes.send" title="kolab_notes.sendnote" innerClass="inner" />
 			<roundcube:container name="toolbar" id="notestoolbar" />
 		</div>
 	</div>
 	<!-- note content frame -->
 	<h2 id="aria-label-noteform" class="voice"><roundcube:label name="kolab_notes.arialabelnoteform" /></h2>
 	<div class="content scroller watermark" role="main" aria-labelledby="aria-label-noteform">
 		<div id="notedetailsbox" class="formcontent">
 			<roundcube:object name="plugin.notetitle" id="notedetailstitle" class="notetitle" />
 			<roundcube:object name="plugin.editform" id="noteform" class="noteform" />
 			<roundcube:object name="plugin.detailview" id="notedetails" class="notedetails" />
 			<h3 id="aria-label-messagereferences" class="voice"><roundcube:label name="kolab_notes.arialabelmessagereferences" /></h3>
 			<div id="notereferences" class="notereferences" role="region" aria-labelledby="aria-label-messagereferences">
 				<roundcube:object name="plugin.attachments_list" id="attachment-list" class="attachmentslist" />
 			</div>
 			<roundcube:container name="notedetailview" id="notedetailsbox" />
 		</div>
 		<div class="formbuttons">
 			<roundcube:button command="save" class="btn btn-primary submit" label="save" id="btn-save-note" />
 			<roundcube:if condition="config:kolab_bonnie_api" />
 				<roundcube:button command="history" type="link" label="libkolab.showhistory"
 					class="btn btn-secondary history note-history disabled" classAct="btn btn-secondary history note-history" />
 			<roundcube:endif />
 		</div>
 	</div>
 </div>
 
 <!-- popups and dialogs -->
 <roundcube:if condition="config:kolab_bonnie_api" />
 <div id="notehistory" class="popupmenu" aria-hidden="true">
 	<roundcube:object name="plugin.object_changelog_table" class="records-table changelog-table" />
 	<div class="compare-button"><input type="button" class="button" value="↳ <roundcube:label name='libkolab.compare' />" /></div>
 </div>
 
 <div id="notediff" class="popupmenu" aria-hidden="true">
 	<h2 class="note-title">Note Title</h2>
 	<h2 class="note-title-new diff-text-new"></h2>
 	<div class="form-section note-tags">
 		<span class="diff-text-old"></span> &#8674; <span class="diff-text-new"></span>
 	</div>
 	<div class="form-section note-description">
 		<div class="diff-text-diff" style="white-space:pre-wrap"></div>
 		<div class="diff-text-old"></div>
 		<div class="diff-text-new"></div>
 	</div>
 	<div class="form-section notereferences">
 		<div class="diff-text-old"></div>
 		<div class="diff-text-new"></div>
 	</div>
 </div>
 <roundcube:endif />
 
 <div id="notebookactions-menu" class="popupmenu">
 	<h3 id="aria-label-actionsmenu" class="voice"><roundcube:label name="kolab_notes.arialabelnotesoptionsmenu" /></h3>
 	<ul class="toolbarmenu listing" role="menu" aria-labelledby="aria-label-actionsmenu">
+		<roundcube:button type="link-menuitem" command="list-create" label="kolab_notes.addnotebook" class="create disabled" classAct="create active" />
 		<roundcube:button type="link-menuitem" command="list-edit" label="edit" class="edit disabled" classAct="edit active" />
 		<roundcube:button type="link-menuitem" command="list-delete" label="delete" class="delete disabled" classAct="delete active" />
 		<roundcube:button type="link-menuitem" command="list-remove" label="kolab_notes.removelist" class="remove disabled" classAct="remove active" />
 		<roundcube:button type="link-menuitem" command="folders" task="settings" label="managefolders" class="folders disabled" classAct="folders active" />
 	</ul>
 </div>
 
 <div id="options-menu" class="popupmenu propform" role="menu" aria-labelledby="aria-label-optionsmenu">
 	<h3 id="aria-label-optionsmenu" class="voice"><roundcube:label name="kolab_notes.arialabelnotessortmenu" /></h3>
 	<div class="form-group row">
 		<label for="listoptions-sortcol" class="col-form-label col-sm-4"><roundcube:label name="listsorting" /></label>
 		<div class="col-sm-8">
 			<select id="listoptions-sortcol" name="sort_col" class="form-control">
 				<option value="changed"><roundcube:label name="kolab_notes.changed" /></option>
 				<option value="title"><roundcube:label name="kolab_notes.title" /></option>
 			</select>
 		</div>
 	</div>
 	<div class="form-group row">
 		<label for="listoptions-sortord" class="col-form-label col-sm-4"><roundcube:label name="listorder" /></label>
 		<div class="col-sm-8">
 			<select id="listoptions-sortord" name="sort_ord" class="form-control" disabled>
 				<option value="ASC"><roundcube:label name="asc" /></option>
 				<option value="DESC"><roundcube:label name="desc" /></option>
 			</select>
 		</div>
 	</div>
 </div>
 
 <roundcube:include file="includes/footer.html" />
diff --git a/plugins/tasklist/skins/elastic/templates/mainview.html b/plugins/tasklist/skins/elastic/templates/mainview.html
index 0a317acc..06fd9b6c 100644
--- a/plugins/tasklist/skins/elastic/templates/mainview.html
+++ b/plugins/tasklist/skins/elastic/templates/mainview.html
@@ -1,334 +1,331 @@
 <roundcube:include file="includes/layout.html" />
 <roundcube:include file="includes/menu.html" />
 
 <h1 class="voice"><roundcube:label name="tasklist.navtitle" /></h1>
 
 <!-- task folders list -->
 <div class="sidebar listbox" role="navigation" aria-labelledby="arial-label-notebooks">
 	<div class="header">
 		<a class="button icon back-list-button" href="#back"><span class="inner"><roundcube:label name="back" /></span></a>
 		<span id="aria-label-tasklists" class="header-title"><roundcube:label name="tasklist.lists" /></span>
+		<roundcube:button name="tasklistactionsmenu" id="tasklistoptionsmenulink" type="link"
+			title="tasklist.listactions" class="button icon sidebar-menu" data-popup="tasklistactions-menu"
+			innerClass="inner" label="actions" />
 	</div>
 	<roundcube:object name="libkolab.folder_search_form" id="tasklistsearch" wrapper="searchbar toolbar"
 		ariatag="h2" label="foldersearchform" label-domain="tasklist" buttontitle="findlists" />
 	<div id="tasklists-content" class="scroller">
 		<roundcube:object name="plugin.tasklists" id="tasklists" class="treelist listing iconized" />
 	</div>
-	<div class="footer toolbar" role="toolbar">
-		<roundcube:button command="list-create" type="link" title="tasklist.createlist"
-			class="button create disabled" classAct="button create" innerClass="inner" label="tasklist.createlist" />
-		<roundcube:button name="tasklistactionsmenu" id="tasklistoptionsmenulink" type="link"
-			title="tasklist.listactions" class="button actions" data-popup="tasklistactions-menu"
-			innerClass="inner" label="actions" />
-	</div>
 </div>
 
 <!-- tasks list -->
 <div class="list listbox selected" aria-labelledby="aria-label-taskslist">
 	<div class="header">
 		<a class="button icon menu-button" href="#menu"><span class="inner"><roundcube:label name="menu" /></span></a>
 		<a class="button icon back-sidebar-button folders" href="#sidebar"><span class="inner"><roundcube:label name="tasklist.lists" /></span></a>
 		<span id="aria-label-taskslist" class="header-title"><roundcube:label name="tasklist.navtitle" /></span>
 		<div id="listcontrols" class="toolbar" role="toolbar">
 			<a href="#threads" class="button threads" data-popup="threadselect-menu" title="<roundcube:label name="threads" />"><span class="inner"><roundcube:label name="threads" /></span></a>
 			<roundcube:button name="optionsmenu" id="listmenulink" type="link" class="button settings"
 				label="options" innerClass="inner" onclick="tasklist_options_menu()" />
 		</div>
 		<a class="button icon toolbar-menu-button" href="#list-menu"><span class="inner"><roundcube:label name="menu" /></span></a>
 	</div>
 	<roundcube:object name="plugin.searchform" id="searchform" wrapper="searchbar toolbar"
 		label="tasksearchform" label-domain="tasklist" buttontitle="tasklist.findtasks" ariatag="h2" />
 	<div class="pagenav pagenav-list toolbar" onclick="UI.switch_nav_list(this)">
 		<a class="button icon expand"><span class="inner"></span></a>
 		<span id="taskselector-name" class="pagenav-text"><roundcube:label name="tasklist.all" /></span>
 	</div>
 	<div id="taskselector-content" class="navlist scroller" aria-labelledby="aria-label-taskselector">
 		<h2 class="voice" id="aria-label-taskselector"><roundcube:label name="tasklist.arialabeltaskselector" /></h2>
 		<ul id="taskselector" class="listing" role="listbox" aria-controls="tasklist">
 			<li class="all selected" role="radio" aria-checked="true" aria-labelledby="aria-radio-all"><a href="#all" id="aria-radio-all"><roundcube:label name="tasklist.all" /></a></li>
 			<li class="overdue inactive" role="radio" aria-checked="false" aria-labelledby="aria-radio-overdue"><a href="#overdue" id="aria-radio-overdue"><roundcube:label name="tasklist.overdue" /><span class="count"></span></a></li>
 			<li class="today" role="radio" aria-checked="false" aria-labelledby="aria-radio-today"><a href="#today" id="aria-radio-today"><roundcube:label name="tasklist.today" /><span class="count"></span></a></li>
 			<li class="tomorrow" role="radio" aria-checked="false" aria-labelledby="aria-radio-tomorrow"><a href="#tomorrow" id="aria-radio-tomorrow"><roundcube:label name="tasklist.tomorrow" /><span class="count"></span></a></li>
 			<roundcube:if condition="env:tasklist_driver != 'kolab'" />
 			<li class="week" role="radio" aria-checked="false" aria-labelledby="aria-radio-week"><a href="#week" id="aria-radio-week"><roundcube:label name="tasklist.next7days" /></a></li>
 			<roundcube:endif />
 			<li class="later" role="radio" aria-checked="false" aria-labelledby="aria-radio-later"><a href="#later" id="aria-radio-later"><roundcube:label name="tasklist.later" /><span class="count"></span></a></li>
 			<li class="nodate" role="radio" aria-checked="false" aria-labelledby="aria-radio-nodate"><a href="#nodate" id="aria-radio-nodate"><roundcube:label name="tasklist.nodate" ucfirst="true" /></a></li>
 			<li class="flagged" role="radio" aria-checked="false" aria-labelledby="aria-radio-flagged"><a href="#flagged" id="aria-radio-flagged"><roundcube:label name="tasklist.flagged" /></a></li>
 			<roundcube:if condition="env:tasklist_driver == 'kolab'" />
 			<li class="mytasks" role="radio" aria-checked="false" aria-labelledby="aria-radio-mytasks"><a href="#mytasks" id="aria-radio-mytasks" title="<roundcube:label name='tasklist.mytaskstitle'/>"><roundcube:label name="tasklist.mytasks" /></a></li>
 			<li class="assigned" role="radio" aria-checked="false" aria-labelledby="aria-radio-assigned"><a href="#assigned" id="aria-radio-assigned" title="<roundcube:label name='tasklist.assignedtitle'/>"><roundcube:label name="tasklist.assigned" /></a></li>
 			<roundcube:endif />
 			<li class="complete" role="radio" aria-checked="false" aria-labelledby="aria-radio-complete"><a href="#complete" id="aria-radio-complete"><roundcube:label name="tasklist.complete" /><span class="count"></span></a></li>
 		</ul>
 	</div>
 	<div class="scroller">
 		<h2 id="aria-label-taskslist" class="voice"><roundcube:label name="tasklist.navtitle" /></h2>
 		<roundcube:object name="plugin.tasks" id="tasklist" role="tree"
 			class="listing" role="listbox" data-list="tasklist"
 			data-label-msg="listempty" data-label-ext="listusebutton" data-create-command="newtask" />
 	</div>
 </div>
 
 <!-- task details frame -->
 <div class="content" role="main">
 	<h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2>
 	<div class="header" role="toolbar" aria-labelledby="aria-label-toolbar">
 		<a class="button icon back-list-button" href="#back"><span class="inner"><roundcube:label name="back" /></span></a>
 		<span class="header-title"></span>
 		<!-- toolbar -->
 		<div id="taskstoolbar" class="toolbar">
 			<roundcube:button command="newtask" type="link"
 				class="button create disabled" classAct="button create"
 				label="create" title="tasklist.newtask" innerClass="inner" data-fab="true" />
 			<roundcube:button command="print" type="link" data-hidden="small"
 				class="button print disabled" classAct="button print"
 				label="print" title="tasklist.printtitle" innerClass="inner" />
 			<roundcube:button command="delete-task" type="link"
 				label="delete" title="tasklist.removetask"
 				class="button delete disabled" classAct="button delete" innerclass="inner" />
 			<span class="spacer"></span>
 			<roundcube:button command="import" type="link"
 				class="button import disabled" classAct="button import"
 				label="import" title="tasklist.importtasks" innerClass="inner" />
 			<roundcube:button command="export" type="link"
 				class="button export disabled" classAct="button export"
 				label="tasklist.export" title="tasklist.exporttitle" innerClass="inner" />
 			<roundcube:container name="toolbar" id="taskstoolbar" />
 		</div>
 	</div>
 	<!-- task content frame -->
 	<h2 id="aria-label-taskform" class="voice"><roundcube:label name="tasklist.arialabeltaskform" /></h2>
 	<div class="content scroller watermark" role="main" aria-labelledby="aria-label-taskform">
 		<roundcube:include file="/templates/taskedit.html" />
 		<div id="taskshow" class="hidden formcontent propform text-only" data-nodialog="true">
 			<div id="event-status-badge"><span></span></div>
 			<div id="task-parent-title" class="task-parent-title"></div>
 			<h2 id="task-title" class="task-title"></h2>
 			<div id="task-description" class="task-description"></div>
 			<div id="task-attendees" class="form-group row task-attendees">
 				<label class="col-sm-4 col-form-label"><roundcube:label name="tasklist.assignedto" /></label>
 				<span class="task-text col-sm-8 form-control-plaintext"></span>
 			</div>
 			<div id="task-tags" class="form-group row">
 				<label class="col-sm-4 col-form-label"><roundcube:label name="tasklist.tags" /></label>
 				<span class="task-text tagedit col-sm-8 form-control-plaintext"></span>
 			</div>
 			<div id="task-start" class="form-group row">
 				<label class="col-sm-4 col-form-label"><roundcube:label name="tasklist.start" /></label>
 				<span class="col-sm-8 form-control-plaintext"><span class="task-text"></span> <span id="task-starttime"></span></span>
 			</div>
 			<div id="task-date" class="form-group row">
 				<label class="col-sm-4 col-form-label"><roundcube:label name="tasklist.datetime" /></label>
 				<span class="col-sm-8 form-control-plaintext"><span class="task-text"></span> <span id="task-time"></span></span>
 			</div>
 			<div id="task-recurrence" class="form-group row">
 				<label class="col-sm-4 col-form-label"><roundcube:label name="tasklist.repeat" /></label>
 				<span class="task-text col-sm-8 form-control-plaintext"></span>
 			</div>
 			<div id="task-alarm" class="form-group row">
 				<label class="col-sm-4 col-form-label"><roundcube:label name="tasklist.alarms" /></label>
 				<span class="task-text col-sm-8 form-control-plaintext"></span>
 			</div>
 			<div id="task-organizer" class="form-group row task-attendees">
 				<label class="col-sm-4 col-form-label"><roundcube:label name="tasklist.roleorganizer" /></label>
 				<span class="task-text col-sm-8 form-control-plaintext"></span>
 			</div>
 			<div id="task-list" class="form-group row">
 				<label class="col-sm-4 col-form-label"><roundcube:label name="tasklist.list" /></label>
 				<span class="task-text col-sm-8 form-control-plaintext"></span>
 			</div>
 			<div id="task-completeness" class="form-group row">
 				<label class="col-sm-4 col-form-label"><roundcube:label name="tasklist.complete" /></label>
 				<span class="task-text col-sm-8 form-control-plaintext"></span>
 			</div>
 			<div id="task-status" class="form-group row">
 				<label class="col-sm-4 col-form-label"><roundcube:label name="tasklist.status" /></label>
 				<span class="task-text col-sm-8 form-control-plaintext"></span>
 			</div>
 			<div id="task-links" class="form-group row">
 				<label class="col-sm-4 col-form-label"><roundcube:label name="tasklist.links" /></label>
 				<span class="task-text col-sm-8"></span>
 			</div>
 			<div id="task-attachments" class="form-group row">
 				<label class="col-sm-4 col-form-label"><roundcube:label name="attachments" /></label>
 				<div class="task-text col-sm-8"></div>
 			</div>
 			<div id="task-created" class="form-group row faded">
 				<label class="col-sm-4 col-form-label"><roundcube:label name="tasklist.created" /></label>
 				<span class="task-text task-created col-sm-8 form-control-plaintext"></span>
 			</div>
 			<div id="task-changed" class="form-group row faded">
 				<label class="col-sm-4 col-form-label"><roundcube:label name="tasklist.changed" /></label>
 				<span class="task-text task-changed col-sm-8 form-control-plaintext"></span>
 			</div>
 			<div id="task-rsvp-comment" class="form-group row">
 				<label class="col-sm-4 col-form-label"><roundcube:label name="tasklist.rsvpcomment" /></label>
 				<span class="task-text col-sm-8 form-control-plaintext"></span>
 			</div>
 			<roundcube:object name="plugin.task_rsvp_buttons" id="task-rsvp" class="tasklist-invitebox invitebox boxinformation" style="display:none" />
 		</div>
 		<div class="formbuttons">
 			<roundcube:button command="save-task" label="save"
 				class="btn btn-primary submit disabled" classAct="btn btn-primary submit" innerCLass="inner" />
 			<roundcube:button command="edit-task" label="edit"
 				class="btn btn-primary edit disabled" classAct="btn btn-primary edit" innerclass="inner" />
 			<roundcube:button command="add-child-task" label="tasklist.addsubtask"
 				class="create btn btn-secondary disabled" classAct="create btn btn-secondary" innerclass="inner" />
 			<roundcube:if condition="config:kolab_bonnie_api" />
 				<roundcube:button command="task-history" type="link" label="libkolab.showhistory"
 					class="btn btn-secondary history task-history disabled" classAct="btn btn-secondary history task-history" />
 			<roundcube:endif />
 		</div>
 	</div>
 </div>
 
 <roundcube:if condition="env:tasklist_driver == 'kolab' && config:kolab_bonnie_api" />
 <div id="taskhistory" class="popupmenu" aria-hidden="true">
 	<roundcube:object name="plugin.object_changelog_table" class="changelog-table" />
 	<div class="compare-button"><input type="button" class="button" value="↳ <roundcube:label name='libkolab.compare' />" /></div>
 </div>
 
 <div id="taskdiff" class="popupmenu" aria-hidden="true">
 	<div class="form-group row task-parent-title">
 		<span class="task-text-old"></span> &#8674;
 		<span class="task-text-new"></span> &raquo;
 	</div>
 	<h2 class="task-title">Task Title</h2>
 	<h2 class="task-title-new task-text-new"></h2>
 	<div class="form-group row task-description">
 		<label><roundcube:label name="calendar.description" /></label>
 		<div class="task-text-diff" style="white-space:pre-wrap"></div>
 		<div class="task-text-old"></div>
 		<div class="task-text-new"></div>
 	</div>
 	<div class="form-group row task-flagged">
 		<label><roundcube:label name="tasklist.flagged" /></label>
 		<span class="task-text-old"></span> &#8674;
 		<span class="task-text-new"></span>
 	</div>
 	<div class="form-group row task-start">
 		<label><roundcube:label name="tasklist.start" /></label>
 		<span class="task-text-old"></span> &#8674;
 		<span class="task-text-new"></span>
 	</div>
 	<div class="form-group row task-date">
 		<label><roundcube:label name="tasklist.datetime" /></label>
 		<span class="task-text-old"></span> &#8674;
 		<span class="task-text-new"></span>
 	</div>
 	<div class="form-group row task-recurrence">
 		<label><roundcube:label name="tasklist.repeat" /></label>
 		<span class="task-text-old"></span> &#8674;
 		<span class="task-text-new"></span>
 	</div>
 	<div class="form-group row task-alarms">
 		<label><roundcube:label name="tasklist.alarms" /></label>
 		<span class="task-text-old"></span> &#8674;
 		<span class="task-text-new"></span>
 	</div>
 	<div class="form-group row task-attendees">
 		<label><roundcube:label name="tasklist.assignedto" /><span class="index"></span></label>
 		<span class="task-text-old"></span> &#8674;
 		<span class="task-text-new"></span>
 	</div>
 	<div class="form-group row task-complete">
 		<label><roundcube:label name="tasklist.complete" /></label>
 		<span class="task-text-old"></span> &#8674;
 		<span class="task-text-new"></span>
 	</div>
 	<div class="form-group row task-status">
 		<label><roundcube:label name="tasklist.status" /></label>
 		<span class="task-text-old"></span> &#8674;
 		<span class="task-text-new"></span>
 	</div>
 	<div class="form-group row task-links">
 		<label><roundcube:label name="tasklist.links" /><span class="index"></span></label>
 		<span class="task-text"></span>
 	</div>
 	<div class="form-group row task-attachments">
 		<label><roundcube:label name="attachments" /><span class="index"></span></label>
 		<div class="task-text-old"></div>
 		<div class="task-text-new"></div>
 	</div>
 </div>
 <roundcube:endif />
 
 <div id="tasklistactions-menu" class="popupmenu">
 	<h3 id="aria-label-tasklistoptions" class="voice"><roundcube:label name="tasklist.listactions" /></h3>
 	<ul class="toolbarmenu listing" role="menu" aria-labelledby="aria-label-tasklistoptions">
+		<roundcube:button type="link-menuitem" command="list-create" label="tasklist.createlist" class="create disabled" classAct="create active" />
 		<roundcube:button type="link-menuitem" command="list-edit" label="edit" class="edit disabled" classAct="edit active" />
 		<roundcube:button type="link-menuitem" command="list-delete" label="delete" class="delete disabled" classAct="delete active" />
 		<roundcube:if condition="env:tasklist_driver == 'kolab'" />
 			<roundcube:button type="link-menuitem" command="list-remove" label="tasklist.removelist" class="remove disabled" classAct="remove active" />
 		<roundcube:endif />
 		<roundcube:if condition="config:calendar_caldav_url" />
 			<roundcube:button type="link-menuitem" command="list-showurl" label="tasklist.showcaldavurl" class="showurl disabled" classAct="showurl active" />
 		<roundcube:endif />
 		<roundcube:if condition="env:tasklist_driver == 'kolab'" />
 			<roundcube:button type="link-menuitem" command="folders" task="settings" label="managefolders" class="folders disabled" classAct="folders active" />
 		<roundcube:endif />
 	</ul>
 </div>
 
 <div id="listoptions-menu" class="popupmenu propform">
 	<h3 id="aria-label-taskviewsortmenu" class="voice"><roundcube:label name="tasklist.arialabelsortmenu" /></h3>
 	<div class="form-group row">
 		<label for="options-sortcol" class="col-form-label col-sm-4"><roundcube:label name="listsorting" /></label>
 		<div class="col-sm-8">
 			<select id="options-sortcol" class="form-control">
 				<option value="auto"><roundcube:label name="tasklist.auto" /></option>
 				<option value="datetime"><roundcube:label name="tasklist.datetime" /></option>
 				<option value="startdatetime"><roundcube:label name="tasklist.start" /></option>
 				<option value="flagged"><roundcube:label name="tasklist.flagged" /></option>
 				<option value="complete"><roundcube:label name="tasklist.completeness" /></option>
 				<option value="changed"><roundcube:label name="tasklist.changed" /></option>
 			</select>
 		</div>
 	</div>
 	<div class="form-group row">
 		<label for="options-ord" class="col-form-label col-sm-4"><roundcube:label name="listorder" /></label>
 		<div class="col-sm-8">
 			<select id="options-ord" class="form-control">
 				<option value="asc"><roundcube:label name="sortasc" /></option>
 				<option value="desc"><roundcube:label name="sortdesc" /></option>
 			</select>
 		</div>
 	</div>
 	<roundcube:add_label name="listoptionstitle" />
 </div>
 
 <div id="threadselect-menu" class="popupmenu">
 	<h3 id="aria-label-threadselectmenu" class="voice"><roundcube:label name="tasklist.viewactions" /></h3>
 	<ul class="toolbarmenu listing" role="menu" aria-labelledby="aria-label-threadselectmenu">
 		<roundcube:button command="expand-all" type="link-menuitem" label="expand-all" class="expand all" classAct="expand all active" />
 		<roundcube:button command="collapse-all" type="link-menuitem" label="collapse-all" class="expand none" classAct="expand none active" />
 	</ul>
 </div>
 
 <div id="tasklistform" class="popupmenu formcontent">
 	<roundcube:label name="loading" />
 	<roundcube:container name="tasklistform" id="tasklistform" />
 </div>
 
 <div id="tasksimport" class="popupmenu formcontent">
 	<roundcube:object name="plugin.tasks_import_form" id="tasks-import-form" />
 </div>
 
 <div id="tasksexport" class="popupmenu formcontent">
 	<roundcube:object name="plugin.tasks_export_form" id="tasks-export-form" />
 </div>
 
 <script>
 rcmail.addEventListener('tasks-insertrow', function(o) {
     UI.pretty_checkbox($(o.div).find('input'));
 });
 
 $('#taskselector a').on('click', function() {
     var node = $(this).clone();
     node.find('span').remove();
     $('#taskselector-name').text(node.text());
 });
 </script>
 
 <roundcube:include file="includes/footer.html" />