diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css
index 861447e90b..bb255fa460 100644
--- a/view/theme/quattro/dark/style.css
+++ b/view/theme/quattro/dark/style.css
@@ -1793,6 +1793,28 @@ span[id^="showmore-wrap"] {
 	.rounded(5px);
     height: 18px;
 }*/
+a.actionbutton {
+  border: 1px solid #999999;
+  background-color: #cccccc;
+  color: #2d2d2d;
+  font-size: 8pt;
+  padding: 2pt;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+}
+a.actionbutton i.icon {
+  display: inline-block;
+  vertical-align: baseline;
+  padding: 0;
+}
+a.actionbutton:hover {
+  text-decoration: none;
+  background-color: #ffffff;
+}
+h2 > .actionbutton {
+  float: right;
+}
 /** acl **/
 #photo-edit-perms-select,
 #photos-upload-permissions-wrapper,
diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css
index 7b702bb4c8..6f68a9598f 100644
--- a/view/theme/quattro/green/style.css
+++ b/view/theme/quattro/green/style.css
@@ -1793,6 +1793,28 @@ span[id^="showmore-wrap"] {
 	.rounded(5px);
     height: 18px;
 }*/
+a.actionbutton {
+  border: 1px solid #999999;
+  background-color: #cccccc;
+  color: #2d2d2d;
+  font-size: 8pt;
+  padding: 2pt;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+}
+a.actionbutton i.icon {
+  display: inline-block;
+  vertical-align: baseline;
+  padding: 0;
+}
+a.actionbutton:hover {
+  text-decoration: none;
+  background-color: #ffffff;
+}
+h2 > .actionbutton {
+  float: right;
+}
 /** acl **/
 #photo-edit-perms-select,
 #photos-upload-permissions-wrapper,
diff --git a/view/theme/quattro/lilac/style.css b/view/theme/quattro/lilac/style.css
index 3fb953b8b5..f6093c5c22 100644
--- a/view/theme/quattro/lilac/style.css
+++ b/view/theme/quattro/lilac/style.css
@@ -1793,6 +1793,28 @@ span[id^="showmore-wrap"] {
 	.rounded(5px);
     height: 18px;
 }*/
+a.actionbutton {
+  border: 1px solid #999999;
+  background-color: #cccccc;
+  color: #2d2d2d;
+  font-size: 8pt;
+  padding: 2pt;
+  -moz-border-radius: 5px 5px 5px 5px;
+  -webkit-border-radius: 5px 5px 5px 5px;
+  border-radius: 5px 5px 5px 5px;
+}
+a.actionbutton i.icon {
+  display: inline-block;
+  vertical-align: baseline;
+  padding: 0;
+}
+a.actionbutton:hover {
+  text-decoration: none;
+  background-color: #ffffff;
+}
+h2 > .actionbutton {
+  float: right;
+}
 /** acl **/
 #photo-edit-perms-select,
 #photos-upload-permissions-wrapper,
diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index 62cb4c60b7..631a63333a 100644
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -1093,6 +1093,27 @@ span[id^="showmore-wrap"] {
     height: 18px;
 }*/
 
+a.actionbutton {
+	border: 1px solid @Grey3;
+	background-color: @Grey2;
+	color: @Grey5;
+	font-size: 8pt;
+	padding: 2pt;
+	.rounded();
+
+	i.icon {
+		display: inline-block;
+		vertical-align: baseline;
+		padding: 0;
+	}
+
+	&:hover {
+		text-decoration: none;
+		background-color: @Grey1;
+	}
+}
+h2 > .actionbutton { float: right; }
+
 
 /** acl **/
 #photo-edit-perms-select,
diff --git a/view/theme/quattro/templates/event_form.tpl b/view/theme/quattro/templates/event_form.tpl
new file mode 100644
index 0000000000..7cca2be364
--- /dev/null
+++ b/view/theme/quattro/templates/event_form.tpl
@@ -0,0 +1,46 @@
+
+<h3>{{$title}}</h3>
+
+<p>{{$desc}}</p>
+
+<form id="event-edit-form" action="{{$post}}" method="post" >
+
+	<input type="hidden" name="event_id" value="{{$eid}}" />
+	<input type="hidden" name="cid" value="{{$cid}}" />
+	<input type="hidden" name="uri" value="{{$uri}}" />
+	<input type="hidden" name="preview" id="event-edit-preview" value="0" />
+
+	{{include file="field_custom.tpl" field=array('start_text', $s_text, $s_dsel, "")}}
+	{{include file="field_custom.tpl" field=array('finish_text', $f_text, $f_dsel, "")}}
+
+	{{include file="field_checkbox.tpl" field=array('nofinish', $n_text, $n_checked, "")}}
+	{{include file="field_checkbox.tpl" field=array('adjust', $a_text, $a_checked, "")}}
+	<hr>
+	{{include file="field_input.tpl" field=array('summary', $t_text, $t_orig, "")}}
+	{{include file="field_textarea.tpl" field=array('desc', $d_text, $d_orig, "")}}
+
+	{{include file="field_textarea.tpl" field=array('location', $l_text, $l_orig, "")}}
+	<hr>
+	{{include file="field_checkbox.tpl" field=array('share', $sh_text, $sh_checked, "")}}
+
+	{{$acl}}
+
+	<div class="settings-submit-wrapper" >
+		<input id="event-edit-preview" type="submit" name="preview" value="{{$preview|escape:'html'}}" onclick="doEventPreview(); return false;" />
+		<input id="event-submit" type="submit" name="submit" value="{{$submit|escape:'html'}}" />
+	</div>
+</form>
+
+<script language="javascript" type="text/javascript">
+	$(document).ready(function() {
+		$('#id_share').change(function() {
+
+			if ($('#id_share').is(':checked')) {
+				$('#acl-wrapper').show();
+			}
+			else {
+				$('#acl-wrapper').hide();
+			}
+		}).trigger('change');
+	});
+</script>
diff --git a/view/theme/quattro/templates/events-js.tpl b/view/theme/quattro/templates/events-js.tpl
new file mode 100644
index 0000000000..ec8aa586cc
--- /dev/null
+++ b/view/theme/quattro/templates/events-js.tpl
@@ -0,0 +1,7 @@
+
+{{$tabs}}
+<h2>{{$title}} <a class="actionbutton" href="{{$new_event.0}}" ><i class="icon add s10"></i> {{$new_event.1}}</a></h2>
+
+<div id="new-event-link"></div>
+
+<div id="events-calendar"></div>
diff --git a/view/theme/quattro/templates/events.tpl b/view/theme/quattro/templates/events.tpl
new file mode 100644
index 0000000000..7a50498ebd
--- /dev/null
+++ b/view/theme/quattro/templates/events.tpl
@@ -0,0 +1,24 @@
+
+{{$tabs}}
+<h2>{{$title}} <a class="actionbutton" href="{{$new_event.0}}" ><i class="icon add s10"></i> {{$new_event.1}}</a></h2>
+
+
+<div id="event-calendar-wrapper">
+	<a href="{{$previus.0}}" class="prevcal {{$previus.2}}"><div id="event-calendar-prev" class="icon s22 prev" title="{{$previus.1}}"></div></a>
+	{{$calendar}}
+	<a href="{{$next.0}}" class="nextcal {{$next.2}}"><div id="event-calendar-prev" class="icon s22 next" title="{{$next.1}}"></div></a>
+</div>
+<div class="event-calendar-end"></div>
+
+
+{{foreach $events as $event}}
+	<div class="event">
+	{{if $event.is_first}}<hr /><a name="link-{{$event.j}}" ><div class="event-list-date">{{$event.d}}</div></a>{{/if}}
+	{{if $event.item.author_name}}<a href="{{$event.item.author_link}}" ><img src="{{$event.item.author_avatar}}" height="32" width="32" />{{$event.item.author_name}}</a>{{/if}}
+	{{$event.html}}
+	{{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}" target="_blank" class="plink-event-link icon s22 remote-link"></a>{{/if}}
+	{{if $event.edit}}<a href="{{$event.edit.0}}" title="{{$event.edit.1}}" class="edit-event-link icon s22 pencil"></a>{{/if}}
+	</div>
+	<div class="clear"></div>
+
+{{/foreach}}