diff --git a/calendar/templates/default/edit.xet b/calendar/templates/default/edit.xet
index aa5512580c..ad9297194e 100644
--- a/calendar/templates/default/edit.xet
+++ b/calendar/templates/default/edit.xet
@@ -27,7 +27,7 @@
 					</row>
 					<row>
 						<description/>
-						<buttononly statustext="Find free timeslots where the selected participants are availible for the given timespan" label="Freetime search" id="freetime" onclick="app.calendar.freetime_search"/>
+						<buttononly statustext="Find free timeslots where the selected participants are availible for the given timespan" label="Freetime search" id="freetime" onclick="app.calendar.freetime_search" image="add" background_image="1"/>
 					</row>
 					<row class="row">
 						<description for="location" value="Location" width="0"/>
@@ -92,7 +92,7 @@
 					<menulist>
 						<menupopup class="selectRole" id="role"/>
 					</menulist>
-					<button align="center" label="Add" id="add"/>
+					<button align="center" label="Add" id="add" image="add" background_image="1"/>
 					<description/>
 				</row>
 				<row class="th">
@@ -201,7 +201,7 @@
 			</columns>
 			<rows>
 				<row class="th" disabled="@view">
-					<description value="Create new links" span="all"/>
+					<description value="Create new links" span="all" class="gray"/>
 				</row>
 				<row class="row" disabled="@view">
 					<link-to id="link_to" span="all"/>
@@ -298,8 +298,8 @@
 			<vbox class="prompt">
 				<description value="Do you want to keep the series exceptions in your calendar?"/>
 				<hbox align="center">
-					<button statustext="All exceptions are converted into single events." label="Keep exceptions" id="button[delete_keep_exceptions]"/>
-					<button statustext="The exceptions are deleted together with the series." label="Delete exceptions" id="button[delete_exceptions]"/>
+					<button statustext="All exceptions are converted into single events." label="Keep exceptions" id="button[delete_keep_exceptions]" image="keep" background_image="1"/>
+					<button statustext="The exceptions are deleted together with the series." label="Delete exceptions" id="button[delete_exceptions]" image="delete" background_image="1"/>
 					<buttononly label="Cancel" onclick="jQuery(document.getElementById('calendar-edit_calendar-delete_series')).hide();"/>
 				</hbox>
 			</vbox>
@@ -320,7 +320,7 @@
 					<description/>
 					<description/>
 				</row>
-				<row class="th" height="28">
+				<row class="th dialog-header" height="28">
 					<description value="Title"/>
 					<hbox needed="1" options="0,0" span="all">
 						<textbox id="title" needed="1" size="75" maxlength="255" tabindex="1"/>
@@ -351,7 +351,7 @@
 						</tabpanels>
 					</tabbox>
 				</row>
-				<row disabled="!@owner">
+				<row disabled="!@owner" class="dialog-operators">
 					<description value="Owner"/>
 					<menulist>
 						<menupopup type="select-account" id="owner" readonly="true"/>
@@ -361,17 +361,17 @@
 						<menupopup type="select-account" align="right" class="noBreak" label="by" id="modifier" readonly="true"/>
 					</menulist>
 				</row>
-				<row>
+				<row class="dialog-footer-toolbar">
 					<hbox span="3">
-						<button statustext="saves the changes made" label="Save" id="button[save]"/>
-						<button statustext="apply the changes" label="Apply" id="button[apply]"/>
-						<button statustext="Close the window" label="Cancel" id="button[cancel]" onclick="window.close();"/>
+						<button statustext="saves the changes made" label="Save" id="button[save]" image="save" background_image="1"/>
+						<button statustext="apply the changes" label="Apply" id="button[apply]" image="apply" background_image="1"/>
+						<button statustext="Close the window" label="Cancel" id="button[cancel]" onclick="window.close();" image="cancel" background_image="1"/>
 						<menulist>
 							<menupopup statustext="Execute a further action for this entry" id="action" onchange="app.calendar.actions_change" options="Actions..."/>
 						</menulist>
 						<checkbox label="Do not notify of these changes" id="no_notifications" span="2"/>
 					</hbox>
-					<button align="right" statustext="Delete this event" label="Delete" id="button[delete]" onclick="return app.calendar.delete_btn($cont[query_delete_exceptions]);"/>
+					<button align="right" statustext="Delete this event" label="Delete" id="button[delete]" onclick="return app.calendar.delete_btn($cont[query_delete_exceptions]);" image="delete" background_image="1"/>
 				</row>
 				<row >
 					<template id="calendar.delete_series" span="all" />
diff --git a/calendar/templates/default/edit_series.xet b/calendar/templates/default/edit_series.xet
index 158c5e99f5..b1a2bfb427 100644
--- a/calendar/templates/default/edit_series.xet
+++ b/calendar/templates/default/edit_series.xet
@@ -9,9 +9,9 @@
 			<vbox class="prompt" id="dialog-content">
 				<description value="Do you want to edit this event as an exception or the whole series?"/>
 				<hbox align="center">
-					<buttononly label="Edit exception" onclick="app.calendar.open_edit(false);"/>
-					<buttononly label="Edit series" onclick="app.calendar.open_edit(true);"/>
-					<buttononly label="Cancel" onclick="document.getElementById('edit_series').style.display = 'none';"/>
+					<buttononly label="Edit exception" onclick="app.calendar.open_edit(false);" image="edit" background_image="1"/>
+					<buttononly label="Edit series" onclick="app.calendar.open_edit(true);" image="edit" background_image="1"/>
+					<buttononly label="Cancel" onclick="document.getElementById('edit_series').style.display = 'none';" image="cancel" background_image="1"/>
 				</hbox>
 			</vbox>
 		</vbox>
diff --git a/calendar/templates/default/export.xet b/calendar/templates/default/export.xet
index d16129e75b..f2e9721071 100644
--- a/calendar/templates/default/export.xet
+++ b/calendar/templates/default/export.xet
@@ -31,7 +31,7 @@
 				</row>
 				<row>
 					<description/>
-					<button label="Download" id="download"/>
+					<button label="Download" id="download" image="download" background_image="1"/>
 				</row>
 				<row>
 					<description span="all"/>
diff --git a/calendar/templates/default/freetimesearch.xet b/calendar/templates/default/freetimesearch.xet
index 0f1a7c7f6d..1e2ee387ea 100644
--- a/calendar/templates/default/freetimesearch.xet
+++ b/calendar/templates/default/freetimesearch.xet
@@ -34,15 +34,15 @@
 				<column/>
 			</columns>
 			<rows>
-				<row>
+				<row class="dialog-header">
 					<description class="calendar_size120b" value="Freetime Search"/>
 					<description class="message" no_lang="1" id="msg"/>
 				</row>
-				<row>
+				<row class="dialog-operators high">
 					<description value="Startdate / -time"/>
 					<date-time id="start" statustext="Startdate and -time of the search"/>
 				</row>
-				<row>
+				<row class="dialog-operators">
 					<description value="Duration"/>
 					<hbox>
 						<menulist>
@@ -51,7 +51,7 @@
 						<date-time id="end" statustext="Enddate / -time of the meeting, eg. for more then one day"/>
 					</hbox>
 				</row>
-				<row>
+				<row class="dialog-operators">
 					<description value="Timeframe"/>
 					<hbox>
 						<date-timeonly id="start_time" statustext="Timeframe to search"/>
@@ -61,7 +61,7 @@
 						<listbox type="select-dow" rows="3" id="weekdays" statustext="Weekdays to use in search"/>
 					</hbox>
 				</row>
-				<row>
+				<row class="dialog-operators">
 					<button label="New search" id="search" statustext="new search with the above parameters"/>
 					<hbox>
 						<menulist>
@@ -70,7 +70,7 @@
 						<button id="cancel" label="Cancel" statustext="Close the window" onclick="window.close();"/>
 					</hbox>
 				</row>
-				<row>
+				<row class="dialog-operators">
 					<template content="freetime" span="all" id="calendar.freetimesearch.rows"/>
 				</row>
 			</rows>
diff --git a/calendar/templates/pixelegg/app.css b/calendar/templates/pixelegg/app.css
index e449ac33c8..12cabd9210 100755
--- a/calendar/templates/pixelegg/app.css
+++ b/calendar/templates/pixelegg/app.css
@@ -108,7 +108,7 @@ div.calendar {
   background-color: #ffffff;
   color: #000;
   border: 1px solid;
-  border-color: #808080;
+  border-color: #828282;
   padding: 1px;
 }
 .calendar thead .active {
@@ -268,9 +268,10 @@ div.calendar {
 div#calendar-edit {
   width: 870px;
   padding: 5px;
+  /*###########################################*/
 }
 div#calendar-edit label.et2_label {
-  padding: 0 2px;
+  /*padding: 0 2px;*/
 }
 div#calendar-edit .chzn-container {
   padding-top: 1em;
@@ -293,14 +294,19 @@ div#calendar-edit #calendar-edit_calendar-edit-general table.et2_grid #calendar-
   float: left;
 }
 div#calendar-edit #calendar-edit_calendar-edit-general table.et2_grid button#calendar-edit_freetime {
-  background-image: url('../images/search.png') !important;
+  background-image: url('images/add.png') !important;
+}
+div#calendar-edit #calendar-edit_calendar-edit-general table.et2_grid .et2_checkbox,
+div#calendar-edit #calendar-edit_calendar-edit-general table.et2_grid input#calendar-edit_whole_day {
+  margin-left: 5px important;
+  border-left: 10px solid red;
 }
 div#calendar-edit #calendar-edit_calendar-edit-general table.et2_grid .et2_date {
   float: left;
 }
 div#calendar-edit #calendar-edit_calendar-edit-general #calendar-edit_category {
   border: 1px solid;
-  border-color: #bfbfbf;
+  border-color: #b4b4b4;
   -webkit-border-radius: 3px;
   -moz-border-radius: 3px;
   border-radius: 3px;
@@ -337,6 +343,9 @@ div#calendar-edit #calendar-edit_calendar-edit-links tbody {
   display: table;
   width: 100%;
 }
+div#calendar-edit #calendar-edit_calendar-edit-links span.et2_label {
+  padding: 1em;
+}
 div#calendar-edit #calendar-edit_calendar-edit-alarms tbody {
   display: table;
   width: 100%;
@@ -927,12 +936,6 @@ tr.prefRow > td {
   right: 55%;
   display: none;
   width: 33%;
-  -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
-  border-radius: 3px;
-  background-color: #f0f0f0;
-  border-color: #808080;
-  cursor: pointer;
   background-color: #ffc200;
 }
 tr.prefRow:hover .prefHelp {
diff --git a/calendar/templates/pixelegg/app.less b/calendar/templates/pixelegg/app.less
index ce07b6a7da..5c54b20e03 100755
--- a/calendar/templates/pixelegg/app.less
+++ b/calendar/templates/pixelegg/app.less
@@ -137,7 +137,7 @@ div.calendar { position: relative; }
             .background-color-0-gray;
             color: #000;
             border: 1px solid;
-            .border-color-50-gray;
+            border-color: @gray-50;
             padding: 1px;
         }
 
@@ -354,7 +354,7 @@ div#calendar-edit{
     width: 870px;
     padding: 5px;
     label.et2_label{
-        padding: 0 2px;
+        /*padding: 0 2px;*/
     }
     .chzn-container {
         padding-top: 1em;
@@ -364,6 +364,7 @@ div#calendar-edit{
         background-color: transparent;
     }
 
+    /*###########################################*/
     // Tab General
     #calendar-edit_calendar-edit-general{
         display: block;
@@ -382,7 +383,12 @@ div#calendar-edit{
 
             // Terminsuche
 
-            button#calendar-edit_freetime {background-image: url('../images/search.png') !important;}
+            button#calendar-edit_freetime {background-image: url('images/add.png') !important;}
+            
+            
+            // hole day
+            .et2_checkbox,
+            input#calendar-edit_whole_day {margin-left: 5px important; border-left: 10px solid red;}
 
             .et2_date{
                 float: left;
@@ -391,7 +397,7 @@ div#calendar-edit{
         }
         #calendar-edit_category{
             border: 1px solid;
-            .border-color-25-gray;
+            border-color: @gray-30;
             .border_radius_button_normal;
         }
 
@@ -463,8 +469,9 @@ div#calendar-edit{
         tbody{
             display: table;
             width: 100%;
-
         }
+        
+       span.et2_label {padding:  1em;} 
     }
 
     // Alarme
@@ -473,18 +480,6 @@ div#calendar-edit{
         tbody{
             display: table;
             width: 100%;
-
-            // hinzufügen
-
-            //			button {
-            //
-            //					.Complete_Button_add;
-            //					height: 28px;
-            //					padding: 0px !important;
-            //					margin: 0px;
-            //					&:hover {.Complete_Button_add_hover;}
-            //
-            //					}
         }
     }
 
@@ -1085,14 +1080,7 @@ tr.prefRow > td {
     right: 55%;
     display: none;
     width: 33%;
-    //	background-color: lightyellow;
-
-    .Complete_Button_text;
-    //	border: 1px solid black;
-    //	border-radius: 10px;
-    //	padding: 5px;
-    //	margin-top: 5px;
-    .background-color-Context-Help;
+    background-color: @color-hint;
 
 }
 tr.prefRow:hover .prefHelp {
@@ -1116,4 +1104,4 @@ tr.prefRow:hover .prefHelp {
     padding-bottom: 5px;
 }
 
-//
\ No newline at end of file
+//
\ No newline at end of file
diff --git a/etemplate/templates/default/etemplate2.css b/etemplate/templates/default/etemplate2.css
index 9ddfc2a929..394c415837 100644
--- a/etemplate/templates/default/etemplate2.css
+++ b/etemplate/templates/default/etemplate2.css
@@ -3,388 +3,361 @@
  *
  * @version: $Id$
  */
-
 /**
  * Top level
  */
 .et2_container {
-	/*margin: 10px;
+  /*margin: 10px;
 	border: 1px solid gray;*/
-	padding: 0px;
-	background-color: white;
-	height: 100%;
+  padding: 0px;
+  background-color: white;
+  height: 100%;
 }
 .et2_container > div:not([class]) {
-	height: 100%;
+  height: 100%;
 }
-
-
 /**
  * Basic rules
  */
-input,button,select {
-	margin: 1px;
-	padding: 0px;
+input,
+button,
+select {
+  margin: 1px;
+  padding: 0px;
 }
-
 /**
  * VBox widget
  */
-div.et2_vbox>* {
-	display: block;
+div.et2_vbox > * {
+  display: block;
 }
-
 /**
  * HBox widget
  */
-
 div.et2_hbox div.et2_hbox {
-	display: inline;
+  display: inline;
 }
 div.et2_hbox {
-	white-space: nowrap;
+  white-space: nowrap;
 }
-div.et2_hbox>* {
-	text-align: left;
-	vertical-align: middle;
+div.et2_hbox > * {
+  text-align: left;
 }
-
 div.et2_hbox_left {
-	float: left;
+  float: left;
 }
-
 div.et2_hbox_al_center {
-	text-align: center;
+  text-align: center;
 }
-
 div.et2_hbox_al_right {
-	text-align: right;
+  text-align: right;
 }
-
 div.et2_hbox_right {
-	float: right;
-	clear: right;
+  float: right;
+  clear: right;
 }
-div.et2_hbox>div {
-	display: inline-block;
+div.et2_hbox > div {
+  display: inline-block;
 }
-
 /**
  * Placeholder widget - used for un-implemented widgets
  */
 .et2_placeholder {
-	display: inline-block;
-	border: 1px solid cornflowerblue;
-	background-color: #FCFCFC;
-	padding: 3px;
-	margin: 1px;
+  display: inline-block;
+  border: 1px solid cornflowerblue;
+  background-color: #FCFCFC;
+  padding: 3px;
+  margin: 1px;
 }
-
 .et2_placeholder .et2_caption {
-	display: block;
-	font-size: 8pt;
-	margin: 0 0 5px 0;
-	font-weight: bold;
-	color: #2E2E2E;
-	cursor: pointer;
-	text-shadow: rgba(255, 255, 255, 0.5) 0 1px 0;
+  display: block;
+  font-size: 8pt;
+  margin: 0 0 5px 0;
+  font-weight: bold;
+  color: #2E2E2E;
+  cursor: pointer;
+  text-shadow: rgba(255, 255, 255, 0.5) 0 1px 0;
 }
-
 .et2_placeholder .et2_attr {
-	display: block;
-	font-size: 8pt;
-	color: #3030A0;
-	margin: 2px 0 2px 0;
+  display: block;
+  font-size: 8pt;
+  color: #3030A0;
+  margin: 2px 0 2px 0;
 }
-
 /**
  * Splitter widget - split pane
  */
 .et2_split {
-	width: 100%;
-	min-width: 100px;
-	min-height: 100px;
-	height: 100%;
+  width: 100%;
+  min-width: 100px;
+  min-height: 100px;
+}
+.splitter-bar-vertical {
+  cursor: ew-resize;
+  width: 5px;
+}
+.splitter-bar-horizontal {
+  cursor: ns-resize;
+  height: 5px;
 }
-.splitter-bar-vertical { cursor: ew-resize; width: 5px;}
-.splitter-bar-horizontal { cursor: ns-resize; height: 5px;}
 /* Hide iframes so moving works */
-.splitter-iframe-hide { display: none;}
+.splitter-iframe-hide {
+  display: none;
+}
 .et2_split div.splitter-bar-vertical div.ui-icon {
-	position: absolute;
-	margin-left: -5px;
-	top: 45%;
+  position: absolute;
+  margin-left: -5px;
+  top: 45%;
 }
 .et2_split div.splitter-bar-horizontal div.ui-icon {
-	position: absolute;
-	margin-top: -6px;
-	left: 47%;
+  position: absolute;
+  margin-top: -6px;
+  left: 47%;
 }
 /* Make sure there's no overflow, or hidden bits still appear */
 * > .et2_split {
-	overflow: hidden;
+  overflow: hidden;
 }
-
 /**
  * Label widget, and labels for other widgets
  */
 .et2_label {
-	color: #101050;
+  color: #101050;
 }
-#msg,.message {
-	color: red;
-	font-style: italic;
+#msg,
+.message {
+  color: red;
+  font-style: italic;
 }
 input.et2_url {
-	margin-right: 6px;
-	padding-right: 8px;
+  margin-right: 6px;
+  padding-right: 8px;
 }
 a.et2_url {
-	background-position: center;
-	background-repeat: no-repeat;
-
-	cursor: pointer;
-	margin: -4px;
-	padding: 2px;
-	padding-left: 16px;
-	margin-left: -10px;
+  background-position: center;
+  background-repeat: no-repeat;
+  cursor: pointer;
+  margin: -4px;
+  padding: 2px;
+  padding-left: 16px;
+  margin-left: -10px;
 }
-
 a.et2_url.email {
-	background-image: url(images/email.png);
+  background-image: url(images/email.png);
 }
 a.et2_url.phone {
-	background-image: url(images/phone.png);
+  background-image: url(images/phone.png);
 }
 a.et2_url.url {
-	background-image: url(images/url.png);
+  background-image: url(images/url.png);
 }
-
 /**
  * Button widget - text only, and icon
  */
 .et2_button {
-	cursor: pointer;
-	text-align: center;
-
-	font-size: 9pt;
-
-	text-shadow: 1px 1px #E0E0E0;
+  cursor: pointer;
+  text-align: center;
+  font-size: 9pt;
+  text-shadow: 1px 1px #E0E0E0;
 }
-.et2_button_text, input[type=button] {
-	background-color: #E0E0E0;
-	background-image: url(images/gradient01.png);
-	background-position: center;
-	background-repeat: repeat-x;
-
-	margin: 5px;
-	padding: 3px;
-
-	border: 1px solid silver;
-	color: #101010;
+.et2_button_text,
+input[type=button] {
+  background-color: #E0E0E0;
+  background-image: url(images/gradient01.png);
+  background-position: center;
+  background-repeat: repeat-x;
+  margin: 5px;
+  padding: 3px;
+  border: 1px solid silver;
+  color: #101010;
 }
 .et2_button_icon {
-	border: none;
-	height: 16px;
-	background: transparent;
-	padding: 2px;
+  border: none;
+  background: transparent;
+  padding: 0px;
 }
-button.et2_button_text:hover, input[type=button]:hover {
-	color: #050505;
-	border: 1px solid gray;
-	background-color: #D0D0EE;
+button.et2_button_text:hover,
+input[type=button]:hover {
+  color: #050505;
+  border: 1px solid gray;
+  background-color: #D0D0EE;
 }
-button.et2_button_text:active, input[type=button]:active {
-	background-image: url(images/gradient02.png);
-	background-color: #D0D0E0;
+button.et2_button_text:active,
+input[type=button]:active {
+  background-image: url(images/gradient02.png);
+  background-color: #D0D0E0;
 }
-button.et2_button_text:focus, input[type=button]:focus {
-	border: 1px solid #2c3d6f;
-	color: #202d52;
-	outline: none;
+button.et2_button_text:focus,
+input[type=button]:focus {
+  border: 1px solid #2c3d6f;
+  color: #202d52;
+  outline: none;
 }
-
 /**
  * Drop down button
  */
 .et2_dropdown button {
-	height: 3.0ex;
-	display: inline-block;
-	vertical-align: middle;
-	margin-right: -2px;
-	padding: 0px 1ex;
+  height: 3.0ex;
+  display: inline-block;
+  vertical-align: middle;
+  margin-right: -2px;
+  padding: 0px 1ex;
 }
 .et2_dropdown button > div {
-	vertical-align: middle;
+  vertical-align: middle;
 }
 .et2_dropdown button:last-child {
-	padding: 0px
+  padding: 0px;
 }
 .et2_dropdown + ul.ui-menu {
-	position: absolute;
-	z-index: 2;
+  position: absolute;
+  z-index: 2;
 }
-
 /**
  * Color picker widget
  */
 .et2_color {
-	padding: .5ex;
-	height: 2ex;
-	width: 2ex;
-	border: 1px solid silver;
+  padding: .5ex;
+  height: 2ex;
+  width: 2ex;
+  border: 1px solid silver;
 }
-
 /**
  * Text box
  */
 .et2_textbox {
-	resize: none;
+  resize: none;
 }
 .et2_textbox_ro {
-	white-space: pre-wrap;
+  white-space: pre-wrap;
 }
-
 .et2_bold {
-	font-weight: bold;
+  font-weight: bold;
 }
-
 .et2_italic {
-	font-style: italic;
+  font-style: italic;
 }
-
 /**
  * Multi-select widget
  */
 .et2_selectbox .ui-widget-header {
-	padding: 0px 6px 0px 6px;
-	text-align: center;
-	background: white;
-	border:none;
-	color: inherit;
+  padding: 0px 6px 0px 6px;
+  text-align: center;
 }
 .et2_selectbox .ui-widget-header ul {
-	float: left;
-	margin-left: -5px;
-	text-align: left;
+  float: left;
+  margin-left: -5px;
+  text-align: left;
 }
 .et2_selectbox .ui-widget-header li {
-	float: left;
-	padding-top: 0px
+  float: left;
+  padding-top: 0px;
 }
-.et2_selectbox .ui-widget-header li>span.ui-icon {
-	float: left;
-	margin-top: -2px;
-	background-size: 1.0em;
+.et2_selectbox .ui-widget-header li > span.ui-icon {
+  float: left;
+  margin-top: -2px;
 }
-.et2_selectbox .ui-widget-header li>div.et2_link_entry {
-	/* Shrink search box to same size as header */
-	margin-top: -2px;
-	margin-bottom: -2px;
-	margin-right: 1ex;
+.et2_selectbox .ui-widget-header li > div.et2_link_entry {
+  /* Shrink search box to same size as header */
+  margin-top: -2px;
+  margin-bottom: -2px;
+  margin-right: 1ex;
 }
-.et2_selectbox .ui-widget-header li>div.et2_link_entry input {
-	height: 14px;
+.et2_selectbox .ui-widget-header li > div.et2_link_entry input {
+  height: 14px;
 }
 .et2_selectbox .ui-multiselect-checkboxes {
-	overflow-y: scroll;
-	position: relative;
-	text-align: left;
+  overflow-y: scroll;
+  position: relative;
+  text-align: left;
 }
 .et2_selectbox .ui-multiselect-checkboxes li {
-	margin: 0px;
-	clear: both;
-	padding-left: 26px;
-	padding-right: 3px;
-	text-decoration: none;
-	list-style-image: none;
-	list-style-type: none;
-	text-indent: -26px;
+  margin: 0px;
+  clear: both;
+  padding-left: 26px;
+  padding-right: 3px;
+  text-decoration: none;
+  list-style-image: none;
+  list-style-type: none;
+  text-indent: -26px;
 }
 .et2_selectbox .ui-multiselect-checkboxes ul {
-	margin: 0px auto;
-	padding-left: 0px;
-	clear:both;
-	text-decoration: none;
-	list-style-image: none;
-	list-style-type: none;
+  margin: 0px auto;
+  padding-left: 0px;
+  clear: both;
+  text-decoration: none;
+  list-style-image: none;
+  list-style-type: none;
 }
-.et2_selectbox .ui-multiselect-checkboxes ul>label {
-	border-bottom: 1px solid black;
+.et2_selectbox .ui-multiselect-checkboxes ul > label {
+  border-bottom: 1px solid black;
 }
-
 .et2_selectbox .ui-multiselect-checkboxes label {
-	display: block;
-	border: 1px solid transparent;
+  display: block;
+  border: 1px solid transparent;
 }
 .et2_selectbox input[type="checkbox"] {
-	margin: 3px 3px 3px -1px;
+  margin: 3px;
 }
 .et2_selectbox .ui-multiselect-checkboxes img {
-	height: 1.0em;
+  float: right;
+  height: 1.8em;
 }
-
 .et2_selectbox .ui-multiselect-checkboxes div.ui-icon-close {
-	visibility: hidden;
-	padding: 0px;
+  visibility: hidden;
+  padding: 0px;
 }
 .et2_selectbox .ui-multiselect-checkboxes li:hover div.ui-icon-close {
-	visibility: visible;
+  visibility: visible;
 }
-
 /* Read-only multi-select */
 ul.et2_selectbox {
-	margin: 0px;
-	padding: 0px;
+  margin: 0px;
+  padding: 0px;
 }
 .et2_selectbox li {
-	text-decoration: none;
-	list-style-image: none;
-	list-style-type: none;
+  text-decoration: none;
+  list-style-image: none;
+  list-style-type: none;
 }
-
 /**
  * Select account dialog
  */
-
 /**
  * Date / Time widgets
  */
 span.et2_date {
-	min-width: 130px;
+  min-width: 130px;
 }
 span.et2_date input.et2_date {
-	min-width: 16.5ex;
-	background-repeat: no-repeat;
-	background-position: top right;
-	background-size: contain;
+  min-width: 16.5ex;
+  background-repeat: no-repeat;
+  background-position: top right;
+  background-size: contain;
 }
 span.et2_date input.et2_time {
-	min-width: 6ex;
+  min-width: 6ex;
 }
 span.et2_date span {
-	background-position: center;
-	background-repeat: no-repeat;
-
-	color: #101010;
-	cursor: pointer;
-	padding-top: 3px;
-	padding-left: 22px;
-	text-align: center;
-
-	font-size: 9pt;
+  background-position: center;
+  background-repeat: no-repeat;
+  color: #101010;
+  cursor: pointer;
+  padding-top: 3px;
+  padding-left: 22px;
+  text-align: center;
+  font-size: 9pt;
 }
-
 /**
  * Dialog widget
  * It uses jQueryUI, so this is just our little bits - icon on left
  */
 .ui-dialog-content .dialog_icon {
-	margin-right: 2ex;
-	vertical-align: middle;
+  margin-right: 2ex;
+  vertical-align: middle;
 }
-.ui-dialog-content  {
-	vertical-align: middle;
+.ui-dialog-content {
+  vertical-align: middle;
 }
 /* These change button alignment, but it seems the standard is right-aligned for
 action buttons, left aligned for "extra" controls
@@ -398,866 +371,761 @@ action buttons, left aligned for "extra" controls
 	float: none;
 }
 */
-
-/**
+/** 
  * Diff widget
  */
-.diff thead,.author {
-	display: none;
+.diff thead,
+.author {
+  display: none;
 }
 .diff .ui-icon {
-	margin-top: -16px;
-	float: right;
+  margin-top: -16px;
+  float: right;
 }
-
 /** Display a loading icon **/
 .loading {
-	background-position: center;
-	background-repeat: no-repeat;
-	background-image: url('images/ajax-loader.gif');
+  background-position: center;
+  background-repeat: no-repeat;
+  background-image: url('images/ajax-loader.gif');
 }
-
 /**
  * File upload
  */
 .et2_file .progress {
-	width: 300px;
-	max-height: 6em;
-	overflow: auto;
-	margin-left: 20px;
+  width: 300px;
+  max-height: 6em;
+  overflow: auto;
+  margin-left: 20px;
 }
-
 .et2_file .progress span.progressBar {
-	height: 5px;
-	width: 150px;
-	max-width: 150px;
-	display: inline;
+  height: 5px;
+  width: 150px;
+  max-width: 150px;
+  display: inline;
 }
-
 /* Remove icon displayed when hovering */
 .et2_file .progress li div.remove {
-	display: none;
-	cursor: pointer;
-	margin: 0px;
+  display: none;
+  cursor: pointer;
+  margin: 0px;
 }
-
 .et2_file .progress li:hover div.remove {
-	width: 16px;
-	height: 16px;
-	float: right;
-	display: block;
-	background-image: url("images/close.png");
-	background-position: center;
-	background-repeat: no-repeat;
+  width: 16px;
+  height: 16px;
+  float: right;
+  display: block;
+  background-image: url("images/close.png");
+  background-position: center;
+  background-repeat: no-repeat;
 }
-
 .et2_file .progress p {
-	background-color: green;
-	height:5px;
-	margin: 0px;
-}
-
-.et2_file .progress li {
+  background-color: green;
+  height: 5px;
+  margin: 0px;
 }
 /* Hide progress bar when completed */
 .et2_file .progress li.success > span.progressBar {
-	display: none;
+  display: none;
 }
-
-
 /**
  * Autocomplete - used in link widget
  * Restricting result size
  */
 .ui-autocomplete {
-	max-height: 20ex;
-	overflow-y: auto;
-	/* prevent horizontal scrollbar */
-	overflow-x: hidden;
+  max-height: 20ex;
+  overflow-y: auto;
+  /* prevent horizontal scrollbar */
+  overflow-x: hidden;
 }
-
 /**
  * Autocomplete in dialogs - fix so they go over/out of the dialog
  */
 .ui-dialog * ul.ui-autocomplete {
-	position: fixed;
+  position: fixed;
 }
-
 /**
  * Link wiget(s)
  */
-
 /* Link entry - x button*/
 div.et2_link_entry {
-	white-space: nowrap;
+  white-space: nowrap;
 }
 div.et2_link_entry:after {
-	display: inline-block;
-	content: ".";
-	height: 0;
-	visibility: hidden;
-	margin: -20px;
+  display: inline-block;
+  content: ".";
+  height: 0;
+  visibility: hidden;
+  margin: -20px;
 }
 /* Special layout for inside nm grid */
 .et2_nextmatch div.et2_link_entry {
-	padding-right: 4px;
+  padding-right: 4px;
 }
 .et2_nextmatch .et2_link_entry:after {
-	margin: -12px;
+  margin: -12px;
 }
 div.et2_link_entry select {
-	width: 39%;
+  width: 39%;
 }
 div.et2_link_entry input.ui-autocomplete-input {
-	width: 61%;
-	padding-bottom: 1px;
+  width: 61%;
+  padding-bottom: 1px;
 }
 .et2_link_entry.no_app input.ui-autocomplete-input {
-	width: 100%;
+  width: 100%;
 }
 .et2_link_entry.no_app select {
-	display: none;
+  display: none;
 }
 .et2_link_entry .ui-icon-close {
-	display: inline-block;
-	background-color: inherit;
-	border: none;
-	position: relative;
-	top: 3px;
-	left: -18px;
-	cursor: pointer;
-	margin-top: -3px;
+  display: inline-block;
+  background-color: inherit;
+  border: none;
+  position: relative;
+  top: 3px;
+  left: -18px;
+  cursor: pointer;
+  margin-top: -3px;
 }
-
 /* Link to */
 .et2_link_to {
-	width: 350px;
-	overflow-x: show;
+  width: 350px;
+  overflow-x: show;
 }
 .et2_link_to button {
-	display: inline;
-	float: right;
-	height: 5ex;
+  display: inline;
+  float: right;
+  height: 5ex;
 }
 .et2_link_to span.status {
-	background-repeat: no-repeat;
-	background-position: 3px center;
-	width: 22px;
-	height: 22px;
-	display: block;
-	float: right;
+  background-repeat: no-repeat;
+  background-position: 3px center;
+  width: 22px;
+  height: 22px;
+  display: block;
+  float: right;
 }
 .et2_link_to span.status.success {
-	background-image:url(images/tick.png);
+  background-image: url(images/tick.png);
 }
 .et2_link_to span.status.error {
-	background-image:url(images/error.png);
+  background-image: url(images/error.png);
 }
 .et2_link_to .progress {
-	max-height: 12em;
-	overflow-y: scroll;
+  max-height: 12em;
+  overflow-y: scroll;
 }
 .et2_link_to .progress > .success input {
-	width: 100%;
-	margin-right: -20px; /* Leave room for remove icon */
+  width: 100%;
+  margin-right: -20px;
+  /* Leave room for remove icon */
 }
 .et2_link_to .progress li {
-	list-style: none;
-	padding-bottom: 1px;
-	padding-top: 0px;
+  list-style: none;
+  padding-bottom: 1px;
+  padding-top: 0px;
 }
 .et2_link_to .progress li.success span.ui-icon-comment {
-	display: none;
-	float: right;
-	cursor: pointer;
-	margin-right: 5px;
+  display: none;
+  float: right;
+  cursor: pointer;
+  margin-right: 5px;
 }
 .et2_link_to .progress li:hover.success span.ui-icon-comment {
-	display: inline;
+  display: inline;
 }
 .et2_link_to .et2_button_icon {
-	float: left;
-	width: 22px;
+  float: left;
+  width: 22px;
 }
-
 .et2_link {
-	cursor: pointer;
-	color: #003075;
-	text-decoration: none;
+  cursor: pointer;
+  color: #003075;
+  text-decoration: none;
 }
 .et2_link:hover {
-	text-decoration: underline;
+  text-decoration: underline;
 }
 ul.et2_link_string {
-	list-style-type: none;
-	display: inline;
-	padding: 0px;
+  list-style-type: none;
+  display: inline;
+  padding: 0px;
 }
 .et2_link_string li {
-	display: inline;
+  display: inline;
 }
 .et2_link_string li:not(:last-child):after {
-    content:           ', ';
+  content: ', ';
 }
 .et2_link_list {
-	border-collapse:collapse;
+  border-collapse: collapse;
 }
 .et2_link_list tr {
-	cursor: pointer;
+  cursor: pointer;
 }
 .et2_link_list td.remark {
-	font-style: italic;
+  font-style: italic;
 }
 .et2_link_list td div.delete {
-	visibility: hidden;
-	background-image: url("images/close.png");
-	background-position: center;
-	background-repeat: no-repeat;
-	padding: 0px;
+  visibility: hidden;
+  background-image: url("images/close.png");
+  background-position: center;
+  background-repeat: no-repeat;
+  padding: 0px;
 }
-.et2_link_list .icon img, .et2_link_list .icon {
-	width: 16px;
-	height: 16px;
-	display: inline-block;
+.et2_link_list .icon img,
+.et2_link_list .icon {
+  width: 16px;
+  height: 16px;
+  display: inline-block;
 }
 .et2_link_list tr:hover div.delete {
-	visibility: visible;
+  visibility: visible;
 }
-
-.egw_tooltip
-{
-	position: fixed;
-	border: 1px solid #897f51;
-	padding: 3px;
-	background-color: #FDF9DB;
-	max-width: 300px;
-	color: black;
+.egw_tooltip {
+  position: fixed;
+  border: 1px solid #897f51;
+  padding: 3px;
+  background-color: #FDF9DB;
+  max-width: 300px;
+  color: black;
 }
-
 /**
  * Tabs widget
  */
-
 .et2_tabflag {
-	display: inline-block;
-	margin-right: 5px;
-	padding: 5px;
-	cursor: pointer;
-	border: 1px solid silver;
-
-	background-color: #E0E0E0;
-	background-image: url(images/gradient01.png);
-	background-position: center;
-	background-repeat: repeat-x;
-
-	-webkit-user-select: none;
-	-moz-user-select: none;
-	user-select: none;
+  display: inline-block;
+  margin-right: 5px;
+  padding: 5px;
+  cursor: pointer;
+  border: 1px solid silver;
+  background-color: #E0E0E0;
+  background-image: url(images/gradient01.png);
+  background-position: center;
+  background-repeat: repeat-x;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  user-select: none;
 }
-
 .et2_tabflag:hover {
-	color: #050505;
-	border: 1px solid gray;
-	background-color: #D0D0EE;
+  color: #050505;
+  border: 1px solid gray;
+  background-color: #D0D0EE;
 }
-
 .et2_tabflag:active {
-	background-image: url(images/gradient02.png);
-	background-color: #D0D0E0;
+  background-image: url(images/gradient02.png);
+  background-color: #D0D0E0;
 }
-
 .et2_tabs {
-	border-width: 0px 1px 1px 1px;
-	border-style: solid;
-	border-color: silver;
-	padding: 5px;
-	overflow-y: auto;
+  border-width: 0px 1px 1px 1px;
+  border-style: solid;
+  border-color: silver;
+  padding: 5px;
+  overflow-y: auto;
 }
-
 .et2_tabflag.active {
-	border-bottom: 1px solid white;
-	background-color: white;
-	background-image: none;
+  border-bottom: 1px solid white;
+  background-color: white;
+  background-image: none;
 }
-
 .et2_tabheader {
-	background-image: url(images/tab_header_bg.png);
-	background-position: bottom;
-	background-repeat: repeat-x;
+  background-image: url(images/tab_header_bg.png);
+  background-position: bottom;
+  background-repeat: repeat-x;
 }
-
 /**
  * VFS widget(s)
  */
 ul.et2_vfs {
-	padding-left: 0px;
-	margin: 1px;
+  padding-left: 0px;
+  margin: 1px;
 }
 .et2_vfs li.vfsFilename {
-	display: inline;
+  display: inline;
 }
 .et2_vfs li.vfsFilename:not(:last-child):after {
-	padding: 0.25ex;
+  padding: 0.25ex;
 }
-
 /**
 * Validation
 */
 [required] {
-	background-color: #ffffd0;
+  background-color: #ffffd0;
 }
 .invalid {
-	border: 1px solid #a6261d;
-	background-color: #faecec;
+  border: 1px solid #a6261d;
+  background-color: #faecec;
 }
 .error {
-	-moz-border-radius: 0 4px 4px 0;
-	-moz-box-shadow: 0 0 6px #DDDDDD;
-	background-color: #FFFE36;
-	border: 1px solid #E1E16D;
-	color: #000000;
-	display: none;
-	font-size: 11px;
-	height: 15px;
-	padding: 4px 10px;
+  -moz-border-radius: 0 4px 4px 0;
+  -moz-box-shadow: 0 0 6px #DDDDDD;
+  background-color: #FFFE36;
+  border: 1px solid #E1E16D;
+  color: #000000;
+  display: none;
+  font-size: 11px;
+  height: 15px;
+  padding: 4px 10px;
 }
 .error p {
-	margin: 0;
+  margin: 0;
 }
-
 /**
  * hrule widget
  */
-
 hr {
-	border-style: none;
-	border-top: 1px solid silver;
-	height: 1px;
-	margin: 10px 0px 10px 0px;
+  border-style: none;
+  border-top: 1px solid silver;
+  height: 1px;
+  margin: 10px 0px 10px 0px;
 }
-
 /**
  * grid widget
  */
-
 table.et2_grid {
-	border-collapse: collapse;
+  border-collapse: collapse;
 }
-
 .et2_grid td {
-/*	border: 1px dashed silver;*/
+  /*	border: 1px dashed silver;*/
 }
 /**
  * Sortable grid
  */
-table.et2_grid tbody.ui-sortable > tr:not(.th)  {
-	cursor: ns-resize;
+table.et2_grid tbody.ui-sortable > tr:not(.th) {
+  cursor: ns-resize;
 }
-
 /**
  * Create some spacing for widgets inside labels
  */
-label input, label span, label div, label select, label textarea {
-	margin-left: 1ex;
-	margin-right: 1ex;
+label input,
+label span,
+label div,
+label select,
+label textarea {
+  margin-left: 1ex;
+  margin-right: 1ex;
 }
-
 /**
  * Message styles
  */
-
 /* Style used for a generic message (such as success messages or validation errors) */
 div.message {
-	display: block;
-	border: 1px solid gray;
-	padding: 3px 3px 3px 22px;
-	margin: 5px 0px 5px 0px;
-	-webkit-border-radius: 3px;
-	-moz-border-radius: 3px;
-	border-radius: 3px;
-	background-repeat: no-repeat;
-	background-position: 3px center;
-	clear: left;
-	max-width: 500px;
+  display: block;
+  border: 1px solid gray;
+  padding: 3px 3px 3px 22px;
+  margin: 5px 0px 5px 0px;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+  background-repeat: no-repeat;
+  background-position: 3px center;
+  clear: left;
+  max-width: 500px;
 }
-
 div.message.floating {
-	display: inline-block;
-	margin: 0px 5px 0px 5px;
+  display: inline-block;
+  margin: 0px 5px 0px 5px;
 }
-
 .message.validation_error {
-	color: #a93030;
-	font-style: italic;
-	background-color: #f3d4d0;
-	border-color: #a93030;
-	background-image:url(images/error.png);
-	background-repeat: no-repeat;
-	padding-left: 20px;
+  color: #a93030;
+  font-style: italic;
+  background-color: #f3d4d0;
+  border-color: #a93030;
+  background-image: url(images/error.png);
+  background-repeat: no-repeat;
+  padding-left: 20px;
 }
-
 .message.success {
-	font-style: normal;
-	background-color: #e5f3d0;
-	color: #98a930;
-	border-color: #9ea930;
-	background-image:url(images/tick.png);
-	background-repeat: no-repeat;
-	padding-left: 20px;
+  font-style: normal;
+  background-color: #e5f3d0;
+  color: #98a930;
+  border-color: #9ea930;
+  background-image: url(images/tick.png);
+  background-repeat: no-repeat;
+  padding-left: 20px;
 }
-
 .message.hint {
-	font-style: normal;
-	background-color: #d9e2ed;
-	border-color: #56729a;
-	color: #56729a;
-	background-image:url(images/hint.png);
-	background-repeat: no-repeat;
-	padding-left: 20px;
+  font-style: normal;
+  background-color: #d9e2ed;
+  border-color: #56729a;
+  color: #56729a;
+  background-image: url(images/hint.png);
+  background-repeat: no-repeat;
+  padding-left: 20px;
 }
-
 /**
  * Nextmatch widget
  */
-
 .et2_nextmatch {
-/*	background-color: silver;*/
+  /*	background-color: silver;*/
 }
-
 /* Left & right headers*/
 .et2_nextmatch > div > .header {
-	margin-top: -20px;
-	border: none;
+  margin-top: -20px;
+  border: none;
 }
-
 .nextmatch_header .header_count {
-	padding: 0px 20px;
-	margin: 6px 20px 0px;
-	border: 1px solid #E0E0E0;
-	float:right;
-	font-size: 150%;
-	text-align: center
+  padding: 0px 20px;
+  margin: 6px 20px 0px;
+  border: 1px solid #E0E0E0;
+  float: right;
+  font-size: 150%;
+  text-align: center;
 }
 .nextmatch_header > .filters {
-	padding-left: 5px;
+  padding-left: 5px;
 }
 .nextmatch_header > .filters select {
-	margin-right: 2ex;
+  margin-right: 2ex;
 }
 .nextmatch_header .et2_button_icon {
-	vertical-align: middle;
+  vertical-align: middle;
 }
 .nextmatch_header > .filters .et2_button_icon {
-	margin-top: 8px;
+  margin-top: 8px;
 }
 .et2_nextmatch .nextmatch_header {
-	border: none;
-	background-image: none;
-	background-color: transparent;
-	margin-bottom: 3px;
+  border: none;
+  background-image: none;
+  background-color: transparent;
+  margin-bottom: 3px;
 }
 .et2_nextmatch .nextmatch_header > .filters {
-	border: 1px solid silver;
-	background-color: #E0E0E0;
-	background-image: url(../../../phpgwapi/templates/default/images/egw_action/header_overlay.png);
-	background-position: center;
-	background-repeat: repeat-x;
-	margin-bottom: 3px;
+  border: 1px solid silver;
+  background-color: #E0E0E0;
+  background-image: url(../../../phpgwapi/templates/default/images/egw_action/header_overlay.png);
+  background-position: center;
+  background-repeat: repeat-x;
+  margin-bottom: 3px;
 }
 /* Favorites */
 .nextmatch_header div[id$=favorite_wrapper] {
-	margin-top: 6px;
-	vertical-align: middle;
+  margin-top: 6px;
+  vertical-align: middle;
 }
-#nm_favorites_popup_filters  .filter_id, #nm_favorites_popup_filters  .filter_value {
-	width: 45%;
-	display: inline-block;
+#nm_favorites_popup_filters .filter_id,
+#nm_favorites_popup_filters .filter_value {
+  width: 45%;
+  display: inline-block;
 }
 .nextmatch_header ul.favorites {
-	min-width: 20ex;
+  min-width: 20ex;
 }
 .nextmatch_header .favorites li .ui-menu .ui-menu-item a {
-	text-indent: -22px;
-	margin-left: 21px;
+  text-indent: -22px;
+  margin-left: 21px;
 }
 .nextmatch_header .favorites.ui-menu li.ui-menu-item a.ui-state-hover {
-	margin-left: 20px;
+  margin-left: 20px;
 }
 .favorites li span.ui-state-active {
-	border: none;
+  border: none;
 }
-.favorites input, .favorites img {
-	margin-right: 1ex;
+.favorites input,
+.favorites img {
+  margin-right: 1ex;
 }
 .favorites div.ui-icon-trash {
-	position: relative;
-	float:right;
-	display:none;
+  position: relative;
+  float: right;
+  display: none;
 }
 .favorites li:hover div.ui-icon {
-	display:inline-block;
+  display: inline-block;
 }
 .favorites .sideboxstar {
-	height: 9px;
-	display: inline-block;
-	padding: 0px 4px;
-	margin: 0px 5px;
-
-	/* TODO: This is template specific */
-	background-image: url(../../../phpgwapi/templates/idots/images/orange-ball.png);
+  height: 9px;
+  display: inline-block;
+  padding: 0px 4px;
+  margin: 0px 5px;
+  /* TODO: This is template specific */
+  background-image: url(../../../phpgwapi/templates/idots/images/orange-ball.png);
 }
 .sidebox-favorites ul.favorites {
-	width: 99%;
-	padding: 0px;
-	border: none;
-	background: white;
+  width: 99%;
+  padding: 0px;
+  border: none;
+  background: white;
 }
 .sidebox-favorites .ui-menu .ui-menu-item a {
-	line-height: inherit;
-	padding: 2px 0px;
+  line-height: inherit;
+  padding: 2px 0px;
 }
 .sidebox-favorites .ui-menu .ui-menu-item a:hover {
-	text-decoration: underline;
+  text-decoration: underline;
 }
-.sidebox-favorites .favorites div.ui-icon-heart{
-	position: relative;
-	float: left;
-	display:inline-block;
-	margin: -3px 1px 0px 1px;
+.sidebox-favorites .favorites div.ui-icon-heart {
+  position: relative;
+  float: left;
+  display: inline-block;
+  margin: -3px 1px 0px 1px;
 }
-.sidebox-favorites .favorites div.ui-icon-trash{
-	margin-top: -5px;
-	margin-right: 2px;
+.sidebox-favorites .favorites div.ui-icon-trash {
+  margin-top: -5px;
+  margin-right: 2px;
 }
 .nextmatch_sortheader {
-	color: #003075;
-	cursor: pointer;
-	padding-right: 10px;
-	margin-right: 10px;
-	background-repeat: no-repeat;
-	background-position: right center;
+  color: #003075;
+  cursor: pointer;
+  padding-right: 10px;
+  margin-right: 10px;
+  background-repeat: no-repeat;
+  background-position: right center;
 }
-
 .nextmatch_sortheader:hover {
-	text-decoration: underline;
+  text-decoration: underline;
 }
-
 .nextmatch_sortheader.asc {
-	font-weight: bold;
-	background-image: url(images/up.png);
+  font-weight: bold;
+  background-image: url(images/up.png);
 }
-
 .nextmatch_sortheader.desc {
-	font-weight: bold;
-	background-image: url(images/down.png);
+  font-weight: bold;
+  background-image: url(images/down.png);
 }
-
 .nextmatch_resize_helper {
-	border-right: 1px dotted gray;
-	min-height: 100%;
-	background-color: gray;
-	opacity: 0.5;
+  border-right: 1px dotted gray;
+  min-height: 100%;
+  background-color: gray;
+  opacity: 0.5;
 }
-
 /**
- * Grid / nextmatch Hierarchy
+ * Grid / nextmatch Hierarchy 
  */
 /* Make sure arrow & cell content don't overlap */
 .egwGridView_grid span.arrow {
-	margin: 6px -12px 4px 4px;
-	float: left;
-	position:relative;
+  margin: 6px -12px 4px 4px;
+  float: left;
+  position: relative;
 }
 .egwGridView_grid span.arrow ~ div.innerContainer {
-	display: inline-block;
+  display: inline-block;
 }
 /* Indent the sub-grid */
 .egwGridView_grid .egwGridView_grid {
-	margin-left: 10px;
-	border-left: 1px solid silver;
+  margin-left: 10px;
+  border-left: 1px solid silver;
 }
-/**
+/** 
  * This class' margin-right is used to line up columns at each indent level
  * Classes level_# are created programmatically with margin-right * depth
  * Margin-right = -(indent + border)
  */
-.indentation { margin-right:-11px; }
-
+.indentation {
+  margin-right: -11px;
+}
 /* End of hierarchy */
-
 /* Mangled link-to widget inside a nextmatch - used for DnD uploads */
 .et2_nextmatch * .et2_link_to {
-	position: fixed;
-	left: 0px;
-	background-color: white;
-	border: 1px gray;
-	padding: 5px;
+  position: fixed;
+  left: 0px;
+  background-color: white;
+  border: 1px gray;
+  padding: 5px;
 }
-
 .et2_clickable {
-	cursor: pointer;
+  cursor: pointer;
 }
-
 /**
  * et2_portlet
  */
 div.et2_portlet {
-	min-width: 100px;
+  min-width: 100px;
 }
 .et2_portlet .ui-widget-header {
-	margin: 0em;
-	padding-bottom: 4px;
-	padding-left: 0.2em;
+  margin: 0em;
+  padding-bottom: 4px;
+  padding-left: 0.2em;
 }
 .et2_portlet .ui-widget-header span.ui-icon {
-	display: inline-block;
-	float: right;
+  display: inline-block;
+  float: right;
 }
 .et2_portlet .ui-widget-header span.ui-icon.ui-icon-gear {
-	display: inline-block;
-	float: left;
+  display: inline-block;
+  float: left;
 }
-
 /**
  * et2_progress
  */
 div.et2_progress {
-	display: inline-block;
-	border: 1px solid black;
-	background-color: white;
-	width: 30px;
-	padding: 1px;
-	margin: 2px;
-	text-align: left;
+  display: inline-block;
+  border: 1px solid black;
+  background-color: white;
+  width: 30px;
+  padding: 1px;
+  margin: 2px;
+  text-align: left;
 }
 div.et2_progress > div {
-	background-color: #D00000;
-	height: 5px;
+  background-color: #D00000;
+  height: 5px;
 }
-
 .egwResizeOverlay {
-	position: fixed;
-	width: 100%;
-	height: 100%;
-	top: 0px;
-	left: 0px;
-	z-index: 99999;
-	cursor: ew-resize;
+  position: fixed;
+  width: 100%;
+  height: 100%;
+  top: 0px;
+  left: 0px;
+  z-index: 99999;
+  cursor: ew-resize;
 }
-
 .egwResizeHelper {
-	position: absolute;
-	display: block;
-	z-index: 99998;
-	opacity: 0.5;
-	background-color: #829cbc;
-	cursor: ew-resize;
+  position: absolute;
+  display: block;
+  z-index: 99998;
+  opacity: 0.5;
+  background-color: #829cbc;
+  cursor: ew-resize;
 }
-
 /**
  * Indent grid sublevels
  */
-
 .et2_nextmatch .subentry.level_1 div.et2_vbox {
-	margin-left: 2.5em;
+  margin-left: 2.5em;
 }
-
 .et2_nextmatch .subentry.level_2 div.et2_vbox {
-	margin-left: 5em;
+  margin-left: 5em;
 }
-
 .et2_nextmatch .subentry.level_3 div.et2_vbox {
-	margin-left: 7.5em;
+  margin-left: 7.5em;
 }
-
 /**
  * itempicker widget
  */
 .et2_itempicker {
-	display: block;
-	position: relative;
-	margin: 0;
-	padding: 0;
-	width: 100%;
-	height: 256px;
+  display: block;
+  position: relative;
+  margin: 0;
+  padding: 0;
+  width: 100%;
+  height: 256px;
 }
 .et2_itempicker_left {
-	display: block;
-	position: absolute;
-	top: 0;
-	left: 0;
-	bottom: 0;
-	width: 50px;
-	overflow: hidden;
+  display: block;
+  position: absolute;
+  top: 0;
+  left: 0;
+  bottom: 0;
+  width: 50px;
+  overflow: hidden;
 }
-
 .et2_itempicker_right {
-	display: block;
-	position: absolute;
-	margin: 0;
-	top: 0;
-	left: 49px;
-	right: 0;
-	bottom: 0;
-	border: 1px solid #b6b6b6;
-	background-color: #f9f9f9;
+  display: block;
+  position: absolute;
+  margin: 0;
+  top: 0;
+  left: 49px;
+  right: 0;
+  bottom: 0;
+  border: 1px solid #b6b6b6;
+  background-color: #f9f9f9;
 }
-
 .et2_itempicker_right_container {
-	display: block;
-	position: relative;
-	width: 100%;
-	height: 100%;
+  display: block;
+  position: relative;
+  width: 100%;
+  height: 100%;
 }
-
 .et2_itempicker_app_select {
-	list-style-type: none;
-	padding: 0;
+  list-style-type: none;
+  padding: 0;
 }
-
 .et2_itempicker_app_select li {
-	display: block;
-	margin: 0;
-	padding: 6px;
+  display: block;
+  margin: 0;
+  padding: 6px;
 }
-
 .et2_itempicker_app_select li.selected {
-	border: 1px solid #b6b6b6;
-	border-right: 1px solid transparent;
-	background-color: #f9f9f9;
-	border-top-left-radius: 4px;
-	border-bottom-left-radius: 4px;
+  border: 1px solid #b6b6b6;
+  border-right: 1px solid transparent;
+  background-color: #f9f9f9;
+  border-top-left-radius: 4px;
+  border-bottom-left-radius: 4px;
 }
-
 .et2_itempicker_search {
-	display: inline-block;
-	margin: 1em;
-	margin-bottom: 0;
-	margin-right: 0;
-	width: 67%;
-	padding: 0.2em;
+  display: inline-block;
+  margin: 1em;
+  margin-bottom: 0;
+  margin-right: 0;
+  width: 67%;
+  padding: 0.2em;
 }
-
 .et2_itempicker_clear {
-	position: relative;
-	top: 3px;
-	left: -20px;
+  position: relative;
+  top: 3px;
+  left: -20px;
 }
-
 .et2_itempicker_button_action {
-	position: absolute;
-	margin: 1em;
-	top: 0;
-	right: 0;
+  position: absolute;
+  margin: 1em;
+  top: 0;
+  right: 0;
 }
-
 .et2_itempicker_itemlist {
-	display: block;
-	border: 1px solid #b6b6b6;
-	margin: 1em;
-	margin-bottom: 0;
-	padding: 0;
-	height: 67%;
-	background-color: #ffffff;
-	overflow: auto;
+  display: block;
+  border: 1px solid #b6b6b6;
+  margin: 1em;
+  margin-bottom: 0;
+  padding: 0;
+  height: 67%;
+  background-color: #ffffff;
+  overflow: auto;
 }
-
 .et2_itempicker_itemlist ul {
-	margin: 0;
-	padding: 0;
-	list-style-type: none;
+  margin: 0;
+  padding: 0;
+  list-style-type: none;
 }
-
 .et2_itempicker_itemlist li {
-	display: block;
-	margin: 0;
-	padding: 4px;
-	color: #284d8a;
-	-webkit-touch-callout: none;
-	-webkit-user-select: none;
-	-khtml-user-select: none;
-	-moz-user-select: none;
-	-ms-user-select: none;
-	user-select: none;
+  display: block;
+  margin: 0;
+  padding: 4px;
+  color: #284d8a;
+  -webkit-touch-callout: none;
+  -webkit-user-select: none;
+  -khtml-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
 }
-
 .et2_itempicker_itemlist li.row_on {
-	background-color: #f2f9fe;
+  background-color: #f2f9fe;
 }
-
 .et2_itempicker_itemlist li.selected {
-	color: #ffffff;
-	background-color: #3875d7;
+  color: #ffffff;
+  background-color: #3875d7;
 }
-
 /**
  * et2_dialog: EGroupware left aligns all buttons, but [Delete]
  */
 div.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset {
-	float: left;
+  float: left;
 }
 div.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button {
-	float: left;
-	margin-right: 1em;
-}
-div.ui-dialog .ui-dialog-content div {
-	white-space: pre-wrap;
-	display: inline-block;
+  float: left;
+  margin-right: 1em;
 }
 .et2_prompt #message {
-	white-space: pre-wrap;
-	padding-bottom: 10px;
+  white-space: pre-wrap;
+  padding-bottom: 10px;
 }
 .et2_prompt #value {
-	width: 100%;
+  width: 100%;
 }
-
-.et2_toolbar {
-	padding: 2px;
-	display: inline-block;
-}
-.et2_toolbar > * {
-	display: inline-block;
-}
-/**
- * egroupware has its own icons for these - override the images
- */
-
-span.ui-icon-check, div.ui-icon-check, .ui-widget-header .ui-icon-check {
-	background-image: url(images/check.png);
-	background-position: 0px;
-}
-span.ui-icon-search, div.ui-icon-search, .ui-widget-header .ui-icon-search, .ui-widget-content .ui-icon-search  {
-	background-image: url(images/search.png);
-	background-position: 0px;
-}
-
 /**
 * et2_taglist
 */
-.ms-ctn,.ms-res-ctn {
-	/* It doesn't really work smaller than this */
-	min-width: 150px;
+.ms-ctn,
+.ms-res-ctn {
+  /* It doesn't really work smaller than this */
+  min-width: 150px;
 }
 .ms-ctn .loading {
-	position: relative;
-	margin: 0px auto -16px auto;
-	top: 5px;
+  position: relative;
+  margin: 0px auto -16px auto;
+  top: 5px;
 }
 .ms-res-ctn {
-	overflow-x: hidden;
+  overflow-x: hidden;
 }
-
-
-/**
- * Apparently Safari needs this for native DnD
- * Used by action system.
- */
-[draggable] {
-	-khtml-user-drag: element;
-	-webkit-user-drag: element;
-	-khtml-user-select: none;
-	-moz-user-select: none;
-	-webkit-user-select: none;
-	user-select: none;
-}
\ No newline at end of file
diff --git a/importexport/templates/default/export_dialog.xet b/importexport/templates/default/export_dialog.xet
index 30f26f10aa..b0380706d3 100644
--- a/importexport/templates/default/export_dialog.xet
+++ b/importexport/templates/default/export_dialog.xet
@@ -153,16 +153,16 @@
 						</tabpanels>
 					</tabbox>
 				</row>
-				<row class="save_definition">
+				<row class="save_definition dialog-operators high">
 					<checkbox label="Save as definition" id="save_as_definition"/>
 				</row>
-				<row>
+				<row class="dialog-footer-toolbar">
 					<hbox span="all">
 						<hbox>
-							<button label="Export" id="export"/>
-							<button label="Preview" id="preview" onclick="app.importexport.export_preview"/>
+							<button label="Export" id="export" image="export" background_image="1"/>
+							<button label="Preview" id="preview" onclick="app.importexport.export_preview" image="prieview" background_image="1"/>
 						</hbox>
-						<button align="right" label="Cancel" id="cancel" onclick="window.close(); return false;"/>
+						<button class="cancel" align="right" label="Cancel" id="cancel" onclick="window.close(); return false;" image="cancel" background_image="1"/>
 					</hbox>
 				</row>
 				<row>
diff --git a/importexport/templates/pixelegg/app.css b/importexport/templates/pixelegg/app.css
new file mode 100755
index 0000000000..1a4b7e101d
--- /dev/null
+++ b/importexport/templates/pixelegg/app.css
@@ -0,0 +1,51 @@
+/**
+ * EGroupware: CSS with less preprocessor
+ *
+ * Please do NOT change app.css directly, instead change app.less and compile it!
+
+ * Dialog Import Export
+ *
+ * @link http://www.egroupware.org
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @author Stefan Reinhard <stefan.reinhard@pixelegg.de>
+ * @package projectmanager
+ * @version $Id$
+ */
+div.preview {
+  position: absolute;
+  top: 0px;
+  left: 0px;
+  width: 97%;
+  height: 95%;
+  overflow: hidden;
+  background-color: white;
+  z-index: 999;
+  display: none;
+  border: 1px solid black;
+  margin: 1.5%;
+}
+div.preview .content {
+  overflow: auto;
+  max-height: 99%;
+  display: block;
+}
+.preview_box .header,
+.preview .header {
+  font-size: 150%;
+  margin-bottom: 5px;
+  padding: 5px;
+  border-bottom: 1px outset;
+}
+.preview tr {
+  vertical-align: top;
+}
+.preview div[id$='buttons'] {
+  position: absolute;
+  bottom: 0px;
+  width: 100%;
+  margin-left: 50%;
+}
+/*     Dialog Import Export      */
+#importexport-export_dialog {
+  margin: 1em;
+}
diff --git a/importexport/templates/pixelegg/app.less b/importexport/templates/pixelegg/app.less
new file mode 100755
index 0000000000..6028d204f5
--- /dev/null
+++ b/importexport/templates/pixelegg/app.less
@@ -0,0 +1,22 @@
+/**
+ * EGroupware: CSS with less preprocessor
+ *
+ * Please do NOT change app.css directly, instead change app.less and compile it!
+
+ * Dialog Import Export
+ *
+ * @link http://www.egroupware.org
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @author Stefan Reinhard <stefan.reinhard@pixelegg.de>
+ * @package projectmanager
+ * @version $Id$
+ */
+
+@import (reference) "../../../pixelegg/less/def_buttons.less";
+@import (reference) "../../../pixelegg/less/def_design_pattern_color_font_shadow.less";
+@import (less) "../default/app.css";
+
+
+/*     Dialog Import Export      */
+
+#importexport-export_dialog {margin: 1em;}
\ No newline at end of file
diff --git a/infolog/templates/default/edit.xet b/infolog/templates/default/edit.xet
index 7c7ae0bd9f..a53b4f14a0 100644
--- a/infolog/templates/default/edit.xet
+++ b/infolog/templates/default/edit.xet
@@ -181,7 +181,7 @@
 							<menupopup statustext="Type of the log-entry: Note, Phonecall or ToDo" id="info_type" no_lang="1" onchange="1"/>
 						</menulist>
 					</hbox>
-					<textbox type="integer" id="info_number" readonly="true" span="2" class="infolog_infoId"/>
+					<textbox type="integer" id="info_number" readonly="true" span="4" class="infolog_infoId"/>
 				</row>
 				<row class="row dialog-header" valign="top">
 					<description value="Contact" for="info_from"/>
@@ -278,7 +278,7 @@
 					</vbox>
 				</row>
 				<row class="dialog-footer-toolbar">
-					<hbox span="3">
+					<hbox span="2">
 						<button statustext="Saves this entry" label="Save" id="button[save]" image="save" background_image="1"/>
 						<button statustext="Apply the changes" label="Apply" id="button[apply]" image="apply" background_image="1"/>
 						<button statustext="leave without saveing the entry" label="Cancel" id="button[cancel]" onclick="window.close();" image="cancel" background_image="1"/>
@@ -287,8 +287,9 @@
 						</menulist>
 					</hbox>
 					<description/>
-					<hbox span="2">
-						<checkbox label="Do not notify of these changes" id="no_notifications" span="2"/>
+                                        
+					<hbox span="3">
+						<checkbox label="Do not notify of these changes" id="no_notifications" span="3"/>
 						<button align="right" statustext="delete this entry" label="Delete" id="button[delete]" onclick="return $cont[info_anz_subs] || confirm('Delete this entry');" image="delete" background_image="1"/>
 					</hbox>
 				</row>