diff --git a/api/src/Framework/Login.php b/api/src/Framework/Login.php
index bc77f491a9..5c32974627 100644
--- a/api/src/Framework/Login.php
+++ b/api/src/Framework/Login.php
@@ -315,13 +315,13 @@ class Login
 		$counter = 1;
 		if (is_array($data))
 		{
-			foreach ($data['apps'] as $app)
+			foreach ($data['apps'] as $id => $app)
 			{
 				$icon = strpos($app['icon'], "/") === 0 ? $GLOBALS['egw_info']['server']['webserver_url'].$app['icon'] : $app['icon'];
 				$icon2 = strpos($app['icon2'], "/") === 0 ? $GLOBALS['egw_info']['server']['webserver_url'].$app['icon2'] : $app['icon2'];
 				$icon3 = strpos($app['icon3'], "/") === 0 ? $GLOBALS['egw_info']['server']['webserver_url'].$app['icon3'] : $app['icon3'];
 				$title = lang($app['title']);
-				$nodes .= '<div class="app" style="animation:login-apps '.$counter*0.1.'s ease-out">'
+				$nodes .= '<div class="app" style="animation:login-apps '.$counter*0.1.'s ease-out" data-id="'.$id.'">'
 					.'<a href="'.htmlspecialchars($app['url']).'" title="'.htmlspecialchars($title).'" class="" target="blank">'
 					.'<img class="icon" src="'.htmlspecialchars($icon).'"/></a>'
 					.'<div class="tooltip">'
diff --git a/pixelegg/css/mobile.css b/pixelegg/css/mobile.css
index cfe9029550..5d1336973e 100644
--- a/pixelegg/css/mobile.css
+++ b/pixelegg/css/mobile.css
@@ -80,6 +80,7 @@
   html[data-darkmode='1'] #blueimp-gallery ol,
   html[data-darkmode='1'] iframe,
   html[data-darkmode='1'] #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category_active,
+  html[data-darkmode='1'] #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category_content,
   html[data-darkmode='1'] video,
   html[data-darkmode='1'] #loginMainDiv,
   html[data-darkmode='1'] .et2_taglist_tags_icon {
@@ -134,7 +135,7 @@
   }
   html[data-darkmode='1'] #mail_sidebox_header.egw_fw_ui_sidemenu_entry_header_active,
   html[data-darkmode='1'] #mail_sidebox_header {
-    border-color: #5db9ec!important;
+    border-color: #5db9ec !important;
   }
   html[data-darkmode='1'] #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header #mail-egw_fw_ui_tab_header.egw_fw_ui_tab_header_active {
     border-top-color: #5db9ec !important;
@@ -239,7 +240,7 @@
     display: inline-block;
     /*border: 1px solid cornflowerblue;*/
     border: 1px solid rgba(0, 0, 0, 0.15);
-    background-color: #e6e6e6;
+    background-color: #E6E6E6;
   }
   .et2_placeholder .et2_attr {
     color: #000000;
@@ -248,7 +249,7 @@
  * Label widget, and labels for other widgets
  */
   .et2_label {
-    color: #1e1e1e;
+    color: #1E1E1E;
     white-space: pre-wrap;
   }
   /**
@@ -295,7 +296,7 @@
     -moz-transition-timing-function: linear;
     -o-transition-timing-function: linear;
     transition-timing-function: linear;
-    background-color: #e6e6e6;
+    background-color: #E6E6E6;
   }
   .et2_button_icon {
     height: 16px;
@@ -304,13 +305,13 @@
   /* give the image a button lock and feel*/
   img.et2_button_icon[src*="svg"] {
     background-color: #b4b4b4;
-    background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjYjRiNGI0IiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjYjRiNGI0IiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=);
-    background-image: -moz-linear-gradient(top, #b4b4b4, #b4b4b4);
-    background-image: -ms-linear-gradient(top, #b4b4b4, #b4b4b4);
-    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#b4b4b4), to(#b4b4b4));
-    background-image: -webkit-linear-gradient(top, #b4b4b4, #b4b4b4);
-    background-image: -o-linear-gradient(top, #b4b4b4, #b4b4b4);
-    background-image: linear-gradient(top, #b4b4b4, #b4b4b4);
+    background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjQjRCNEI0IiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjQjRCNEI0IiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=);
+    background-image: -moz-linear-gradient(top, #B4B4B4, #B4B4B4);
+    background-image: -ms-linear-gradient(top, #B4B4B4, #B4B4B4);
+    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#B4B4B4), to(#B4B4B4));
+    background-image: -webkit-linear-gradient(top, #B4B4B4, #B4B4B4);
+    background-image: -o-linear-gradient(top, #B4B4B4, #B4B4B4);
+    background-image: linear-gradient(top, #B4B4B4, #B4B4B4);
     background-repeat: repeat-x;
   }
   img.et2_button_icon[src*="svg"]:hover {
@@ -354,13 +355,13 @@
     min-width: 21.5ex;
   }
   span.et2_date span {
-    color: #ffffff;
+    color: #FFFFFF;
   }
   span.et2_date_duration {
-    border: 1px solid #e6e6e6;
+    border: 1px solid #E6E6E6;
   }
   span.et2_date_duration :not(input:first-child) {
-    border-left: 1px solid #f2f2f2;
+    border-left: 1px solid #F2F2F2;
   }
   .ui-datepicker .ui-datepicker-buttonpane button[data-handler="today"] {
     background-image: url(../images/bullet.svg);
@@ -394,20 +395,20 @@
     background-image: url("../images/delete.svg");
   }
   .et2_file .progress p {
-    background-color: #ffdd73;
+    background-color: #FFDD73;
   }
   span.et2_file_span {
     background-image: url(../images/attach.svg);
   }
   span.et2_file_span img[url*="svg"] {
     background-color: #b4b4b4 !important;
-    background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjYjRiNGI0IiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjYjRiNGI0IiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=) !important;
-    background-image: -moz-linear-gradient(top, #b4b4b4, #b4b4b4) !important;
-    background-image: -ms-linear-gradient(top, #b4b4b4, #b4b4b4) !important;
-    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#b4b4b4), to(#b4b4b4)) !important;
-    background-image: -webkit-linear-gradient(top, #b4b4b4, #b4b4b4) !important;
-    background-image: -o-linear-gradient(top, #b4b4b4, #b4b4b4) !important;
-    background-image: linear-gradient(top, #b4b4b4, #b4b4b4) !important;
+    background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjQjRCNEI0IiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjQjRCNEI0IiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=) !important;
+    background-image: -moz-linear-gradient(top, #B4B4B4, #B4B4B4) !important;
+    background-image: -ms-linear-gradient(top, #B4B4B4, #B4B4B4) !important;
+    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#B4B4B4), to(#B4B4B4)) !important;
+    background-image: -webkit-linear-gradient(top, #B4B4B4, #B4B4B4) !important;
+    background-image: -o-linear-gradient(top, #B4B4B4, #B4B4B4) !important;
+    background-image: linear-gradient(top, #B4B4B4, #B4B4B4) !important;
     background-repeat: repeat-x !important;
     fill: red !important;
   }
@@ -418,7 +419,7 @@
     box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6) !important;
   }
   div.et2_file input.et2_file_upload {
-    background-color: #ffffff !important;
+    background-color: #FFFFFF !important;
     -webkit-border-radius: 3px;
     -moz-border-radius: 3px;
     border-radius: 3px;
@@ -436,25 +437,25 @@
   }
   /* Gantt widget */
   .et2_gantt .gantt_task_line {
-    background-color: #679fd2;
+    background-color: #679FD2;
   }
   .et2_gantt .gantt_task_line .gantt_task_content {
-    color: #043a6b;
+    color: #043A6B;
   }
   .et2_gantt .gantt_task_line .gantt_selected {
     background-color: rgba(255, 194, 0, 0.01);
   }
   .et2_gantt .gantt_task_line .gantt_task_progress {
-    color: #043a6b;
-    background-color: #ffdd73;
+    color: #043A6B;
+    background-color: #FFDD73;
     /* outline progress in a complementary color */
-    border: 1px solid #bf9d30;
+    border: 1px solid #BF9D30;
     border-right: none;
     margin: -1px;
   }
   .et2_gantt .gantt_task_line.gantt_milestone {
     background-color: #ffc200;
-    border-color: #bf9d30;
+    border-color: #BF9D30;
   }
   .et2_gantt .gantt_task_link .gantt_line_wrapper div {
     background-color: green;
@@ -469,16 +470,16 @@
     box-shadow: 0 0 5px 0 green;
   }
   .et2_gantt .gantt_task_link.invalid_constraint .gantt_line_wrapper div {
-    background-color: #ae1d00;
+    background-color: #AE1D00;
   }
   .et2_gantt .gantt_task_link.invalid_constraint .gantt_link_arrow_left {
-    border-right-color: #ae1d00;
+    border-right-color: #AE1D00;
   }
   .et2_gantt .gantt_task_link.invalid_constraint .gantt_link_arrow_right {
-    border-left-color: #ae1d00;
+    border-left-color: #AE1D00;
   }
   .et2_gantt .gantt_task_link.invalid_constraint:hover .gantt_line_wrapper div {
-    box-shadow: 0 0 5px 0 #ae1d00;
+    box-shadow: 0 0 5px 0 #AE1D00;
   }
   /*
         Link to / Selector Widget
@@ -512,7 +513,7 @@
     background-size: contain;
   }
   .et2_link {
-    color: #0c5da5;
+    color: #0C5DA5;
   }
   .et2_link_list tr {
     cursor: pointer;
@@ -610,7 +611,7 @@
 */
   .et2_required,
   [required] {
-    background-color: #ffdd73;
+    background-color: #FFDD73;
     -webkit-border-top-right-radius: 3px;
     -webkit-border-bottom-right-radius: 3px;
     -webkit-border-bottom-left-radius: 3px;
@@ -629,7 +630,7 @@
  * hrule widget
  */
   hr {
-    border-top: 1px solid #e6e6e6;
+    border-top: 1px solid #E6E6E6;
   }
   /**
  * grid widget
@@ -680,7 +681,7 @@
     background-color: transparent;
   }
   .et2_nextmatch .egwGridView_outer thead tr > th:first-child {
-    border-left: 6px solid #b4b4b4;
+    border-left: 6px solid #B4B4B4;
   }
   .et2_nextmatch .nextmatch_header {
     padding: 0;
@@ -699,7 +700,7 @@
 ################################################################*/
   .nextmatch_header_row .et2_label select {
     margin-left: 3px;
-    border-color: #cdcdcd;
+    border-color: #CDCDCD;
   }
   .nextmatch_header_row > .filters {
     /*width: 83%;*/
@@ -748,7 +749,7 @@
     margin-right: 2ex;
     width: 15%;
     border: 1px solid rgba(0, 0, 0, 0.15);
-    border-color: #b4b4b4;
+    border-color: #B4B4B4;
     -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
     -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
     box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
@@ -767,7 +768,7 @@
     outline: 0;
     border-width: 1px;
     border-style: solid;
-    border-color: #b4b4b4;
+    border-color: #B4B4B4;
     -webkit-box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1);
     -moz-box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1);
     box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1);
@@ -856,7 +857,7 @@
     vertical-align: middle;
     margin-right: -2px;
     padding: 0px 1ex;
-    background-color: #ffffff;
+    background-color: #FFFFFF;
     background-image: none;
   }
   .et2_dropdown button img {
@@ -893,7 +894,7 @@
     background-color: #b3e4a6;
   }
   .et2_dropdown button.ui-state-hover {
-    background-color: #e6e6e6;
+    background-color: #E6E6E6;
   }
   .sidebox-favorites ul.favorites {
     width: 99%;
@@ -1004,7 +1005,7 @@
     position: relative;
   }
   div.et2_progress > div {
-    background-color: #ffdd73;
+    background-color: #FFDD73;
     /*height: 5px;*/
   }
   /**
@@ -1021,7 +1022,7 @@
  * et2_textbox
  */
   textarea.et2_textbox {
-    border: 1px solid #e6e6e6;
+    border: 1px solid #E6E6E6;
   }
   textarea,
   textarea.description {
@@ -1224,9 +1225,9 @@ option:checked {
   position: absolute;
   z-index: 9999;
   max-width: 300px;
-  -webkit-box-shadow: 0 0 5px #aaaaaa;
-  -moz-box-shadow: 0 0 5px #aaaaaa;
-  box-shadow: 0 0 5px #aaaaaa;
+  -webkit-box-shadow: 0 0 5px #aaa;
+  -moz-box-shadow: 0 0 5px #aaa;
+  box-shadow: 0 0 5px #aaa;
 }
 /* Component containers
 ----------------------------------*/
@@ -1259,7 +1260,7 @@ option:checked {
   border-right: solid 1px 0px !important;
   border-bottom: solid 1px 0px !important;
   /*.gradient_thead !important;*/
-  background-color: #0c5da5;
+  background-color: #0C5DA5;
   /*border-color: @gray_10;*/
   color: #000000;
   font-weight: bold;
@@ -1278,7 +1279,7 @@ option:checked {
   border-left: solid 1px 1px;
   border-right: solid 1px 1px;
   border-bottom: solid 1px 1px;
-  border-color: #b4b4b4;
+  border-color: #B4B4B4;
   background: transparent;
   font-weight: normal;
   color: #1a1a1a;
@@ -1305,14 +1306,14 @@ option:checked {
 .ui-state-focus,
 .ui-widget-header .ui-state-focus,
 .ui-widget-content .ui-state-focus {
-  border-color: #e6e6e6;
+  border-color: #E6E6E6;
   background: rgba(102, 153, 204, 0.7);
   background-image: none;
-  color: #ffffff;
+  color: #FFFFFF;
   font-weight: normal;
 }
 .ui-state-focus.ui-menu-item a {
-  color: #e6e6e6;
+  color: #E6E6E6;
 }
 .ui-state-hover,
 .ui-widget-content .ui-state-hover,
@@ -1321,7 +1322,7 @@ option:checked {
   border-left: solid 1px 1px;
   border-right: solid 1px 1px;
   border-bottom: solid 1px 1px;
-  border-color: #e6e6e6;
+  border-color: #E6E6E6;
   background: rgba(102, 153, 204, 0.7);
   background-image: none;
   color: #ffffff;
@@ -1340,7 +1341,7 @@ option:checked {
   border-left: solid 1px 1px;
   border-right: solid 1px 1px;
   border-bottom: solid 1px 1px;
-  border-color: #cdcdcd;
+  border-color: #CDCDCD;
   background-image: none;
   font-weight: bold;
   color: #808080;
@@ -1360,7 +1361,7 @@ option:checked {
   border-left: solid 1px 1px;
   border-right: solid 1px 1px;
   border-bottom: solid 1px 1px;
-  border-color: #b4b4b4;
+  border-color: #B4B4B4;
   color: #808080;
 }
 .ui-state-highlight a,
@@ -1375,27 +1376,27 @@ option:checked {
   border-left: solid 1px 1px;
   border-right: solid 1px 1px;
   border-bottom: solid 1px 1px;
-  border-color: #e6e6e6;
+  border-color: #E6E6E6;
   color: #b3b3b3;
 }
 .ui-state-error a,
 .ui-widget-content .ui-state-error a {
-  color: #ff0000;
+  color: #FF0000;
 }
 .ui-state-error-text,
 .ui-widget-content .ui-state-error-text,
 .ui-widget-header .ui-state-error-text {
-  color: #ff0000;
+  color: #FF0000;
 }
 .drop-hover {
-  background-color: #ffdd73;
+  background-color: #FFDD73;
 }
 .ui-icon-close {
   /*visibility: hidden;*/
   /*background-image: url(../images/search.png);*/
   background-image: url("../images/cancel.svg");
   background-repeat: no-repeat;
-  background-color: #ffffff;
+  background-color: #FFFFFF;
   background-size: 12px 12px;
   width: 16px;
   height: 16px;
@@ -1425,15 +1426,15 @@ span.ui-icon-close {
 .ui-icon-closethick {
   background-image: url(../images/close.svg) !important;
   background-repeat: no-repeat;
-  background-color: #ffffff;
+  background-color: #FFFFFF;
   background-size: contain;
   background-position: 0 0 !important;
   color: #ffffff;
   height: 16px;
 }
 .ui-icon-closethick:hover {
-  background-color: #e6e6e6;
-  color: #1e1e1e;
+  background-color: #E6E6E6;
+  color: #1E1E1E;
   -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
   -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
   box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
@@ -1469,7 +1470,7 @@ span.ui-icon-close {
 /*###########################################*/
 /* col selection */
 span.ui-multiselect-header {
-  color: #ffffff;
+  color: #FFFFFF;
 }
 span.ui-icon-search {
   background-image: url(../images/search.svg) !important;
@@ -1508,30 +1509,30 @@ span.ui-icon-search {
 /*###########################################*/
 /*Dialog: edit row*/
 .ui-widget-overlay {
-  background: #cdcdcd;
+  background: #CDCDCD;
 }
 .ui-dialog {
   z-index: 1000;
-  box-shadow: -2px 1px 9px 3px #b4b4b4;
+  box-shadow: -2px 1px 9px 3px #B4B4B4;
 }
 .ui-dialog .ui-dialog-buttonpane {
-  padding-left: .8em;
-  padding-right: .8em;
+  padding-left: 0.8em;
+  padding-right: 0.8em;
   padding-top: 0.7em;
 }
 .ui-dialog .ui-dialog-titlebar {
-  padding-left: .8em;
-  padding-right: .8em;
+  padding-left: 0.8em;
+  padding-right: 0.8em;
   font-size: 12pt;
   border: none;
   font-weight: normal;
   background: white;
 }
 .ui-dialog .ui-dialog-titlebar-close {
-  right: .8em;
+  right: 0.8em;
 }
 .ui-widget-content {
-  border: 1px solid #b4b4b4;
+  border: 1px solid #B4B4B4;
 }
 .ui-widget-content .et2_selectbox button.et2_button_text,
 .ui-widget-content .et2_selectbox select.et2_selectbox {
@@ -1562,35 +1563,35 @@ button.ui-button {
   -moz-transition-timing-function: linear;
   -o-transition-timing-function: linear;
   transition-timing-function: linear;
-  background-color: #e6e6e6;
+  background-color: #E6E6E6;
   padding-left: 30px;
   background-position: 6px center;
   background-repeat: no-repeat;
   background-size: 20px auto;
   /*.Button_size_h32_auto;*/
   height: 24px;
-  border-color: #b4b4b4;
+  border-color: #B4B4B4;
   outline: none;
 }
 button.ui-button:hover {
-  background-color: #b4b4b4;
-  color: #1e1e1e;
+  background-color: #B4B4B4;
+  color: #1E1E1E;
 }
 button.ui-button .ui-button-icon-primary:hover {
-  background-color: #b4b4b4;
-  color: #1e1e1e;
+  background-color: #B4B4B4;
+  color: #1E1E1E;
   box-shadow: none;
 }
 /*###########################################*/
 /*Dialog: calendar edit series*/
 .ui-dialog-buttonset button.ui-button-text-only {
-  background-color: #cdcdcd;
+  background-color: #CDCDCD;
   background: inherit;
   color: #000000 !important;
   font-weight: normal !important;
 }
 .ui-dialog-buttonset button.ui-button-text-only:hover {
-  background-color: #b4b4b4;
+  background-color: #B4B4B4;
 }
 .ui-dialog-buttonset button.ui-button {
   /*.border_normal;*/
@@ -1610,7 +1611,7 @@ button.ui-button .ui-button-icon-primary:hover {
   -moz-transition-timing-function: linear;
   -o-transition-timing-function: linear;
   transition-timing-function: linear;
-  background-color: #e6e6e6;
+  background-color: #E6E6E6;
   padding-left: 30px;
   background-position: 6px center;
   background-repeat: no-repeat;
@@ -1619,8 +1620,8 @@ button.ui-button .ui-button-icon-primary:hover {
   height: 24px;
 }
 .ui-dialog-buttonset button.ui-button:hover {
-  background-color: #b4b4b4;
-  color: #1e1e1e;
+  background-color: #B4B4B4;
+  color: #1E1E1E;
 }
 /*###########################################*/
 /*Dialog: calendar edit series*/
@@ -1628,7 +1629,7 @@ div#ui-datepicker-div {
   -webkit-border-radius: 3px;
   -moz-border-radius: 3px;
   border-radius: 3px;
-  border: 1px solid #b4b4b4;
+  border: 1px solid #B4B4B4;
   -webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
   -moz-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
   box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
@@ -1649,8 +1650,8 @@ div#ui-datepicker-div {
   border: 1px solid #b4b4b4;
 }
 .ui-datepicker table.ui-datepicker-calendar .ui-state-active {
-  background-color: #0c5da5;
-  color: #ffffff;
+  background-color: #0C5DA5;
+  color: #FFFFFF;
 }
 .ui-datepicker div.ui-timepicker-div {
   padding: 3px;
@@ -1673,17 +1674,17 @@ div#ui-datepicker-div {
   font-size: 0.9em;
 }
 .ui-datepicker div.ui-timepicker-div div.ui_tpicker_hour_slider span.ui-slider-handle {
-  background-color: #0c5da5;
+  background-color: #0C5DA5;
   padding: 1px;
   outline: none;
 }
 .ui-datepicker div.ui-timepicker-div div.ui_tpicker_minute_slider span.ui-slider-handle {
-  background-color: #0c5da5;
+  background-color: #0C5DA5;
   padding: 1px;
   outline: none;
 }
 .ui-datepicker div.ui-datepicker-buttonpane {
-  background-color: #679fd2;
+  background-color: #679FD2;
 }
 .ui-datepicker button.ui-datepicker-current .ui-state-hover {
   background-color: #b3e4a6 !important;
@@ -2056,6 +2057,9 @@ div#loginMainDiv.stockLoginBackground div#centerBox form {
 #loginMainDiv div#login_footer .apps .app span {
   display: none;
 }
+#loginMainDiv div#login_footer .apps .app[data-id="guacamole"] .content img.icon2-bg {
+  right: 15px;
+}
 #loginMainDiv div#login_footer .apps .tooltip {
   display: inline-flex;
   position: absolute;
@@ -2135,6 +2139,7 @@ div#loginMainDiv.stockLoginBackground div#centerBox form {
   z-index: 100;
   padding: 0;
   width: 280px;
+  border-radius: 5px;
 }
 #loginMainDiv div#centerBox .egw_logo {
   width: 24px;
@@ -2155,6 +2160,7 @@ div#loginMainDiv.stockLoginBackground div#centerBox form {
   background-color: white;
   padding: 1em;
   border: 1px solid #cdcdce;
+  border-radius: 5px;
 }
 #loginMainDiv div#centerBox form .hiddenCredential {
   display: none;
@@ -2170,28 +2176,28 @@ div#loginMainDiv.stockLoginBackground div#centerBox form {
 }
 #loginMainDiv div#centerBox form table.divLoginbox div.LoginPasswordImage {
   background-color: #b3ad54;
-  background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjZmZjMjAwIiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjNDA4ZGQyIiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=);
-  background-image: -moz-linear-gradient(top, #ffc200, #408dd2);
-  background-image: -ms-linear-gradient(top, #ffc200, #408dd2);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffc200), to(#408dd2));
-  background-image: -webkit-linear-gradient(top, #ffc200, #408dd2);
-  background-image: -o-linear-gradient(top, #ffc200, #408dd2);
-  background-image: linear-gradient(top, #ffc200, #408dd2);
+  background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjZmZjMjAwIiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjNDA4REQyIiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=);
+  background-image: -moz-linear-gradient(top, #ffc200, #408DD2);
+  background-image: -ms-linear-gradient(top, #ffc200, #408DD2);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffc200), to(#408DD2));
+  background-image: -webkit-linear-gradient(top, #ffc200, #408DD2);
+  background-image: -o-linear-gradient(top, #ffc200, #408DD2);
+  background-image: linear-gradient(top, #ffc200, #408DD2);
   background-repeat: repeat-x;
 }
 #loginMainDiv div#centerBox form table.divLoginbox div.LoginPasswordImage img.passwordImage {
   margin: 0 auto;
   max-width: 400px;
   border-top: solid 1px 5px;
-  border-left: solid 1px #eeeeee;
-  border-right: solid 1px #eeeeee;
-  border-bottom: solid 1px #eeeeee;
+  border-left: solid 1px #EEE;
+  border-right: solid 1px #EEE;
+  border-bottom: solid 1px #EEE;
 }
 #loginMainDiv div#centerBox form table.divLoginbox div.LoginPasswordImage img.passwordImage[src$="svg"] {
   border-top: solid 1px 5px;
-  border-left: solid 1px #eeeeee;
-  border-right: solid 1px #eeeeee;
-  border-bottom: solid 1px #eeeeee;
+  border-left: solid 1px #EEE;
+  border-right: solid 1px #EEE;
+  border-bottom: solid 1px #EEE;
   width: 40px;
   height: 40px;
 }
@@ -2305,13 +2311,13 @@ div#loginMainDiv.stockLoginBackground div#centerBox form {
 #wrap img[src$="svg"],
 #wrap background-image[url$="svg"] {
   background-color: #679fd2;
-  background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjNjc5ZmQyIiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjNjc5ZmQyIiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=);
-  background-image: -moz-linear-gradient(top, #679fd2, #679fd2);
-  background-image: -ms-linear-gradient(top, #679fd2, #679fd2);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#679fd2), to(#679fd2));
-  background-image: -webkit-linear-gradient(top, #679fd2, #679fd2);
-  background-image: -o-linear-gradient(top, #679fd2, #679fd2);
-  background-image: linear-gradient(top, #679fd2, #679fd2);
+  background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjNjc5RkQyIiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjNjc5RkQyIiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=);
+  background-image: -moz-linear-gradient(top, #679FD2, #679FD2);
+  background-image: -ms-linear-gradient(top, #679FD2, #679FD2);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#679FD2), to(#679FD2));
+  background-image: -webkit-linear-gradient(top, #679FD2, #679FD2);
+  background-image: -o-linear-gradient(top, #679FD2, #679FD2);
+  background-image: linear-gradient(top, #679FD2, #679FD2);
   background-repeat: repeat-x;
 }
 #img1,
@@ -2465,13 +2471,13 @@ button:disabled,
 button.et2_button_text background-image[src$="svg"],
 input[type=button] background-image[src$="svg"] {
   background-color: #b4b4b4;
-  background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjYjRiNGI0IiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjYjRiNGI0IiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=);
-  background-image: -moz-linear-gradient(top, #b4b4b4, #b4b4b4);
-  background-image: -ms-linear-gradient(top, #b4b4b4, #b4b4b4);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#b4b4b4), to(#b4b4b4));
-  background-image: -webkit-linear-gradient(top, #b4b4b4, #b4b4b4);
-  background-image: -o-linear-gradient(top, #b4b4b4, #b4b4b4);
-  background-image: linear-gradient(top, #b4b4b4, #b4b4b4);
+  background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjQjRCNEI0IiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjQjRCNEI0IiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=);
+  background-image: -moz-linear-gradient(top, #B4B4B4, #B4B4B4);
+  background-image: -ms-linear-gradient(top, #B4B4B4, #B4B4B4);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#B4B4B4), to(#B4B4B4));
+  background-image: -webkit-linear-gradient(top, #B4B4B4, #B4B4B4);
+  background-image: -o-linear-gradient(top, #B4B4B4, #B4B4B4);
+  background-image: linear-gradient(top, #B4B4B4, #B4B4B4);
   background-repeat: repeat-x;
 }
 button.et2_button_text:hover,
@@ -2520,17 +2526,17 @@ button.et2_button_with_image {
   background-repeat: no-repeat !important;
   background-position: center;
   background-size: 20px 20px;
-  background-color: #e6e6e6;
+  background-color: #E6E6E6;
 }
 button.et2_button_with_image background-color[url$="svg"] {
   background-color: #b4b4b4;
-  background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjYjRiNGI0IiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjYjRiNGI0IiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=);
-  background-image: -moz-linear-gradient(top, #b4b4b4, #b4b4b4);
-  background-image: -ms-linear-gradient(top, #b4b4b4, #b4b4b4);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#b4b4b4), to(#b4b4b4));
-  background-image: -webkit-linear-gradient(top, #b4b4b4, #b4b4b4);
-  background-image: -o-linear-gradient(top, #b4b4b4, #b4b4b4);
-  background-image: linear-gradient(top, #b4b4b4, #b4b4b4);
+  background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjQjRCNEI0IiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjQjRCNEI0IiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=);
+  background-image: -moz-linear-gradient(top, #B4B4B4, #B4B4B4);
+  background-image: -ms-linear-gradient(top, #B4B4B4, #B4B4B4);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#B4B4B4), to(#B4B4B4));
+  background-image: -webkit-linear-gradient(top, #B4B4B4, #B4B4B4);
+  background-image: -o-linear-gradient(top, #B4B4B4, #B4B4B4);
+  background-image: linear-gradient(top, #B4B4B4, #B4B4B4);
   background-repeat: repeat-x;
 }
 button.et2_button_with_image.et2_button_text {
@@ -2571,7 +2577,7 @@ button.et2_button_delete {
   -moz-transition-timing-function: linear;
   -o-transition-timing-function: linear;
   transition-timing-function: linear;
-  background-color: #e6e6e6;
+  background-color: #E6E6E6;
   padding-left: 30px;
   background-position: 6px center;
   background-repeat: no-repeat;
@@ -2606,7 +2612,7 @@ button.et2_button_delete:hover {
   -moz-transition-timing-function: linear;
   -o-transition-timing-function: linear;
   transition-timing-function: linear;
-  background-color: #e6e6e6;
+  background-color: #E6E6E6;
   padding-left: 30px;
   background-position: 6px center;
   background-repeat: no-repeat;
@@ -2641,7 +2647,7 @@ button.et2_button_delete:active {
   -moz-transition-timing-function: linear;
   -o-transition-timing-function: linear;
   transition-timing-function: linear;
-  background-color: #e6e6e6;
+  background-color: #E6E6E6;
   padding-left: 30px;
   background-position: 6px center;
   background-repeat: no-repeat;
@@ -2673,7 +2679,7 @@ button.et2_button_delete:active {
   -moz-transition-timing-function: linear;
   -o-transition-timing-function: linear;
   transition-timing-function: linear;
-  background-color: #e6e6e6;
+  background-color: #E6E6E6;
   padding-left: 30px;
   background-position: 6px center;
   background-repeat: no-repeat;
@@ -2720,7 +2726,7 @@ button#cancel {
   -moz-transition-timing-function: linear;
   -o-transition-timing-function: linear;
   transition-timing-function: linear;
-  background-color: #e6e6e6;
+  background-color: #E6E6E6;
   padding-left: 30px;
   background-position: 6px center;
   background-repeat: no-repeat;
@@ -2762,7 +2768,7 @@ button#cancel:active {
   -moz-transition-timing-function: linear;
   -o-transition-timing-function: linear;
   transition-timing-function: linear;
-  background-color: #e6e6e6;
+  background-color: #E6E6E6;
   padding-left: 30px;
   background-position: 6px center;
   background-repeat: no-repeat;
@@ -2825,7 +2831,7 @@ button[id="add"] {
   -moz-transition-timing-function: linear;
   -o-transition-timing-function: linear;
   transition-timing-function: linear;
-  background-color: #e6e6e6;
+  background-color: #E6E6E6;
   padding-left: 30px;
   background-position: 6px center;
   background-repeat: no-repeat;
@@ -2878,7 +2884,7 @@ button[id="add"] {
   -webkit-overflow-scrolling: touch;
 }
 .chzn-container .chzn-results li {
-  color: #1e1e1e;
+  color: #1E1E1E;
 }
 .chzn-container .chzn-results li.highlighted {
   background: rgba(153, 204, 255, 0.4);
@@ -2891,7 +2897,7 @@ button[id="add"] {
 .chzn-container-active .chzn-choices li.search-field input {
   color: #111 !important;
   border: 1px solid rgba(0, 0, 0, 0.15);
-  border-color: #b4b4b4;
+  border-color: #B4B4B4;
   -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
   -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
   box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
@@ -2910,7 +2916,7 @@ button[id="add"] {
   outline: 0;
   border-width: 1px;
   border-style: solid;
-  border-color: #b4b4b4;
+  border-color: #B4B4B4;
   -webkit-box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1);
   -moz-box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1);
   box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1);
@@ -3047,7 +3053,7 @@ select:focus,
   outline: 0;
   border-width: 1px;
   border-style: solid;
-  border-color: #b4b4b4;
+  border-color: #B4B4B4;
   -webkit-box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1);
   -moz-box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1);
   box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1);
@@ -3108,19 +3114,19 @@ button {
   padding-right: 0;
   border-width: 1px;
   border-style: solid;
-  border-color: #e6e6e6;
+  border-color: #E6E6E6;
 }
 a:link,
 a:visited,
 select,
 input,
 textarea {
-  color: #26537c;
+  color: #26537C;
 }
 a:link,
 a:visited {
   cursor: pointer;
-  color: #26537c;
+  color: #26537C;
   text-decoration: none;
 }
 a:hover,
@@ -3244,7 +3250,7 @@ div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl div.su
 }*/
 div#popupMainDiv {
   padding: 8px;
-  background-color: #ffffff;
+  background-color: #FFFFFF;
   background-repeat: repeat-x;
 }
 div#popupMainDiv > * {
@@ -3279,8 +3285,8 @@ form.et2_container div table.et2_grid tbody tr td .et2_tabbox .et2_tabs table.et
   background-color: #ffffff;
 }
 .high {
-  border-top: 5px solid #e6e6e6;
-  border-bottom: 5px solid #e6e6e6 !important;
+  border-top: 5px solid #E6E6E6;
+  border-bottom: 5px solid #E6E6E6 !important;
 }
 /*Main div*/
 table.dialog-main-view {
@@ -3331,7 +3337,7 @@ table.dialog-main-view {
   border-top: none;
 }
 .dialogHeader table.et2_grid .th {
-  background-color: #0c5da5 !important;
+  background-color: #0C5DA5 !important;
 }
 .dialogHeader table.et2_grid tr {
   height: 30px;
@@ -3356,8 +3362,8 @@ table.dialog-main-view {
   text-align: right;
 }
 .dialogHeader td.space span img {
-  background: #ffffff;
-  border: 2px solid #ffffff;
+  background: #FFFFFF;
+  border: 2px solid #FFFFFF;
   /*filter grey*/
   filter: url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#grayscale");
   /* Firefox 10+, Firefox on Android */
@@ -3391,7 +3397,7 @@ tr.dialogHeader4 .et2_label {
   padding-left: 0em;
   margin: 0;
   background-image: none;
-  background-color: #ffffff;
+  background-color: #FFFFFF;
 }
 .et2_tabheader :first-child {
   margin-left: 0px;
@@ -3409,7 +3415,7 @@ tr.dialogHeader4 .et2_label {
   -moz-user-select: none;
   user-select: none;
   min-width: 73px;
-  border-bottom: 3px solid #e6e6e6;
+  border-bottom: 3px solid #E6E6E6;
   margin-bottom: -3px;
 }
 .et2_tabflag:hover,
@@ -3440,10 +3446,10 @@ td.etemplate_tab_active.th {
 .et2_tabs,
 .tab_body {
   border: none;
-  border-bottom: 1px solid #e6e6e6;
-  border-top: 1px solid #e6e6e6;
+  border-bottom: 1px solid #E6E6E6;
+  border-top: 1px solid #E6E6E6;
   padding: 5px;
-  background-color: #ffffff;
+  background-color: #FFFFFF;
   margin-bottom: 11px;
   margin-top: 3px;
   padding-top: 15px;
@@ -3476,8 +3482,8 @@ div#etemplate\.tab_widget {
 #   dialogOperators                        #
 #############################################*/
 .dialogOperators {
-  border-top: 0px solid #e6e6e6;
-  border-bottom: 0px solid #e6e6e6;
+  border-top: 0px solid #E6E6E6;
+  border-bottom: 0px solid #E6E6E6;
 }
 .dialogOperators td {
   padding: 2px 2px;
@@ -3774,7 +3780,7 @@ table.nextmatch_lettersearch {
   margin-bottom: 6px;
 }
 .lettersearch {
-  border: 1px solid #e6e6e6;
+  border: 1px solid #E6E6E6;
   background: #f8f8f8;
   text-align: center;
   cursor: pointer;
@@ -3784,7 +3790,7 @@ table.nextmatch_lettersearch {
   color: #ffffff;
 }
 .lettersearch_active {
-  border: 1px solid #e6e6e6;
+  border: 1px solid #E6E6E6;
   background: #f8f8f8;
   text-align: center;
   cursor: pointer;
@@ -3845,7 +3851,7 @@ td.lettersearch {
   -moz-transition-timing-function: linear;
   -o-transition-timing-function: linear;
   transition-timing-function: linear;
-  background-color: #e6e6e6;
+  background-color: #E6E6E6;
   height: 24px;
   padding: 0 5px;
 }
@@ -4069,7 +4075,7 @@ td.lettersearch {
 }
 /*popup Messsage*/
 div#egwpopup_message {
-  background-color: #ffffff;
+  background-color: #FFFFFF;
   padding: 1em;
   overflow-y: auto;
 }
@@ -4077,7 +4083,7 @@ div#egwpopup_message {
 .message {
   color: red;
   font-style: italic;
-  background: #ffffff;
+  background: #FFFFFF;
 }
 .egw_fw_ui_app_header_container {
   height: auto;
@@ -4102,15 +4108,15 @@ div#egwpopup_message {
 }
 /*Calendar ##############*/
 td.message {
-  background-color: #e6e6e6 !important;
+  background-color: #E6E6E6 !important;
   height: 0px;
   padding: 0px;
 }
 td.message span.message {
   height: 35px;
-  border-bottom: 2px solid #e6e6e6;
+  border-bottom: 2px solid #E6E6E6;
   color: red;
-  background: #e6e6e6;
+  background: #E6E6E6;
   height: auto;
   width: 100%;
 }
@@ -4381,13 +4387,13 @@ td.message span.message {
   /*print*/
 }
 #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li {
-  color: #ffffff;
+  color: #FFFFFF;
   padding: 8px 10px;
-  border-top: #e6e6e6;
+  border-top: #E6E6E6;
 }
 #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li:hover {
   background: rgba(153, 204, 255, 0.4);
-  color: #ffffff;
+  color: #FFFFFF;
 }
 #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li a {
   color: #000000;
@@ -4605,7 +4611,7 @@ td.message span.message {
   font-weight: bold;
 }
 #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header .egw_fw_ui_tab_header .notifyTabDiv:hover {
-  background-color: #1e1e1e;
+  background-color: #1E1E1E;
 }
 #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header .egw_fw_ui_tab_header:hover {
   background-color: rgba(153, 204, 255, 0.4);
@@ -4754,7 +4760,7 @@ td.message span.message {
   line-height: 17px;
 }
 #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_sidemenu_entry_header object {
-  background-color: #ffffff;
+  background-color: #FFFFFF;
   width: 24px;
   height: 24px;
 }
@@ -4842,7 +4848,7 @@ td.message span.message {
 #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_sidemenu_entry_content {
   display: block;
   background-image: none;
-  border-color: #b4b4b4;
+  border-color: #B4B4B4;
   border-style: solid;
   border-width: 1px;
   margin: 0 0 2em 0;
@@ -4851,7 +4857,7 @@ td.message span.message {
 }
 #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_sidemenu_entry_content:nth-last-of-type(-n+3) {
   background-color: #ffffff;
-  border-color: #b4b4b4;
+  border-color: #B4B4B4;
   border-right: 0px;
   margin-bottom: 0px;
   border-top-color: white;
@@ -4861,8 +4867,8 @@ td.message span.message {
   margin: 4px 5px 5px 5px;
   padding: 2px 0 2px 0;
   cursor: pointer;
-  border-color: #b4b4b4;
-  background-color: #e6e6e6;
+  border-color: #B4B4B4;
+  background-color: #E6E6E6;
   /*background-color: @egw_color_2_d;*/
 }
 #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category h1,
@@ -4889,7 +4895,7 @@ td.message span.message {
 #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category_active {
   border-bottom-width: 0px;
   margin-top: 4px;
-  background-color: #0c5da5;
+  background-color: #0C5DA5;
   color: #f2f2f2;
 }
 #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category_active h1,
@@ -4921,7 +4927,7 @@ td.message span.message {
   background-color: inherit;
 }
 #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category_active:hover {
-  background-color: #408dd2;
+  background-color: #408DD2;
   -webkit-transition: all 0.2s ease-out;
   -moz-transition: all 0.2s ease-out;
   -o-transition: all 0.2s ease-out;
@@ -4935,7 +4941,7 @@ td.message span.message {
   right: 0px;
 }
 #egw_fw_sidebar #egw_fw_splitter:hover {
-  border-color: #e6e6e6;
+  border-color: #E6E6E6;
 }
 #egw_fw_basecontainer #egw_fw_toggler {
   display: block;
@@ -5096,7 +5102,7 @@ td.message span.message {
   /*min-height: 50px;*/
 }
 .egw_fw_ui_category_content:last-of-type {
-  border-color: #b4b4b4;
+  border-color: #B4B4B4;
   margin-bottom: -2px;
 }
 .egw_fw_ui_category_content img {
@@ -5123,7 +5129,7 @@ td.message span.message {
   margin: 0px 0 1px 0px;
   position: relative;
   min-height: 18px;
-  background-color: #ffffff;
+  background-color: #FFFFFF;
   overflow-x: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
@@ -5195,7 +5201,7 @@ td.message span.message {
   width: 10px;
 }
 .egw_fw_ui_sidemenu_listitem div a:nth-child(2):hover {
-  background-color: #ff0000;
+  background-color: #FF0000;
   /*.background_color_20_gray;*/
   -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
   -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
@@ -5531,7 +5537,7 @@ td.message span.message {
 #egw_fw_topmenu_info_items #topmenu_info_quick_add span#quick_add:before {
   content: " ";
   font-size: 2em;
-  color: #0c5da5;
+  color: #0C5DA5;
   line-height: 0.6em;
   background-color: white;
 }
@@ -5542,7 +5548,7 @@ td.message span.message {
   top: 47px;
   min-width: 160px !important;
   width: 160px !important;
-  background: #ffffff;
+  background: #FFFFFF;
 }
 #egw_fw_topmenu_info_items #topmenu_info_quick_add .chzn-container:before {
   content: '';
@@ -5599,7 +5605,7 @@ td.message span.message {
   top: 6px;
   right: 112px;
   z-index: 200;
-  background-color: #ff0000;
+  background-color: #FF0000;
   -moz-transition: all 1s ease-in-out;
   -webkit-transition: all 1s ease-in-out;
   -o-transition: all 1s ease-in-out;
@@ -5762,7 +5768,7 @@ button.image_button {
   outline: 0;
   border-width: 1px;
   border-style: solid;
-  border-color: #b4b4b4;
+  border-color: #B4B4B4;
   -webkit-box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1);
   -moz-box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1);
   box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1);
@@ -5830,11 +5836,11 @@ button.image_button {
   display: block;
   outline: none;
   padding: 7px 0 7px 3px;
-  color: #26537c;
+  color: #26537C;
 }
 .sbOptions a:link,
 .sbOptions a:visited {
-  color: #26537c;
+  color: #26537C;
   text-decoration: none;
 }
 .sbOptions a:hover,
@@ -5909,7 +5915,7 @@ button.image_button {
  */
 /* TABLE STYLE */
 .th {
-  border-bottom: 1px solid #e6e6e6;
+  border-bottom: 1px solid #E6E6E6;
 }
 .th.thb {
   border-color: darkgray;
@@ -5944,7 +5950,7 @@ table.egwGridView_outer thead tr th {
   background-position: -200px;
   font-weight: normal;
   padding: 3px 1px 3px 4px;
-  border: 1px solid #b4b4b4;
+  border: 1px solid #B4B4B4;
   border-top: transparent;
   vertical-align: middle;
   overflow: auto;
@@ -6012,7 +6018,7 @@ table.egwGridView_outer > tbody > tr > td {
 }
 table.egwGridView_outer > tbody > tr > td .et2_link {
   margin-left: 0px;
-  color: #26537c;
+  color: #26537C;
 }
 table.egwGridView_outer > tbody > tr > td img {
   border: 1px solid transparent;
@@ -6052,7 +6058,7 @@ table.egwGridView_grid tbody tr.selected {
   background-color: rgba(102, 153, 204, 0.7) !important;
 }
 table.egwGridView_grid tbody td {
-  border-bottom: 1px solid #e6e6e6;
+  border-bottom: 1px solid #E6E6E6;
   color: #000000;
 }
 table.egwGridView_grid tbody td .innerContainer {
@@ -6086,7 +6092,7 @@ table.egwGridView_grid > tr > td {
   border-right: 1px;
   padding: 0.3em 0 0.3em 0.3em;
   border-bottom: 1px solid;
-  color: #e6e6e6;
+  color: #E6E6E6;
   /*&:hover {background-color: @egw_color_2_e;} legacy*/
 }
 table.egwGridView_grid > tr > td:active {
@@ -6175,7 +6181,7 @@ table.nextmatch_header img {
   font-size: 1.5em;
 }
 .egwGridView_empty td {
-  color: #1e1e1e !important;
+  color: #1E1E1E !important;
 }
 /**
  * EGroupware: Stylite Pixelegg template
@@ -6441,7 +6447,7 @@ a.textSidebox {
   }
 }
 .egw-loading-prompt-container::before {
-  opacity: .3;
+  opacity: 0.3;
   content: "";
   background-color: #aaaaaa;
   width: 100%;
@@ -6520,7 +6526,7 @@ a.textSidebox {
   z-index: 999;
   width: 100px;
   border-radius: 5px;
-  border: solid 10px  #679FD2;
+  border: solid 10px #679FD2;
   transform: translate(-50%, -50%);
 }
 /**
@@ -6715,10 +6721,10 @@ div[id^="bookmarks-"] .search.nm-mob-header,
 form[id^="bookmarks-"] .search.nm-mob-header,
 div[id^="bookmarks-"] .dialogHeadbar,
 form[id^="bookmarks-"] .dialogHeadbar {
-  background-color: #cc6633;
+  background-color: #CC6633;
 }
 #bookmarks_sidebox_header {
-  border-left: 6px solid #cc6633 !important;
+  border-left: 6px solid #CC6633 !important;
 }
 div[id^="calendar-"] .nm_favorites_div .et2_dropdown button:nth-child(2),
 form[id^="calendar-"] .nm_favorites_div .et2_dropdown button:nth-child(2),
@@ -6728,10 +6734,10 @@ div[id^="calendar-"] .search.nm-mob-header,
 form[id^="calendar-"] .search.nm-mob-header,
 div[id^="calendar-"] .dialogHeadbar,
 form[id^="calendar-"] .dialogHeadbar {
-  background-color: #cc0033;
+  background-color: #CC0033;
 }
 #calendar_sidebox_header {
-  border-left: 6px solid #cc0033 !important;
+  border-left: 6px solid #CC0033 !important;
 }
 div[id^="filemanager-"] .nm_favorites_div .et2_dropdown button:nth-child(2),
 form[id^="filemanager-"] .nm_favorites_div .et2_dropdown button:nth-child(2),
@@ -6897,7 +6903,7 @@ table.egwGridView_grid img.et2_appicon {
   background-color: #006699 !important;
 }
 #egw_fw_sidebar #egw_fw_sidemenu #calendar_sidebox_content .egw_fw_ui_category_active {
-  background-color: #cc0033 !important;
+  background-color: #CC0033 !important;
 }
 #egw_fw_sidebar #egw_fw_sidemenu #tracker_sidebox_content .egw_fw_ui_category_active {
   background-color: #009966 !important;
@@ -6915,7 +6921,7 @@ table.egwGridView_grid img.et2_appicon {
   background-color: #ff9933 !important;
 }
 #egw_fw_sidebar #egw_fw_sidemenu #bookmarks_sidebox_content .egw_fw_ui_category_active {
-  background-color: #cc6633 !important;
+  background-color: #CC6633 !important;
 }
 #egw_fw_sidebar #egw_fw_sidemenu #projectmanager_sidebox_content .egw_fw_ui_category_active {
   background-color: #669999 !important;
@@ -6956,34 +6962,34 @@ table.egwGridView_grid img.et2_appicon {
 }
 #egw_fw_basecontainer.egw_fw_sidebar_toggleOn #bookmarks_sidebox_header.egw_fw_ui_sidemenu_entry_header_active {
   background-color: rgba(204, 102, 51, 0.3);
-  border-left: 4px solid #cc6633 !important;
+  border-left: 4px solid #CC6633 !important;
 }
 #bookmarks_sidebox_header.egw_fw_ui_sidemenu_entry_header_active {
-  border-top: 4px solid #cc6633 !important;
+  border-top: 4px solid #CC6633 !important;
   border-left: 0px !important;
 }
 #bookmarks_sidebox_header {
-  border-left: 4px solid #cc6633 !important;
+  border-left: 4px solid #CC6633 !important;
 }
 #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header #bookmarks-egw_fw_ui_tab_header.egw_fw_ui_tab_header_active {
   border-top: 4px solid;
-  border-top-color: #cc6633;
+  border-top-color: #CC6633;
   border-top-width: 4px !important;
 }
 #egw_fw_basecontainer.egw_fw_sidebar_toggleOn #calendar_sidebox_header.egw_fw_ui_sidemenu_entry_header_active {
   background-color: rgba(204, 0, 51, 0.3);
-  border-left: 4px solid #cc0033 !important;
+  border-left: 4px solid #CC0033 !important;
 }
 #calendar_sidebox_header.egw_fw_ui_sidemenu_entry_header_active {
-  border-top: 4px solid #cc0033 !important;
+  border-top: 4px solid #CC0033 !important;
   border-left: 0px !important;
 }
 #calendar_sidebox_header {
-  border-left: 4px solid #cc0033 !important;
+  border-left: 4px solid #CC0033 !important;
 }
 #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header #calendar-egw_fw_ui_tab_header.egw_fw_ui_tab_header_active {
   border-top: 4px solid;
-  border-top-color: #cc0033;
+  border-top-color: #CC0033;
   border-top-width: 4px !important;
 }
 #egw_fw_basecontainer.egw_fw_sidebar_toggleOn #filemanager_sidebox_header.egw_fw_ui_sidemenu_entry_header_active {
@@ -7606,11 +7612,11 @@ img.et2_button_icon[src*="svg"]:hover {
   }
   body .egw_fw_ui_tabs_header .egw_fw_ui_tab_header_active {
     border-width: 1px 1px 0px 1px !important;
-    background-color: #ffd140;
+    background-color: #FFD140;
     /*Active object*/
   }
   body .egw_fw_ui_tabs_header .egw_fw_ui_tab_header_active:hover {
-    background-color: #ffd140;
+    background-color: #FFD140;
   }
   body .egw_fw_ui_tabs_header .egw_fw_ui_tab_header_active img.egw_fw_ui_tab_icon {
     display: inline-block;
@@ -7638,7 +7644,7 @@ img.et2_button_icon[src*="svg"]:hover {
     border-bottom-left-radius: 0;
     border-top-left-radius: 2px;
     /*.background-clip(padding-box);*/
-    background-color: #b4b4b4;
+    background-color: #B4B4B4;
   }
   body #egw_fw_sidebar.avatarSubmenu {
     top: 325px;
@@ -7688,7 +7694,7 @@ img.et2_button_icon[src*="svg"]:hover {
     line-height: 17px;
   }
   body #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_sidemenu_entry_apps .egw_fw_ui_sidemenu_entry_header object {
-    background-color: #ffffff;
+    background-color: #FFFFFF;
     width: 24px;
     height: 24px;
   }
@@ -7698,10 +7704,10 @@ img.et2_button_icon[src*="svg"]:hover {
     background-position: 95% -3000px;
     background-repeat: no-repeat;
     background-color: #f0f0f0;
-    border-top: solid 1px #b4b4b4;
-    border-left: solid 1px #b4b4b4;
-    border-right: solid 1px #b4b4b4;
-    border-bottom: solid 1px #b4b4b4;
+    border-top: solid 1px #B4B4B4;
+    border-left: solid 1px #B4B4B4;
+    border-right: solid 1px #B4B4B4;
+    border-bottom: solid 1px #B4B4B4;
     margin: 0 0 0 0;
     border-bottom: none;
     height: 33px;
diff --git a/pixelegg/css/monochrome.css b/pixelegg/css/monochrome.css
index 11f29e5b89..0d3e97cee3 100644
--- a/pixelegg/css/monochrome.css
+++ b/pixelegg/css/monochrome.css
@@ -60,6 +60,7 @@
   html[data-darkmode='1'] #blueimp-gallery ol,
   html[data-darkmode='1'] iframe,
   html[data-darkmode='1'] #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category_active,
+  html[data-darkmode='1'] #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category_content,
   html[data-darkmode='1'] video,
   html[data-darkmode='1'] #loginMainDiv,
   html[data-darkmode='1'] .et2_taglist_tags_icon {
@@ -114,7 +115,7 @@
   }
   html[data-darkmode='1'] #mail_sidebox_header.egw_fw_ui_sidemenu_entry_header_active,
   html[data-darkmode='1'] #mail_sidebox_header {
-    border-color: #5db9ec!important;
+    border-color: #5db9ec !important;
   }
   html[data-darkmode='1'] #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header #mail-egw_fw_ui_tab_header.egw_fw_ui_tab_header_active {
     border-top-color: #5db9ec !important;
@@ -219,7 +220,7 @@
     display: inline-block;
     /*border: 1px solid cornflowerblue;*/
     border: 1px solid rgba(0, 0, 0, 0.15);
-    background-color: #e6e6e6;
+    background-color: #E6E6E6;
   }
   .et2_placeholder .et2_attr {
     color: #000000;
@@ -228,7 +229,7 @@
  * Label widget, and labels for other widgets
  */
   .et2_label {
-    color: #1e1e1e;
+    color: #1E1E1E;
     white-space: pre-wrap;
   }
   /**
@@ -275,7 +276,7 @@
     -moz-transition-timing-function: linear;
     -o-transition-timing-function: linear;
     transition-timing-function: linear;
-    background-color: #e6e6e6;
+    background-color: #E6E6E6;
   }
   .et2_button_icon {
     height: 16px;
@@ -284,13 +285,13 @@
   /* give the image a button lock and feel*/
   img.et2_button_icon[src*="svg"] {
     background-color: #b4b4b4;
-    background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjYjRiNGI0IiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjYjRiNGI0IiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=);
-    background-image: -moz-linear-gradient(top, #b4b4b4, #b4b4b4);
-    background-image: -ms-linear-gradient(top, #b4b4b4, #b4b4b4);
-    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#b4b4b4), to(#b4b4b4));
-    background-image: -webkit-linear-gradient(top, #b4b4b4, #b4b4b4);
-    background-image: -o-linear-gradient(top, #b4b4b4, #b4b4b4);
-    background-image: linear-gradient(top, #b4b4b4, #b4b4b4);
+    background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjQjRCNEI0IiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjQjRCNEI0IiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=);
+    background-image: -moz-linear-gradient(top, #B4B4B4, #B4B4B4);
+    background-image: -ms-linear-gradient(top, #B4B4B4, #B4B4B4);
+    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#B4B4B4), to(#B4B4B4));
+    background-image: -webkit-linear-gradient(top, #B4B4B4, #B4B4B4);
+    background-image: -o-linear-gradient(top, #B4B4B4, #B4B4B4);
+    background-image: linear-gradient(top, #B4B4B4, #B4B4B4);
     background-repeat: repeat-x;
   }
   img.et2_button_icon[src*="svg"]:hover {
@@ -334,13 +335,13 @@
     min-width: 21.5ex;
   }
   span.et2_date span {
-    color: #ffffff;
+    color: #FFFFFF;
   }
   span.et2_date_duration {
-    border: 1px solid #e6e6e6;
+    border: 1px solid #E6E6E6;
   }
   span.et2_date_duration :not(input:first-child) {
-    border-left: 1px solid #f2f2f2;
+    border-left: 1px solid #F2F2F2;
   }
   .ui-datepicker .ui-datepicker-buttonpane button[data-handler="today"] {
     background-image: url(../images/bullet.svg);
@@ -374,20 +375,20 @@
     background-image: url("../images/delete.svg");
   }
   .et2_file .progress p {
-    background-color: #ffdd73;
+    background-color: #FFDD73;
   }
   span.et2_file_span {
     background-image: url(../images/attach.svg);
   }
   span.et2_file_span img[url*="svg"] {
     background-color: #b4b4b4 !important;
-    background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjYjRiNGI0IiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjYjRiNGI0IiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=) !important;
-    background-image: -moz-linear-gradient(top, #b4b4b4, #b4b4b4) !important;
-    background-image: -ms-linear-gradient(top, #b4b4b4, #b4b4b4) !important;
-    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#b4b4b4), to(#b4b4b4)) !important;
-    background-image: -webkit-linear-gradient(top, #b4b4b4, #b4b4b4) !important;
-    background-image: -o-linear-gradient(top, #b4b4b4, #b4b4b4) !important;
-    background-image: linear-gradient(top, #b4b4b4, #b4b4b4) !important;
+    background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjQjRCNEI0IiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjQjRCNEI0IiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=) !important;
+    background-image: -moz-linear-gradient(top, #B4B4B4, #B4B4B4) !important;
+    background-image: -ms-linear-gradient(top, #B4B4B4, #B4B4B4) !important;
+    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#B4B4B4), to(#B4B4B4)) !important;
+    background-image: -webkit-linear-gradient(top, #B4B4B4, #B4B4B4) !important;
+    background-image: -o-linear-gradient(top, #B4B4B4, #B4B4B4) !important;
+    background-image: linear-gradient(top, #B4B4B4, #B4B4B4) !important;
     background-repeat: repeat-x !important;
     fill: red !important;
   }
@@ -398,7 +399,7 @@
     box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6) !important;
   }
   div.et2_file input.et2_file_upload {
-    background-color: #ffffff !important;
+    background-color: #FFFFFF !important;
     -webkit-border-radius: 3px;
     -moz-border-radius: 3px;
     border-radius: 3px;
@@ -416,25 +417,25 @@
   }
   /* Gantt widget */
   .et2_gantt .gantt_task_line {
-    background-color: #679fd2;
+    background-color: #679FD2;
   }
   .et2_gantt .gantt_task_line .gantt_task_content {
-    color: #043a6b;
+    color: #043A6B;
   }
   .et2_gantt .gantt_task_line .gantt_selected {
     background-color: rgba(255, 194, 0, 0.01);
   }
   .et2_gantt .gantt_task_line .gantt_task_progress {
-    color: #043a6b;
-    background-color: #ffdd73;
+    color: #043A6B;
+    background-color: #FFDD73;
     /* outline progress in a complementary color */
-    border: 1px solid #bf9d30;
+    border: 1px solid #BF9D30;
     border-right: none;
     margin: -1px;
   }
   .et2_gantt .gantt_task_line.gantt_milestone {
     background-color: #ffc200;
-    border-color: #bf9d30;
+    border-color: #BF9D30;
   }
   .et2_gantt .gantt_task_link .gantt_line_wrapper div {
     background-color: green;
@@ -449,16 +450,16 @@
     box-shadow: 0 0 5px 0 green;
   }
   .et2_gantt .gantt_task_link.invalid_constraint .gantt_line_wrapper div {
-    background-color: #ae1d00;
+    background-color: #AE1D00;
   }
   .et2_gantt .gantt_task_link.invalid_constraint .gantt_link_arrow_left {
-    border-right-color: #ae1d00;
+    border-right-color: #AE1D00;
   }
   .et2_gantt .gantt_task_link.invalid_constraint .gantt_link_arrow_right {
-    border-left-color: #ae1d00;
+    border-left-color: #AE1D00;
   }
   .et2_gantt .gantt_task_link.invalid_constraint:hover .gantt_line_wrapper div {
-    box-shadow: 0 0 5px 0 #ae1d00;
+    box-shadow: 0 0 5px 0 #AE1D00;
   }
   /*
         Link to / Selector Widget
@@ -492,7 +493,7 @@
     background-size: contain;
   }
   .et2_link {
-    color: #0c5da5;
+    color: #0C5DA5;
   }
   .et2_link_list tr {
     cursor: pointer;
@@ -590,7 +591,7 @@
 */
   .et2_required,
   [required] {
-    background-color: #ffdd73;
+    background-color: #FFDD73;
     -webkit-border-top-right-radius: 3px;
     -webkit-border-bottom-right-radius: 3px;
     -webkit-border-bottom-left-radius: 3px;
@@ -609,7 +610,7 @@
  * hrule widget
  */
   hr {
-    border-top: 1px solid #e6e6e6;
+    border-top: 1px solid #E6E6E6;
   }
   /**
  * grid widget
@@ -660,7 +661,7 @@
     background-color: transparent;
   }
   .et2_nextmatch .egwGridView_outer thead tr > th:first-child {
-    border-left: 6px solid #b4b4b4;
+    border-left: 6px solid #B4B4B4;
   }
   .et2_nextmatch .nextmatch_header {
     padding: 0;
@@ -679,7 +680,7 @@
 ################################################################*/
   .nextmatch_header_row .et2_label select {
     margin-left: 3px;
-    border-color: #cdcdcd;
+    border-color: #CDCDCD;
   }
   .nextmatch_header_row > .filters {
     /*width: 83%;*/
@@ -728,7 +729,7 @@
     margin-right: 2ex;
     width: 15%;
     border: 1px solid rgba(0, 0, 0, 0.15);
-    border-color: #b4b4b4;
+    border-color: #B4B4B4;
     -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
     -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
     box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
@@ -747,7 +748,7 @@
     outline: 0;
     border-width: 1px;
     border-style: solid;
-    border-color: #b4b4b4;
+    border-color: #B4B4B4;
     -webkit-box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1);
     -moz-box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1);
     box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1);
@@ -836,7 +837,7 @@
     vertical-align: middle;
     margin-right: -2px;
     padding: 0px 1ex;
-    background-color: #ffffff;
+    background-color: #FFFFFF;
     background-image: none;
   }
   .et2_dropdown button img {
@@ -873,7 +874,7 @@
     background-color: #b3e4a6;
   }
   .et2_dropdown button.ui-state-hover {
-    background-color: #e6e6e6;
+    background-color: #E6E6E6;
   }
   .sidebox-favorites ul.favorites {
     width: 99%;
@@ -984,7 +985,7 @@
     position: relative;
   }
   div.et2_progress > div {
-    background-color: #ffdd73;
+    background-color: #FFDD73;
     /*height: 5px;*/
   }
   /**
@@ -1001,7 +1002,7 @@
  * et2_textbox
  */
   textarea.et2_textbox {
-    border: 1px solid #e6e6e6;
+    border: 1px solid #E6E6E6;
   }
   textarea,
   textarea.description {
@@ -1204,9 +1205,9 @@ option:checked {
   position: absolute;
   z-index: 9999;
   max-width: 300px;
-  -webkit-box-shadow: 0 0 5px #aaaaaa;
-  -moz-box-shadow: 0 0 5px #aaaaaa;
-  box-shadow: 0 0 5px #aaaaaa;
+  -webkit-box-shadow: 0 0 5px #aaa;
+  -moz-box-shadow: 0 0 5px #aaa;
+  box-shadow: 0 0 5px #aaa;
 }
 /* Component containers
 ----------------------------------*/
@@ -1239,7 +1240,7 @@ option:checked {
   border-right: solid 1px 0px !important;
   border-bottom: solid 1px 0px !important;
   /*.gradient_thead !important;*/
-  background-color: #0c5da5;
+  background-color: #0C5DA5;
   /*border-color: @gray_10;*/
   color: #000000;
   font-weight: bold;
@@ -1258,7 +1259,7 @@ option:checked {
   border-left: solid 1px 1px;
   border-right: solid 1px 1px;
   border-bottom: solid 1px 1px;
-  border-color: #b4b4b4;
+  border-color: #B4B4B4;
   background: transparent;
   font-weight: normal;
   color: #1a1a1a;
@@ -1285,14 +1286,14 @@ option:checked {
 .ui-state-focus,
 .ui-widget-header .ui-state-focus,
 .ui-widget-content .ui-state-focus {
-  border-color: #e6e6e6;
+  border-color: #E6E6E6;
   background: rgba(102, 153, 204, 0.7);
   background-image: none;
-  color: #ffffff;
+  color: #FFFFFF;
   font-weight: normal;
 }
 .ui-state-focus.ui-menu-item a {
-  color: #e6e6e6;
+  color: #E6E6E6;
 }
 .ui-state-hover,
 .ui-widget-content .ui-state-hover,
@@ -1301,7 +1302,7 @@ option:checked {
   border-left: solid 1px 1px;
   border-right: solid 1px 1px;
   border-bottom: solid 1px 1px;
-  border-color: #e6e6e6;
+  border-color: #E6E6E6;
   background: rgba(102, 153, 204, 0.7);
   background-image: none;
   color: #ffffff;
@@ -1320,7 +1321,7 @@ option:checked {
   border-left: solid 1px 1px;
   border-right: solid 1px 1px;
   border-bottom: solid 1px 1px;
-  border-color: #cdcdcd;
+  border-color: #CDCDCD;
   background-image: none;
   font-weight: bold;
   color: #808080;
@@ -1340,7 +1341,7 @@ option:checked {
   border-left: solid 1px 1px;
   border-right: solid 1px 1px;
   border-bottom: solid 1px 1px;
-  border-color: #b4b4b4;
+  border-color: #B4B4B4;
   color: #808080;
 }
 .ui-state-highlight a,
@@ -1355,27 +1356,27 @@ option:checked {
   border-left: solid 1px 1px;
   border-right: solid 1px 1px;
   border-bottom: solid 1px 1px;
-  border-color: #e6e6e6;
+  border-color: #E6E6E6;
   color: #b3b3b3;
 }
 .ui-state-error a,
 .ui-widget-content .ui-state-error a {
-  color: #ff0000;
+  color: #FF0000;
 }
 .ui-state-error-text,
 .ui-widget-content .ui-state-error-text,
 .ui-widget-header .ui-state-error-text {
-  color: #ff0000;
+  color: #FF0000;
 }
 .drop-hover {
-  background-color: #ffdd73;
+  background-color: #FFDD73;
 }
 .ui-icon-close {
   /*visibility: hidden;*/
   /*background-image: url(../images/search.png);*/
   background-image: url("../images/cancel.svg");
   background-repeat: no-repeat;
-  background-color: #ffffff;
+  background-color: #FFFFFF;
   background-size: 12px 12px;
   width: 16px;
   height: 16px;
@@ -1405,15 +1406,15 @@ span.ui-icon-close {
 .ui-icon-closethick {
   background-image: url(../images/close.svg) !important;
   background-repeat: no-repeat;
-  background-color: #ffffff;
+  background-color: #FFFFFF;
   background-size: contain;
   background-position: 0 0 !important;
   color: #ffffff;
   height: 16px;
 }
 .ui-icon-closethick:hover {
-  background-color: #e6e6e6;
-  color: #1e1e1e;
+  background-color: #E6E6E6;
+  color: #1E1E1E;
   -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
   -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
   box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
@@ -1449,7 +1450,7 @@ span.ui-icon-close {
 /*###########################################*/
 /* col selection */
 span.ui-multiselect-header {
-  color: #ffffff;
+  color: #FFFFFF;
 }
 span.ui-icon-search {
   background-image: url(../images/search.svg) !important;
@@ -1488,30 +1489,30 @@ span.ui-icon-search {
 /*###########################################*/
 /*Dialog: edit row*/
 .ui-widget-overlay {
-  background: #cdcdcd;
+  background: #CDCDCD;
 }
 .ui-dialog {
   z-index: 1000;
-  box-shadow: -2px 1px 9px 3px #b4b4b4;
+  box-shadow: -2px 1px 9px 3px #B4B4B4;
 }
 .ui-dialog .ui-dialog-buttonpane {
-  padding-left: .8em;
-  padding-right: .8em;
+  padding-left: 0.8em;
+  padding-right: 0.8em;
   padding-top: 0.7em;
 }
 .ui-dialog .ui-dialog-titlebar {
-  padding-left: .8em;
-  padding-right: .8em;
+  padding-left: 0.8em;
+  padding-right: 0.8em;
   font-size: 12pt;
   border: none;
   font-weight: normal;
   background: white;
 }
 .ui-dialog .ui-dialog-titlebar-close {
-  right: .8em;
+  right: 0.8em;
 }
 .ui-widget-content {
-  border: 1px solid #b4b4b4;
+  border: 1px solid #B4B4B4;
 }
 .ui-widget-content .et2_selectbox button.et2_button_text,
 .ui-widget-content .et2_selectbox select.et2_selectbox {
@@ -1542,35 +1543,35 @@ button.ui-button {
   -moz-transition-timing-function: linear;
   -o-transition-timing-function: linear;
   transition-timing-function: linear;
-  background-color: #e6e6e6;
+  background-color: #E6E6E6;
   padding-left: 30px;
   background-position: 6px center;
   background-repeat: no-repeat;
   background-size: 20px auto;
   /*.Button_size_h32_auto;*/
   height: 24px;
-  border-color: #b4b4b4;
+  border-color: #B4B4B4;
   outline: none;
 }
 button.ui-button:hover {
-  background-color: #b4b4b4;
-  color: #1e1e1e;
+  background-color: #B4B4B4;
+  color: #1E1E1E;
 }
 button.ui-button .ui-button-icon-primary:hover {
-  background-color: #b4b4b4;
-  color: #1e1e1e;
+  background-color: #B4B4B4;
+  color: #1E1E1E;
   box-shadow: none;
 }
 /*###########################################*/
 /*Dialog: calendar edit series*/
 .ui-dialog-buttonset button.ui-button-text-only {
-  background-color: #cdcdcd;
+  background-color: #CDCDCD;
   background: inherit;
   color: #000000 !important;
   font-weight: normal !important;
 }
 .ui-dialog-buttonset button.ui-button-text-only:hover {
-  background-color: #b4b4b4;
+  background-color: #B4B4B4;
 }
 .ui-dialog-buttonset button.ui-button {
   /*.border_normal;*/
@@ -1590,7 +1591,7 @@ button.ui-button .ui-button-icon-primary:hover {
   -moz-transition-timing-function: linear;
   -o-transition-timing-function: linear;
   transition-timing-function: linear;
-  background-color: #e6e6e6;
+  background-color: #E6E6E6;
   padding-left: 30px;
   background-position: 6px center;
   background-repeat: no-repeat;
@@ -1599,8 +1600,8 @@ button.ui-button .ui-button-icon-primary:hover {
   height: 24px;
 }
 .ui-dialog-buttonset button.ui-button:hover {
-  background-color: #b4b4b4;
-  color: #1e1e1e;
+  background-color: #B4B4B4;
+  color: #1E1E1E;
 }
 /*###########################################*/
 /*Dialog: calendar edit series*/
@@ -1608,7 +1609,7 @@ div#ui-datepicker-div {
   -webkit-border-radius: 3px;
   -moz-border-radius: 3px;
   border-radius: 3px;
-  border: 1px solid #b4b4b4;
+  border: 1px solid #B4B4B4;
   -webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
   -moz-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
   box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
@@ -1629,8 +1630,8 @@ div#ui-datepicker-div {
   border: 1px solid #b4b4b4;
 }
 .ui-datepicker table.ui-datepicker-calendar .ui-state-active {
-  background-color: #0c5da5;
-  color: #ffffff;
+  background-color: #0C5DA5;
+  color: #FFFFFF;
 }
 .ui-datepicker div.ui-timepicker-div {
   padding: 3px;
@@ -1653,17 +1654,17 @@ div#ui-datepicker-div {
   font-size: 0.9em;
 }
 .ui-datepicker div.ui-timepicker-div div.ui_tpicker_hour_slider span.ui-slider-handle {
-  background-color: #0c5da5;
+  background-color: #0C5DA5;
   padding: 1px;
   outline: none;
 }
 .ui-datepicker div.ui-timepicker-div div.ui_tpicker_minute_slider span.ui-slider-handle {
-  background-color: #0c5da5;
+  background-color: #0C5DA5;
   padding: 1px;
   outline: none;
 }
 .ui-datepicker div.ui-datepicker-buttonpane {
-  background-color: #679fd2;
+  background-color: #679FD2;
 }
 .ui-datepicker button.ui-datepicker-current .ui-state-hover {
   background-color: #b3e4a6 !important;
@@ -2036,6 +2037,9 @@ div#loginMainDiv.stockLoginBackground div#centerBox form {
 #loginMainDiv div#login_footer .apps .app span {
   display: none;
 }
+#loginMainDiv div#login_footer .apps .app[data-id="guacamole"] .content img.icon2-bg {
+  right: 15px;
+}
 #loginMainDiv div#login_footer .apps .tooltip {
   display: inline-flex;
   position: absolute;
@@ -2115,6 +2119,7 @@ div#loginMainDiv.stockLoginBackground div#centerBox form {
   z-index: 100;
   padding: 0;
   width: 280px;
+  border-radius: 5px;
 }
 #loginMainDiv div#centerBox .egw_logo {
   width: 24px;
@@ -2135,6 +2140,7 @@ div#loginMainDiv.stockLoginBackground div#centerBox form {
   background-color: white;
   padding: 1em;
   border: 1px solid #cdcdce;
+  border-radius: 5px;
 }
 #loginMainDiv div#centerBox form .hiddenCredential {
   display: none;
@@ -2150,28 +2156,28 @@ div#loginMainDiv.stockLoginBackground div#centerBox form {
 }
 #loginMainDiv div#centerBox form table.divLoginbox div.LoginPasswordImage {
   background-color: #b3ad54;
-  background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjZmZjMjAwIiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjNDA4ZGQyIiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=);
-  background-image: -moz-linear-gradient(top, #ffc200, #408dd2);
-  background-image: -ms-linear-gradient(top, #ffc200, #408dd2);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffc200), to(#408dd2));
-  background-image: -webkit-linear-gradient(top, #ffc200, #408dd2);
-  background-image: -o-linear-gradient(top, #ffc200, #408dd2);
-  background-image: linear-gradient(top, #ffc200, #408dd2);
+  background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjZmZjMjAwIiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjNDA4REQyIiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=);
+  background-image: -moz-linear-gradient(top, #ffc200, #408DD2);
+  background-image: -ms-linear-gradient(top, #ffc200, #408DD2);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffc200), to(#408DD2));
+  background-image: -webkit-linear-gradient(top, #ffc200, #408DD2);
+  background-image: -o-linear-gradient(top, #ffc200, #408DD2);
+  background-image: linear-gradient(top, #ffc200, #408DD2);
   background-repeat: repeat-x;
 }
 #loginMainDiv div#centerBox form table.divLoginbox div.LoginPasswordImage img.passwordImage {
   margin: 0 auto;
   max-width: 400px;
   border-top: solid 1px 5px;
-  border-left: solid 1px #eeeeee;
-  border-right: solid 1px #eeeeee;
-  border-bottom: solid 1px #eeeeee;
+  border-left: solid 1px #EEE;
+  border-right: solid 1px #EEE;
+  border-bottom: solid 1px #EEE;
 }
 #loginMainDiv div#centerBox form table.divLoginbox div.LoginPasswordImage img.passwordImage[src$="svg"] {
   border-top: solid 1px 5px;
-  border-left: solid 1px #eeeeee;
-  border-right: solid 1px #eeeeee;
-  border-bottom: solid 1px #eeeeee;
+  border-left: solid 1px #EEE;
+  border-right: solid 1px #EEE;
+  border-bottom: solid 1px #EEE;
   width: 40px;
   height: 40px;
 }
@@ -2285,13 +2291,13 @@ div#loginMainDiv.stockLoginBackground div#centerBox form {
 #wrap img[src$="svg"],
 #wrap background-image[url$="svg"] {
   background-color: #679fd2;
-  background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjNjc5ZmQyIiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjNjc5ZmQyIiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=);
-  background-image: -moz-linear-gradient(top, #679fd2, #679fd2);
-  background-image: -ms-linear-gradient(top, #679fd2, #679fd2);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#679fd2), to(#679fd2));
-  background-image: -webkit-linear-gradient(top, #679fd2, #679fd2);
-  background-image: -o-linear-gradient(top, #679fd2, #679fd2);
-  background-image: linear-gradient(top, #679fd2, #679fd2);
+  background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjNjc5RkQyIiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjNjc5RkQyIiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=);
+  background-image: -moz-linear-gradient(top, #679FD2, #679FD2);
+  background-image: -ms-linear-gradient(top, #679FD2, #679FD2);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#679FD2), to(#679FD2));
+  background-image: -webkit-linear-gradient(top, #679FD2, #679FD2);
+  background-image: -o-linear-gradient(top, #679FD2, #679FD2);
+  background-image: linear-gradient(top, #679FD2, #679FD2);
   background-repeat: repeat-x;
 }
 #img1,
@@ -2445,13 +2451,13 @@ button:disabled,
 button.et2_button_text background-image[src$="svg"],
 input[type=button] background-image[src$="svg"] {
   background-color: #b4b4b4;
-  background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjYjRiNGI0IiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjYjRiNGI0IiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=);
-  background-image: -moz-linear-gradient(top, #b4b4b4, #b4b4b4);
-  background-image: -ms-linear-gradient(top, #b4b4b4, #b4b4b4);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#b4b4b4), to(#b4b4b4));
-  background-image: -webkit-linear-gradient(top, #b4b4b4, #b4b4b4);
-  background-image: -o-linear-gradient(top, #b4b4b4, #b4b4b4);
-  background-image: linear-gradient(top, #b4b4b4, #b4b4b4);
+  background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjQjRCNEI0IiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjQjRCNEI0IiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=);
+  background-image: -moz-linear-gradient(top, #B4B4B4, #B4B4B4);
+  background-image: -ms-linear-gradient(top, #B4B4B4, #B4B4B4);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#B4B4B4), to(#B4B4B4));
+  background-image: -webkit-linear-gradient(top, #B4B4B4, #B4B4B4);
+  background-image: -o-linear-gradient(top, #B4B4B4, #B4B4B4);
+  background-image: linear-gradient(top, #B4B4B4, #B4B4B4);
   background-repeat: repeat-x;
 }
 button.et2_button_text:hover,
@@ -2500,17 +2506,17 @@ button.et2_button_with_image {
   background-repeat: no-repeat !important;
   background-position: center;
   background-size: 20px 20px;
-  background-color: #e6e6e6;
+  background-color: #E6E6E6;
 }
 button.et2_button_with_image background-color[url$="svg"] {
   background-color: #b4b4b4;
-  background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjYjRiNGI0IiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjYjRiNGI0IiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=);
-  background-image: -moz-linear-gradient(top, #b4b4b4, #b4b4b4);
-  background-image: -ms-linear-gradient(top, #b4b4b4, #b4b4b4);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#b4b4b4), to(#b4b4b4));
-  background-image: -webkit-linear-gradient(top, #b4b4b4, #b4b4b4);
-  background-image: -o-linear-gradient(top, #b4b4b4, #b4b4b4);
-  background-image: linear-gradient(top, #b4b4b4, #b4b4b4);
+  background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjQjRCNEI0IiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjQjRCNEI0IiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=);
+  background-image: -moz-linear-gradient(top, #B4B4B4, #B4B4B4);
+  background-image: -ms-linear-gradient(top, #B4B4B4, #B4B4B4);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#B4B4B4), to(#B4B4B4));
+  background-image: -webkit-linear-gradient(top, #B4B4B4, #B4B4B4);
+  background-image: -o-linear-gradient(top, #B4B4B4, #B4B4B4);
+  background-image: linear-gradient(top, #B4B4B4, #B4B4B4);
   background-repeat: repeat-x;
 }
 button.et2_button_with_image.et2_button_text {
@@ -2551,7 +2557,7 @@ button.et2_button_delete {
   -moz-transition-timing-function: linear;
   -o-transition-timing-function: linear;
   transition-timing-function: linear;
-  background-color: #e6e6e6;
+  background-color: #E6E6E6;
   padding-left: 30px;
   background-position: 6px center;
   background-repeat: no-repeat;
@@ -2586,7 +2592,7 @@ button.et2_button_delete:hover {
   -moz-transition-timing-function: linear;
   -o-transition-timing-function: linear;
   transition-timing-function: linear;
-  background-color: #e6e6e6;
+  background-color: #E6E6E6;
   padding-left: 30px;
   background-position: 6px center;
   background-repeat: no-repeat;
@@ -2621,7 +2627,7 @@ button.et2_button_delete:active {
   -moz-transition-timing-function: linear;
   -o-transition-timing-function: linear;
   transition-timing-function: linear;
-  background-color: #e6e6e6;
+  background-color: #E6E6E6;
   padding-left: 30px;
   background-position: 6px center;
   background-repeat: no-repeat;
@@ -2653,7 +2659,7 @@ button.et2_button_delete:active {
   -moz-transition-timing-function: linear;
   -o-transition-timing-function: linear;
   transition-timing-function: linear;
-  background-color: #e6e6e6;
+  background-color: #E6E6E6;
   padding-left: 30px;
   background-position: 6px center;
   background-repeat: no-repeat;
@@ -2700,7 +2706,7 @@ button#cancel {
   -moz-transition-timing-function: linear;
   -o-transition-timing-function: linear;
   transition-timing-function: linear;
-  background-color: #e6e6e6;
+  background-color: #E6E6E6;
   padding-left: 30px;
   background-position: 6px center;
   background-repeat: no-repeat;
@@ -2742,7 +2748,7 @@ button#cancel:active {
   -moz-transition-timing-function: linear;
   -o-transition-timing-function: linear;
   transition-timing-function: linear;
-  background-color: #e6e6e6;
+  background-color: #E6E6E6;
   padding-left: 30px;
   background-position: 6px center;
   background-repeat: no-repeat;
@@ -2805,7 +2811,7 @@ button[id="add"] {
   -moz-transition-timing-function: linear;
   -o-transition-timing-function: linear;
   transition-timing-function: linear;
-  background-color: #e6e6e6;
+  background-color: #E6E6E6;
   padding-left: 30px;
   background-position: 6px center;
   background-repeat: no-repeat;
@@ -2858,7 +2864,7 @@ button[id="add"] {
   -webkit-overflow-scrolling: touch;
 }
 .chzn-container .chzn-results li {
-  color: #1e1e1e;
+  color: #1E1E1E;
 }
 .chzn-container .chzn-results li.highlighted {
   background: rgba(153, 204, 255, 0.4);
@@ -2871,7 +2877,7 @@ button[id="add"] {
 .chzn-container-active .chzn-choices li.search-field input {
   color: #111 !important;
   border: 1px solid rgba(0, 0, 0, 0.15);
-  border-color: #b4b4b4;
+  border-color: #B4B4B4;
   -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
   -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
   box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
@@ -2890,7 +2896,7 @@ button[id="add"] {
   outline: 0;
   border-width: 1px;
   border-style: solid;
-  border-color: #b4b4b4;
+  border-color: #B4B4B4;
   -webkit-box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1);
   -moz-box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1);
   box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1);
@@ -3027,7 +3033,7 @@ select:focus,
   outline: 0;
   border-width: 1px;
   border-style: solid;
-  border-color: #b4b4b4;
+  border-color: #B4B4B4;
   -webkit-box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1);
   -moz-box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1);
   box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1);
@@ -3088,19 +3094,19 @@ button {
   padding-right: 0;
   border-width: 1px;
   border-style: solid;
-  border-color: #e6e6e6;
+  border-color: #E6E6E6;
 }
 a:link,
 a:visited,
 select,
 input,
 textarea {
-  color: #26537c;
+  color: #26537C;
 }
 a:link,
 a:visited {
   cursor: pointer;
-  color: #26537c;
+  color: #26537C;
   text-decoration: none;
 }
 a:hover,
@@ -3224,7 +3230,7 @@ div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl div.su
 }*/
 div#popupMainDiv {
   padding: 8px;
-  background-color: #ffffff;
+  background-color: #FFFFFF;
   background-repeat: repeat-x;
 }
 div#popupMainDiv > * {
@@ -3259,8 +3265,8 @@ form.et2_container div table.et2_grid tbody tr td .et2_tabbox .et2_tabs table.et
   background-color: #ffffff;
 }
 .high {
-  border-top: 5px solid #e6e6e6;
-  border-bottom: 5px solid #e6e6e6 !important;
+  border-top: 5px solid #E6E6E6;
+  border-bottom: 5px solid #E6E6E6 !important;
 }
 /*Main div*/
 table.dialog-main-view {
@@ -3311,7 +3317,7 @@ table.dialog-main-view {
   border-top: none;
 }
 .dialogHeader table.et2_grid .th {
-  background-color: #0c5da5 !important;
+  background-color: #0C5DA5 !important;
 }
 .dialogHeader table.et2_grid tr {
   height: 30px;
@@ -3336,8 +3342,8 @@ table.dialog-main-view {
   text-align: right;
 }
 .dialogHeader td.space span img {
-  background: #ffffff;
-  border: 2px solid #ffffff;
+  background: #FFFFFF;
+  border: 2px solid #FFFFFF;
   /*filter grey*/
   filter: url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#grayscale");
   /* Firefox 10+, Firefox on Android */
@@ -3371,7 +3377,7 @@ tr.dialogHeader4 .et2_label {
   padding-left: 0em;
   margin: 0;
   background-image: none;
-  background-color: #ffffff;
+  background-color: #FFFFFF;
 }
 .et2_tabheader :first-child {
   margin-left: 0px;
@@ -3389,7 +3395,7 @@ tr.dialogHeader4 .et2_label {
   -moz-user-select: none;
   user-select: none;
   min-width: 73px;
-  border-bottom: 3px solid #e6e6e6;
+  border-bottom: 3px solid #E6E6E6;
   margin-bottom: -3px;
 }
 .et2_tabflag:hover,
@@ -3420,10 +3426,10 @@ td.etemplate_tab_active.th {
 .et2_tabs,
 .tab_body {
   border: none;
-  border-bottom: 1px solid #e6e6e6;
-  border-top: 1px solid #e6e6e6;
+  border-bottom: 1px solid #E6E6E6;
+  border-top: 1px solid #E6E6E6;
   padding: 5px;
-  background-color: #ffffff;
+  background-color: #FFFFFF;
   margin-bottom: 11px;
   margin-top: 3px;
   padding-top: 15px;
@@ -3456,8 +3462,8 @@ div#etemplate\.tab_widget {
 #   dialogOperators                        #
 #############################################*/
 .dialogOperators {
-  border-top: 0px solid #e6e6e6;
-  border-bottom: 0px solid #e6e6e6;
+  border-top: 0px solid #E6E6E6;
+  border-bottom: 0px solid #E6E6E6;
 }
 .dialogOperators td {
   padding: 2px 2px;
@@ -3754,7 +3760,7 @@ table.nextmatch_lettersearch {
   margin-bottom: 6px;
 }
 .lettersearch {
-  border: 1px solid #e6e6e6;
+  border: 1px solid #E6E6E6;
   background: #f8f8f8;
   text-align: center;
   cursor: pointer;
@@ -3764,7 +3770,7 @@ table.nextmatch_lettersearch {
   color: #ffffff;
 }
 .lettersearch_active {
-  border: 1px solid #e6e6e6;
+  border: 1px solid #E6E6E6;
   background: #f8f8f8;
   text-align: center;
   cursor: pointer;
@@ -3825,7 +3831,7 @@ td.lettersearch {
   -moz-transition-timing-function: linear;
   -o-transition-timing-function: linear;
   transition-timing-function: linear;
-  background-color: #e6e6e6;
+  background-color: #E6E6E6;
   height: 24px;
   padding: 0 5px;
 }
@@ -4049,7 +4055,7 @@ td.lettersearch {
 }
 /*popup Messsage*/
 div#egwpopup_message {
-  background-color: #ffffff;
+  background-color: #FFFFFF;
   padding: 1em;
   overflow-y: auto;
 }
@@ -4057,7 +4063,7 @@ div#egwpopup_message {
 .message {
   color: red;
   font-style: italic;
-  background: #ffffff;
+  background: #FFFFFF;
 }
 .egw_fw_ui_app_header_container {
   height: auto;
@@ -4082,15 +4088,15 @@ div#egwpopup_message {
 }
 /*Calendar ##############*/
 td.message {
-  background-color: #e6e6e6 !important;
+  background-color: #E6E6E6 !important;
   height: 0px;
   padding: 0px;
 }
 td.message span.message {
   height: 35px;
-  border-bottom: 2px solid #e6e6e6;
+  border-bottom: 2px solid #E6E6E6;
   color: red;
-  background: #e6e6e6;
+  background: #E6E6E6;
   height: auto;
   width: 100%;
 }
@@ -4361,13 +4367,13 @@ td.message span.message {
   /*print*/
 }
 #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li {
-  color: #ffffff;
+  color: #FFFFFF;
   padding: 8px 10px;
-  border-top: #e6e6e6;
+  border-top: #E6E6E6;
 }
 #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li:hover {
   background: rgba(153, 204, 255, 0.4);
-  color: #ffffff;
+  color: #FFFFFF;
 }
 #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li a {
   color: #000000;
@@ -4585,7 +4591,7 @@ td.message span.message {
   font-weight: bold;
 }
 #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header .egw_fw_ui_tab_header .notifyTabDiv:hover {
-  background-color: #1e1e1e;
+  background-color: #1E1E1E;
 }
 #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header .egw_fw_ui_tab_header:hover {
   background-color: rgba(153, 204, 255, 0.4);
@@ -4734,7 +4740,7 @@ td.message span.message {
   line-height: 17px;
 }
 #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_sidemenu_entry_header object {
-  background-color: #ffffff;
+  background-color: #FFFFFF;
   width: 24px;
   height: 24px;
 }
@@ -4822,7 +4828,7 @@ td.message span.message {
 #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_sidemenu_entry_content {
   display: block;
   background-image: none;
-  border-color: #b4b4b4;
+  border-color: #B4B4B4;
   border-style: solid;
   border-width: 1px;
   margin: 0 0 2em 0;
@@ -4831,7 +4837,7 @@ td.message span.message {
 }
 #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_sidemenu_entry_content:nth-last-of-type(-n+3) {
   background-color: #ffffff;
-  border-color: #b4b4b4;
+  border-color: #B4B4B4;
   border-right: 0px;
   margin-bottom: 0px;
   border-top-color: white;
@@ -4841,8 +4847,8 @@ td.message span.message {
   margin: 4px 5px 5px 5px;
   padding: 2px 0 2px 0;
   cursor: pointer;
-  border-color: #b4b4b4;
-  background-color: #e6e6e6;
+  border-color: #B4B4B4;
+  background-color: #E6E6E6;
   /*background-color: @egw_color_2_d;*/
 }
 #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category h1,
@@ -4869,7 +4875,7 @@ td.message span.message {
 #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category_active {
   border-bottom-width: 0px;
   margin-top: 4px;
-  background-color: #0c5da5;
+  background-color: #0C5DA5;
   color: #f2f2f2;
 }
 #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category_active h1,
@@ -4901,7 +4907,7 @@ td.message span.message {
   background-color: inherit;
 }
 #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category_active:hover {
-  background-color: #408dd2;
+  background-color: #408DD2;
   -webkit-transition: all 0.2s ease-out;
   -moz-transition: all 0.2s ease-out;
   -o-transition: all 0.2s ease-out;
@@ -4915,7 +4921,7 @@ td.message span.message {
   right: 0px;
 }
 #egw_fw_sidebar #egw_fw_splitter:hover {
-  border-color: #e6e6e6;
+  border-color: #E6E6E6;
 }
 #egw_fw_basecontainer #egw_fw_toggler {
   display: block;
@@ -5076,7 +5082,7 @@ td.message span.message {
   /*min-height: 50px;*/
 }
 .egw_fw_ui_category_content:last-of-type {
-  border-color: #b4b4b4;
+  border-color: #B4B4B4;
   margin-bottom: -2px;
 }
 .egw_fw_ui_category_content img {
@@ -5103,7 +5109,7 @@ td.message span.message {
   margin: 0px 0 1px 0px;
   position: relative;
   min-height: 18px;
-  background-color: #ffffff;
+  background-color: #FFFFFF;
   overflow-x: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
@@ -5175,7 +5181,7 @@ td.message span.message {
   width: 10px;
 }
 .egw_fw_ui_sidemenu_listitem div a:nth-child(2):hover {
-  background-color: #ff0000;
+  background-color: #FF0000;
   /*.background_color_20_gray;*/
   -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
   -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
@@ -5511,7 +5517,7 @@ td.message span.message {
 #egw_fw_topmenu_info_items #topmenu_info_quick_add span#quick_add:before {
   content: " ";
   font-size: 2em;
-  color: #0c5da5;
+  color: #0C5DA5;
   line-height: 0.6em;
   background-color: white;
 }
@@ -5522,7 +5528,7 @@ td.message span.message {
   top: 47px;
   min-width: 160px !important;
   width: 160px !important;
-  background: #ffffff;
+  background: #FFFFFF;
 }
 #egw_fw_topmenu_info_items #topmenu_info_quick_add .chzn-container:before {
   content: '';
@@ -5579,7 +5585,7 @@ td.message span.message {
   top: 6px;
   right: 112px;
   z-index: 200;
-  background-color: #ff0000;
+  background-color: #FF0000;
   -moz-transition: all 1s ease-in-out;
   -webkit-transition: all 1s ease-in-out;
   -o-transition: all 1s ease-in-out;
@@ -5742,7 +5748,7 @@ button.image_button {
   outline: 0;
   border-width: 1px;
   border-style: solid;
-  border-color: #b4b4b4;
+  border-color: #B4B4B4;
   -webkit-box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1);
   -moz-box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1);
   box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1);
@@ -5810,11 +5816,11 @@ button.image_button {
   display: block;
   outline: none;
   padding: 7px 0 7px 3px;
-  color: #26537c;
+  color: #26537C;
 }
 .sbOptions a:link,
 .sbOptions a:visited {
-  color: #26537c;
+  color: #26537C;
   text-decoration: none;
 }
 .sbOptions a:hover,
@@ -5889,7 +5895,7 @@ button.image_button {
  */
 /* TABLE STYLE */
 .th {
-  border-bottom: 1px solid #e6e6e6;
+  border-bottom: 1px solid #E6E6E6;
 }
 .th.thb {
   border-color: darkgray;
@@ -5924,7 +5930,7 @@ table.egwGridView_outer thead tr th {
   background-position: -200px;
   font-weight: normal;
   padding: 3px 1px 3px 4px;
-  border: 1px solid #b4b4b4;
+  border: 1px solid #B4B4B4;
   border-top: transparent;
   vertical-align: middle;
   overflow: auto;
@@ -5992,7 +5998,7 @@ table.egwGridView_outer > tbody > tr > td {
 }
 table.egwGridView_outer > tbody > tr > td .et2_link {
   margin-left: 0px;
-  color: #26537c;
+  color: #26537C;
 }
 table.egwGridView_outer > tbody > tr > td img {
   border: 1px solid transparent;
@@ -6032,7 +6038,7 @@ table.egwGridView_grid tbody tr.selected {
   background-color: rgba(102, 153, 204, 0.7) !important;
 }
 table.egwGridView_grid tbody td {
-  border-bottom: 1px solid #e6e6e6;
+  border-bottom: 1px solid #E6E6E6;
   color: #000000;
 }
 table.egwGridView_grid tbody td .innerContainer {
@@ -6066,7 +6072,7 @@ table.egwGridView_grid > tr > td {
   border-right: 1px;
   padding: 0.3em 0 0.3em 0.3em;
   border-bottom: 1px solid;
-  color: #e6e6e6;
+  color: #E6E6E6;
   /*&:hover {background-color: @egw_color_2_e;} legacy*/
 }
 table.egwGridView_grid > tr > td:active {
@@ -6155,7 +6161,7 @@ table.nextmatch_header img {
   font-size: 1.5em;
 }
 .egwGridView_empty td {
-  color: #1e1e1e !important;
+  color: #1E1E1E !important;
 }
 /**
  * EGroupware: Stylite Pixelegg template
@@ -6421,7 +6427,7 @@ a.textSidebox {
   }
 }
 .egw-loading-prompt-container::before {
-  opacity: .3;
+  opacity: 0.3;
   content: "";
   background-color: #aaaaaa;
   width: 100%;
@@ -6500,7 +6506,7 @@ a.textSidebox {
   z-index: 999;
   width: 100px;
   border-radius: 5px;
-  border: solid 10px  #679FD2;
+  border: solid 10px #679FD2;
   transform: translate(-50%, -50%);
 }
 /**
diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css
index f5d94a41f6..ac93f19c27 100644
--- a/pixelegg/css/pixelegg.css
+++ b/pixelegg/css/pixelegg.css
@@ -125,7 +125,7 @@
   }
   html[data-darkmode='1'] #mail_sidebox_header.egw_fw_ui_sidemenu_entry_header_active,
   html[data-darkmode='1'] #mail_sidebox_header {
-    border-color: #5db9ec!important;
+    border-color: #5db9ec !important;
   }
   html[data-darkmode='1'] #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header #mail-egw_fw_ui_tab_header.egw_fw_ui_tab_header_active {
     border-top-color: #5db9ec !important;
@@ -230,7 +230,7 @@
     display: inline-block;
     /*border: 1px solid cornflowerblue;*/
     border: 1px solid rgba(0, 0, 0, 0.15);
-    background-color: #e6e6e6;
+    background-color: #E6E6E6;
   }
   .et2_placeholder .et2_attr {
     color: #000000;
@@ -239,7 +239,7 @@
  * Label widget, and labels for other widgets
  */
   .et2_label {
-    color: #1e1e1e;
+    color: #1E1E1E;
     white-space: pre-wrap;
   }
   /**
@@ -286,7 +286,7 @@
     -moz-transition-timing-function: linear;
     -o-transition-timing-function: linear;
     transition-timing-function: linear;
-    background-color: #e6e6e6;
+    background-color: #E6E6E6;
   }
   .et2_button_icon {
     height: 16px;
@@ -295,13 +295,13 @@
   /* give the image a button lock and feel*/
   img.et2_button_icon[src*="svg"] {
     background-color: #b4b4b4;
-    background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjYjRiNGI0IiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjYjRiNGI0IiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=);
-    background-image: -moz-linear-gradient(top, #b4b4b4, #b4b4b4);
-    background-image: -ms-linear-gradient(top, #b4b4b4, #b4b4b4);
-    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#b4b4b4), to(#b4b4b4));
-    background-image: -webkit-linear-gradient(top, #b4b4b4, #b4b4b4);
-    background-image: -o-linear-gradient(top, #b4b4b4, #b4b4b4);
-    background-image: linear-gradient(top, #b4b4b4, #b4b4b4);
+    background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjQjRCNEI0IiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjQjRCNEI0IiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=);
+    background-image: -moz-linear-gradient(top, #B4B4B4, #B4B4B4);
+    background-image: -ms-linear-gradient(top, #B4B4B4, #B4B4B4);
+    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#B4B4B4), to(#B4B4B4));
+    background-image: -webkit-linear-gradient(top, #B4B4B4, #B4B4B4);
+    background-image: -o-linear-gradient(top, #B4B4B4, #B4B4B4);
+    background-image: linear-gradient(top, #B4B4B4, #B4B4B4);
     background-repeat: repeat-x;
   }
   img.et2_button_icon[src*="svg"]:hover {
@@ -345,13 +345,13 @@
     min-width: 21.5ex;
   }
   span.et2_date span {
-    color: #ffffff;
+    color: #FFFFFF;
   }
   span.et2_date_duration {
-    border: 1px solid #e6e6e6;
+    border: 1px solid #E6E6E6;
   }
   span.et2_date_duration :not(input:first-child) {
-    border-left: 1px solid #f2f2f2;
+    border-left: 1px solid #F2F2F2;
   }
   .ui-datepicker .ui-datepicker-buttonpane button[data-handler="today"] {
     background-image: url(../images/bullet.svg);
@@ -385,20 +385,20 @@
     background-image: url("../images/delete.svg");
   }
   .et2_file .progress p {
-    background-color: #ffdd73;
+    background-color: #FFDD73;
   }
   span.et2_file_span {
     background-image: url(../images/attach.svg);
   }
   span.et2_file_span img[url*="svg"] {
     background-color: #b4b4b4 !important;
-    background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjYjRiNGI0IiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjYjRiNGI0IiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=) !important;
-    background-image: -moz-linear-gradient(top, #b4b4b4, #b4b4b4) !important;
-    background-image: -ms-linear-gradient(top, #b4b4b4, #b4b4b4) !important;
-    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#b4b4b4), to(#b4b4b4)) !important;
-    background-image: -webkit-linear-gradient(top, #b4b4b4, #b4b4b4) !important;
-    background-image: -o-linear-gradient(top, #b4b4b4, #b4b4b4) !important;
-    background-image: linear-gradient(top, #b4b4b4, #b4b4b4) !important;
+    background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjQjRCNEI0IiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjQjRCNEI0IiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=) !important;
+    background-image: -moz-linear-gradient(top, #B4B4B4, #B4B4B4) !important;
+    background-image: -ms-linear-gradient(top, #B4B4B4, #B4B4B4) !important;
+    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#B4B4B4), to(#B4B4B4)) !important;
+    background-image: -webkit-linear-gradient(top, #B4B4B4, #B4B4B4) !important;
+    background-image: -o-linear-gradient(top, #B4B4B4, #B4B4B4) !important;
+    background-image: linear-gradient(top, #B4B4B4, #B4B4B4) !important;
     background-repeat: repeat-x !important;
     fill: red !important;
   }
@@ -409,7 +409,7 @@
     box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6) !important;
   }
   div.et2_file input.et2_file_upload {
-    background-color: #ffffff !important;
+    background-color: #FFFFFF !important;
     -webkit-border-radius: 3px;
     -moz-border-radius: 3px;
     border-radius: 3px;
@@ -427,25 +427,25 @@
   }
   /* Gantt widget */
   .et2_gantt .gantt_task_line {
-    background-color: #679fd2;
+    background-color: #679FD2;
   }
   .et2_gantt .gantt_task_line .gantt_task_content {
-    color: #043a6b;
+    color: #043A6B;
   }
   .et2_gantt .gantt_task_line .gantt_selected {
     background-color: rgba(255, 194, 0, 0.01);
   }
   .et2_gantt .gantt_task_line .gantt_task_progress {
-    color: #043a6b;
-    background-color: #ffdd73;
+    color: #043A6B;
+    background-color: #FFDD73;
     /* outline progress in a complementary color */
-    border: 1px solid #bf9d30;
+    border: 1px solid #BF9D30;
     border-right: none;
     margin: -1px;
   }
   .et2_gantt .gantt_task_line.gantt_milestone {
     background-color: #ffc200;
-    border-color: #bf9d30;
+    border-color: #BF9D30;
   }
   .et2_gantt .gantt_task_link .gantt_line_wrapper div {
     background-color: green;
@@ -460,16 +460,16 @@
     box-shadow: 0 0 5px 0 green;
   }
   .et2_gantt .gantt_task_link.invalid_constraint .gantt_line_wrapper div {
-    background-color: #ae1d00;
+    background-color: #AE1D00;
   }
   .et2_gantt .gantt_task_link.invalid_constraint .gantt_link_arrow_left {
-    border-right-color: #ae1d00;
+    border-right-color: #AE1D00;
   }
   .et2_gantt .gantt_task_link.invalid_constraint .gantt_link_arrow_right {
-    border-left-color: #ae1d00;
+    border-left-color: #AE1D00;
   }
   .et2_gantt .gantt_task_link.invalid_constraint:hover .gantt_line_wrapper div {
-    box-shadow: 0 0 5px 0 #ae1d00;
+    box-shadow: 0 0 5px 0 #AE1D00;
   }
   /*
         Link to / Selector Widget
@@ -503,7 +503,7 @@
     background-size: contain;
   }
   .et2_link {
-    color: #0c5da5;
+    color: #0C5DA5;
   }
   .et2_link_list tr {
     cursor: pointer;
@@ -601,7 +601,7 @@
 */
   .et2_required,
   [required] {
-    background-color: #ffdd73;
+    background-color: #FFDD73;
     -webkit-border-top-right-radius: 3px;
     -webkit-border-bottom-right-radius: 3px;
     -webkit-border-bottom-left-radius: 3px;
@@ -620,7 +620,7 @@
  * hrule widget
  */
   hr {
-    border-top: 1px solid #e6e6e6;
+    border-top: 1px solid #E6E6E6;
   }
   /**
  * grid widget
@@ -671,7 +671,7 @@
     background-color: transparent;
   }
   .et2_nextmatch .egwGridView_outer thead tr > th:first-child {
-    border-left: 6px solid #b4b4b4;
+    border-left: 6px solid #B4B4B4;
   }
   .et2_nextmatch .nextmatch_header {
     padding: 0;
@@ -690,7 +690,7 @@
 ################################################################*/
   .nextmatch_header_row .et2_label select {
     margin-left: 3px;
-    border-color: #cdcdcd;
+    border-color: #CDCDCD;
   }
   .nextmatch_header_row > .filters {
     /*width: 83%;*/
@@ -739,7 +739,7 @@
     margin-right: 2ex;
     width: 15%;
     border: 1px solid rgba(0, 0, 0, 0.15);
-    border-color: #b4b4b4;
+    border-color: #B4B4B4;
     -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
     -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
     box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
@@ -758,7 +758,7 @@
     outline: 0;
     border-width: 1px;
     border-style: solid;
-    border-color: #b4b4b4;
+    border-color: #B4B4B4;
     -webkit-box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1);
     -moz-box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1);
     box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1);
@@ -847,7 +847,7 @@
     vertical-align: middle;
     margin-right: -2px;
     padding: 0px 1ex;
-    background-color: #ffffff;
+    background-color: #FFFFFF;
     background-image: none;
   }
   .et2_dropdown button img {
@@ -884,7 +884,7 @@
     background-color: #b3e4a6;
   }
   .et2_dropdown button.ui-state-hover {
-    background-color: #e6e6e6;
+    background-color: #E6E6E6;
   }
   .sidebox-favorites ul.favorites {
     width: 99%;
@@ -995,7 +995,7 @@
     position: relative;
   }
   div.et2_progress > div {
-    background-color: #ffdd73;
+    background-color: #FFDD73;
     /*height: 5px;*/
   }
   /**
@@ -1012,7 +1012,7 @@
  * et2_textbox
  */
   textarea.et2_textbox {
-    border: 1px solid #e6e6e6;
+    border: 1px solid #E6E6E6;
   }
   textarea,
   textarea.description {
@@ -1215,9 +1215,9 @@ option:checked {
   position: absolute;
   z-index: 9999;
   max-width: 300px;
-  -webkit-box-shadow: 0 0 5px #aaaaaa;
-  -moz-box-shadow: 0 0 5px #aaaaaa;
-  box-shadow: 0 0 5px #aaaaaa;
+  -webkit-box-shadow: 0 0 5px #aaa;
+  -moz-box-shadow: 0 0 5px #aaa;
+  box-shadow: 0 0 5px #aaa;
 }
 /* Component containers
 ----------------------------------*/
@@ -1250,7 +1250,7 @@ option:checked {
   border-right: solid 1px 0px !important;
   border-bottom: solid 1px 0px !important;
   /*.gradient_thead !important;*/
-  background-color: #0c5da5;
+  background-color: #0C5DA5;
   /*border-color: @gray_10;*/
   color: #000000;
   font-weight: bold;
@@ -1269,7 +1269,7 @@ option:checked {
   border-left: solid 1px 1px;
   border-right: solid 1px 1px;
   border-bottom: solid 1px 1px;
-  border-color: #b4b4b4;
+  border-color: #B4B4B4;
   background: transparent;
   font-weight: normal;
   color: #1a1a1a;
@@ -1296,14 +1296,14 @@ option:checked {
 .ui-state-focus,
 .ui-widget-header .ui-state-focus,
 .ui-widget-content .ui-state-focus {
-  border-color: #e6e6e6;
+  border-color: #E6E6E6;
   background: rgba(102, 153, 204, 0.7);
   background-image: none;
-  color: #ffffff;
+  color: #FFFFFF;
   font-weight: normal;
 }
 .ui-state-focus.ui-menu-item a {
-  color: #e6e6e6;
+  color: #E6E6E6;
 }
 .ui-state-hover,
 .ui-widget-content .ui-state-hover,
@@ -1312,7 +1312,7 @@ option:checked {
   border-left: solid 1px 1px;
   border-right: solid 1px 1px;
   border-bottom: solid 1px 1px;
-  border-color: #e6e6e6;
+  border-color: #E6E6E6;
   background: rgba(102, 153, 204, 0.7);
   background-image: none;
   color: #ffffff;
@@ -1331,7 +1331,7 @@ option:checked {
   border-left: solid 1px 1px;
   border-right: solid 1px 1px;
   border-bottom: solid 1px 1px;
-  border-color: #cdcdcd;
+  border-color: #CDCDCD;
   background-image: none;
   font-weight: bold;
   color: #808080;
@@ -1351,7 +1351,7 @@ option:checked {
   border-left: solid 1px 1px;
   border-right: solid 1px 1px;
   border-bottom: solid 1px 1px;
-  border-color: #b4b4b4;
+  border-color: #B4B4B4;
   color: #808080;
 }
 .ui-state-highlight a,
@@ -1366,27 +1366,27 @@ option:checked {
   border-left: solid 1px 1px;
   border-right: solid 1px 1px;
   border-bottom: solid 1px 1px;
-  border-color: #e6e6e6;
+  border-color: #E6E6E6;
   color: #b3b3b3;
 }
 .ui-state-error a,
 .ui-widget-content .ui-state-error a {
-  color: #ff0000;
+  color: #FF0000;
 }
 .ui-state-error-text,
 .ui-widget-content .ui-state-error-text,
 .ui-widget-header .ui-state-error-text {
-  color: #ff0000;
+  color: #FF0000;
 }
 .drop-hover {
-  background-color: #ffdd73;
+  background-color: #FFDD73;
 }
 .ui-icon-close {
   /*visibility: hidden;*/
   /*background-image: url(../images/search.png);*/
   background-image: url("../images/cancel.svg");
   background-repeat: no-repeat;
-  background-color: #ffffff;
+  background-color: #FFFFFF;
   background-size: 12px 12px;
   width: 16px;
   height: 16px;
@@ -1416,15 +1416,15 @@ span.ui-icon-close {
 .ui-icon-closethick {
   background-image: url(../images/close.svg) !important;
   background-repeat: no-repeat;
-  background-color: #ffffff;
+  background-color: #FFFFFF;
   background-size: contain;
   background-position: 0 0 !important;
   color: #ffffff;
   height: 16px;
 }
 .ui-icon-closethick:hover {
-  background-color: #e6e6e6;
-  color: #1e1e1e;
+  background-color: #E6E6E6;
+  color: #1E1E1E;
   -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
   -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
   box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
@@ -1460,7 +1460,7 @@ span.ui-icon-close {
 /*###########################################*/
 /* col selection */
 span.ui-multiselect-header {
-  color: #ffffff;
+  color: #FFFFFF;
 }
 span.ui-icon-search {
   background-image: url(../images/search.svg) !important;
@@ -1499,30 +1499,30 @@ span.ui-icon-search {
 /*###########################################*/
 /*Dialog: edit row*/
 .ui-widget-overlay {
-  background: #cdcdcd;
+  background: #CDCDCD;
 }
 .ui-dialog {
   z-index: 1000;
-  box-shadow: -2px 1px 9px 3px #b4b4b4;
+  box-shadow: -2px 1px 9px 3px #B4B4B4;
 }
 .ui-dialog .ui-dialog-buttonpane {
-  padding-left: .8em;
-  padding-right: .8em;
+  padding-left: 0.8em;
+  padding-right: 0.8em;
   padding-top: 0.7em;
 }
 .ui-dialog .ui-dialog-titlebar {
-  padding-left: .8em;
-  padding-right: .8em;
+  padding-left: 0.8em;
+  padding-right: 0.8em;
   font-size: 12pt;
   border: none;
   font-weight: normal;
   background: white;
 }
 .ui-dialog .ui-dialog-titlebar-close {
-  right: .8em;
+  right: 0.8em;
 }
 .ui-widget-content {
-  border: 1px solid #b4b4b4;
+  border: 1px solid #B4B4B4;
 }
 .ui-widget-content .et2_selectbox button.et2_button_text,
 .ui-widget-content .et2_selectbox select.et2_selectbox {
@@ -1553,35 +1553,35 @@ button.ui-button {
   -moz-transition-timing-function: linear;
   -o-transition-timing-function: linear;
   transition-timing-function: linear;
-  background-color: #e6e6e6;
+  background-color: #E6E6E6;
   padding-left: 30px;
   background-position: 6px center;
   background-repeat: no-repeat;
   background-size: 20px auto;
   /*.Button_size_h32_auto;*/
   height: 24px;
-  border-color: #b4b4b4;
+  border-color: #B4B4B4;
   outline: none;
 }
 button.ui-button:hover {
-  background-color: #b4b4b4;
-  color: #1e1e1e;
+  background-color: #B4B4B4;
+  color: #1E1E1E;
 }
 button.ui-button .ui-button-icon-primary:hover {
-  background-color: #b4b4b4;
-  color: #1e1e1e;
+  background-color: #B4B4B4;
+  color: #1E1E1E;
   box-shadow: none;
 }
 /*###########################################*/
 /*Dialog: calendar edit series*/
 .ui-dialog-buttonset button.ui-button-text-only {
-  background-color: #cdcdcd;
+  background-color: #CDCDCD;
   background: inherit;
   color: #000000 !important;
   font-weight: normal !important;
 }
 .ui-dialog-buttonset button.ui-button-text-only:hover {
-  background-color: #b4b4b4;
+  background-color: #B4B4B4;
 }
 .ui-dialog-buttonset button.ui-button {
   /*.border_normal;*/
@@ -1601,7 +1601,7 @@ button.ui-button .ui-button-icon-primary:hover {
   -moz-transition-timing-function: linear;
   -o-transition-timing-function: linear;
   transition-timing-function: linear;
-  background-color: #e6e6e6;
+  background-color: #E6E6E6;
   padding-left: 30px;
   background-position: 6px center;
   background-repeat: no-repeat;
@@ -1610,8 +1610,8 @@ button.ui-button .ui-button-icon-primary:hover {
   height: 24px;
 }
 .ui-dialog-buttonset button.ui-button:hover {
-  background-color: #b4b4b4;
-  color: #1e1e1e;
+  background-color: #B4B4B4;
+  color: #1E1E1E;
 }
 /*###########################################*/
 /*Dialog: calendar edit series*/
@@ -1619,7 +1619,7 @@ div#ui-datepicker-div {
   -webkit-border-radius: 3px;
   -moz-border-radius: 3px;
   border-radius: 3px;
-  border: 1px solid #b4b4b4;
+  border: 1px solid #B4B4B4;
   -webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
   -moz-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
   box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
@@ -1640,8 +1640,8 @@ div#ui-datepicker-div {
   border: 1px solid #b4b4b4;
 }
 .ui-datepicker table.ui-datepicker-calendar .ui-state-active {
-  background-color: #0c5da5;
-  color: #ffffff;
+  background-color: #0C5DA5;
+  color: #FFFFFF;
 }
 .ui-datepicker div.ui-timepicker-div {
   padding: 3px;
@@ -1664,17 +1664,17 @@ div#ui-datepicker-div {
   font-size: 0.9em;
 }
 .ui-datepicker div.ui-timepicker-div div.ui_tpicker_hour_slider span.ui-slider-handle {
-  background-color: #0c5da5;
+  background-color: #0C5DA5;
   padding: 1px;
   outline: none;
 }
 .ui-datepicker div.ui-timepicker-div div.ui_tpicker_minute_slider span.ui-slider-handle {
-  background-color: #0c5da5;
+  background-color: #0C5DA5;
   padding: 1px;
   outline: none;
 }
 .ui-datepicker div.ui-datepicker-buttonpane {
-  background-color: #679fd2;
+  background-color: #679FD2;
 }
 .ui-datepicker button.ui-datepicker-current .ui-state-hover {
   background-color: #b3e4a6 !important;
@@ -2047,6 +2047,9 @@ div#loginMainDiv.stockLoginBackground div#centerBox form {
 #loginMainDiv div#login_footer .apps .app span {
   display: none;
 }
+#loginMainDiv div#login_footer .apps .app[data-id="guacamole"] .content img.icon2-bg {
+  right: 15px;
+}
 #loginMainDiv div#login_footer .apps .tooltip {
   display: inline-flex;
   position: absolute;
@@ -2126,6 +2129,7 @@ div#loginMainDiv.stockLoginBackground div#centerBox form {
   z-index: 100;
   padding: 0;
   width: 280px;
+  border-radius: 5px;
 }
 #loginMainDiv div#centerBox .egw_logo {
   width: 24px;
@@ -2146,6 +2150,7 @@ div#loginMainDiv.stockLoginBackground div#centerBox form {
   background-color: white;
   padding: 1em;
   border: 1px solid #cdcdce;
+  border-radius: 5px;
 }
 #loginMainDiv div#centerBox form .hiddenCredential {
   display: none;
@@ -2161,28 +2166,28 @@ div#loginMainDiv.stockLoginBackground div#centerBox form {
 }
 #loginMainDiv div#centerBox form table.divLoginbox div.LoginPasswordImage {
   background-color: #b3ad54;
-  background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjZmZjMjAwIiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjNDA4ZGQyIiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=);
-  background-image: -moz-linear-gradient(top, #ffc200, #408dd2);
-  background-image: -ms-linear-gradient(top, #ffc200, #408dd2);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffc200), to(#408dd2));
-  background-image: -webkit-linear-gradient(top, #ffc200, #408dd2);
-  background-image: -o-linear-gradient(top, #ffc200, #408dd2);
-  background-image: linear-gradient(top, #ffc200, #408dd2);
+  background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjZmZjMjAwIiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjNDA4REQyIiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=);
+  background-image: -moz-linear-gradient(top, #ffc200, #408DD2);
+  background-image: -ms-linear-gradient(top, #ffc200, #408DD2);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffc200), to(#408DD2));
+  background-image: -webkit-linear-gradient(top, #ffc200, #408DD2);
+  background-image: -o-linear-gradient(top, #ffc200, #408DD2);
+  background-image: linear-gradient(top, #ffc200, #408DD2);
   background-repeat: repeat-x;
 }
 #loginMainDiv div#centerBox form table.divLoginbox div.LoginPasswordImage img.passwordImage {
   margin: 0 auto;
   max-width: 400px;
   border-top: solid 1px 5px;
-  border-left: solid 1px #eeeeee;
-  border-right: solid 1px #eeeeee;
-  border-bottom: solid 1px #eeeeee;
+  border-left: solid 1px #EEE;
+  border-right: solid 1px #EEE;
+  border-bottom: solid 1px #EEE;
 }
 #loginMainDiv div#centerBox form table.divLoginbox div.LoginPasswordImage img.passwordImage[src$="svg"] {
   border-top: solid 1px 5px;
-  border-left: solid 1px #eeeeee;
-  border-right: solid 1px #eeeeee;
-  border-bottom: solid 1px #eeeeee;
+  border-left: solid 1px #EEE;
+  border-right: solid 1px #EEE;
+  border-bottom: solid 1px #EEE;
   width: 40px;
   height: 40px;
 }
@@ -2296,13 +2301,13 @@ div#loginMainDiv.stockLoginBackground div#centerBox form {
 #wrap img[src$="svg"],
 #wrap background-image[url$="svg"] {
   background-color: #679fd2;
-  background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjNjc5ZmQyIiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjNjc5ZmQyIiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=);
-  background-image: -moz-linear-gradient(top, #679fd2, #679fd2);
-  background-image: -ms-linear-gradient(top, #679fd2, #679fd2);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#679fd2), to(#679fd2));
-  background-image: -webkit-linear-gradient(top, #679fd2, #679fd2);
-  background-image: -o-linear-gradient(top, #679fd2, #679fd2);
-  background-image: linear-gradient(top, #679fd2, #679fd2);
+  background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjNjc5RkQyIiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjNjc5RkQyIiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=);
+  background-image: -moz-linear-gradient(top, #679FD2, #679FD2);
+  background-image: -ms-linear-gradient(top, #679FD2, #679FD2);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#679FD2), to(#679FD2));
+  background-image: -webkit-linear-gradient(top, #679FD2, #679FD2);
+  background-image: -o-linear-gradient(top, #679FD2, #679FD2);
+  background-image: linear-gradient(top, #679FD2, #679FD2);
   background-repeat: repeat-x;
 }
 #img1,
@@ -2456,13 +2461,13 @@ button:disabled,
 button.et2_button_text background-image[src$="svg"],
 input[type=button] background-image[src$="svg"] {
   background-color: #b4b4b4;
-  background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjYjRiNGI0IiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjYjRiNGI0IiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=);
-  background-image: -moz-linear-gradient(top, #b4b4b4, #b4b4b4);
-  background-image: -ms-linear-gradient(top, #b4b4b4, #b4b4b4);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#b4b4b4), to(#b4b4b4));
-  background-image: -webkit-linear-gradient(top, #b4b4b4, #b4b4b4);
-  background-image: -o-linear-gradient(top, #b4b4b4, #b4b4b4);
-  background-image: linear-gradient(top, #b4b4b4, #b4b4b4);
+  background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjQjRCNEI0IiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjQjRCNEI0IiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=);
+  background-image: -moz-linear-gradient(top, #B4B4B4, #B4B4B4);
+  background-image: -ms-linear-gradient(top, #B4B4B4, #B4B4B4);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#B4B4B4), to(#B4B4B4));
+  background-image: -webkit-linear-gradient(top, #B4B4B4, #B4B4B4);
+  background-image: -o-linear-gradient(top, #B4B4B4, #B4B4B4);
+  background-image: linear-gradient(top, #B4B4B4, #B4B4B4);
   background-repeat: repeat-x;
 }
 button.et2_button_text:hover,
@@ -2511,17 +2516,17 @@ button.et2_button_with_image {
   background-repeat: no-repeat !important;
   background-position: center;
   background-size: 20px 20px;
-  background-color: #e6e6e6;
+  background-color: #E6E6E6;
 }
 button.et2_button_with_image background-color[url$="svg"] {
   background-color: #b4b4b4;
-  background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjYjRiNGI0IiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjYjRiNGI0IiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=);
-  background-image: -moz-linear-gradient(top, #b4b4b4, #b4b4b4);
-  background-image: -ms-linear-gradient(top, #b4b4b4, #b4b4b4);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#b4b4b4), to(#b4b4b4));
-  background-image: -webkit-linear-gradient(top, #b4b4b4, #b4b4b4);
-  background-image: -o-linear-gradient(top, #b4b4b4, #b4b4b4);
-  background-image: linear-gradient(top, #b4b4b4, #b4b4b4);
+  background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjQjRCNEI0IiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjQjRCNEI0IiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=);
+  background-image: -moz-linear-gradient(top, #B4B4B4, #B4B4B4);
+  background-image: -ms-linear-gradient(top, #B4B4B4, #B4B4B4);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#B4B4B4), to(#B4B4B4));
+  background-image: -webkit-linear-gradient(top, #B4B4B4, #B4B4B4);
+  background-image: -o-linear-gradient(top, #B4B4B4, #B4B4B4);
+  background-image: linear-gradient(top, #B4B4B4, #B4B4B4);
   background-repeat: repeat-x;
 }
 button.et2_button_with_image.et2_button_text {
@@ -2562,7 +2567,7 @@ button.et2_button_delete {
   -moz-transition-timing-function: linear;
   -o-transition-timing-function: linear;
   transition-timing-function: linear;
-  background-color: #e6e6e6;
+  background-color: #E6E6E6;
   padding-left: 30px;
   background-position: 6px center;
   background-repeat: no-repeat;
@@ -2597,7 +2602,7 @@ button.et2_button_delete:hover {
   -moz-transition-timing-function: linear;
   -o-transition-timing-function: linear;
   transition-timing-function: linear;
-  background-color: #e6e6e6;
+  background-color: #E6E6E6;
   padding-left: 30px;
   background-position: 6px center;
   background-repeat: no-repeat;
@@ -2632,7 +2637,7 @@ button.et2_button_delete:active {
   -moz-transition-timing-function: linear;
   -o-transition-timing-function: linear;
   transition-timing-function: linear;
-  background-color: #e6e6e6;
+  background-color: #E6E6E6;
   padding-left: 30px;
   background-position: 6px center;
   background-repeat: no-repeat;
@@ -2664,7 +2669,7 @@ button.et2_button_delete:active {
   -moz-transition-timing-function: linear;
   -o-transition-timing-function: linear;
   transition-timing-function: linear;
-  background-color: #e6e6e6;
+  background-color: #E6E6E6;
   padding-left: 30px;
   background-position: 6px center;
   background-repeat: no-repeat;
@@ -2711,7 +2716,7 @@ button#cancel {
   -moz-transition-timing-function: linear;
   -o-transition-timing-function: linear;
   transition-timing-function: linear;
-  background-color: #e6e6e6;
+  background-color: #E6E6E6;
   padding-left: 30px;
   background-position: 6px center;
   background-repeat: no-repeat;
@@ -2753,7 +2758,7 @@ button#cancel:active {
   -moz-transition-timing-function: linear;
   -o-transition-timing-function: linear;
   transition-timing-function: linear;
-  background-color: #e6e6e6;
+  background-color: #E6E6E6;
   padding-left: 30px;
   background-position: 6px center;
   background-repeat: no-repeat;
@@ -2816,7 +2821,7 @@ button[id="add"] {
   -moz-transition-timing-function: linear;
   -o-transition-timing-function: linear;
   transition-timing-function: linear;
-  background-color: #e6e6e6;
+  background-color: #E6E6E6;
   padding-left: 30px;
   background-position: 6px center;
   background-repeat: no-repeat;
@@ -2869,7 +2874,7 @@ button[id="add"] {
   -webkit-overflow-scrolling: touch;
 }
 .chzn-container .chzn-results li {
-  color: #1e1e1e;
+  color: #1E1E1E;
 }
 .chzn-container .chzn-results li.highlighted {
   background: rgba(153, 204, 255, 0.4);
@@ -2882,7 +2887,7 @@ button[id="add"] {
 .chzn-container-active .chzn-choices li.search-field input {
   color: #111 !important;
   border: 1px solid rgba(0, 0, 0, 0.15);
-  border-color: #b4b4b4;
+  border-color: #B4B4B4;
   -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
   -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
   box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5);
@@ -2901,7 +2906,7 @@ button[id="add"] {
   outline: 0;
   border-width: 1px;
   border-style: solid;
-  border-color: #b4b4b4;
+  border-color: #B4B4B4;
   -webkit-box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1);
   -moz-box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1);
   box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1);
@@ -3038,7 +3043,7 @@ select:focus,
   outline: 0;
   border-width: 1px;
   border-style: solid;
-  border-color: #b4b4b4;
+  border-color: #B4B4B4;
   -webkit-box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1);
   -moz-box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1);
   box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1);
@@ -3099,19 +3104,19 @@ button {
   padding-right: 0;
   border-width: 1px;
   border-style: solid;
-  border-color: #e6e6e6;
+  border-color: #E6E6E6;
 }
 a:link,
 a:visited,
 select,
 input,
 textarea {
-  color: #26537c;
+  color: #26537C;
 }
 a:link,
 a:visited {
   cursor: pointer;
-  color: #26537c;
+  color: #26537C;
   text-decoration: none;
 }
 a:hover,
@@ -3235,7 +3240,7 @@ div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl div.su
 }*/
 div#popupMainDiv {
   padding: 8px;
-  background-color: #ffffff;
+  background-color: #FFFFFF;
   background-repeat: repeat-x;
 }
 div#popupMainDiv > * {
@@ -3270,8 +3275,8 @@ form.et2_container div table.et2_grid tbody tr td .et2_tabbox .et2_tabs table.et
   background-color: #ffffff;
 }
 .high {
-  border-top: 5px solid #e6e6e6;
-  border-bottom: 5px solid #e6e6e6 !important;
+  border-top: 5px solid #E6E6E6;
+  border-bottom: 5px solid #E6E6E6 !important;
 }
 /*Main div*/
 table.dialog-main-view {
@@ -3322,7 +3327,7 @@ table.dialog-main-view {
   border-top: none;
 }
 .dialogHeader table.et2_grid .th {
-  background-color: #0c5da5 !important;
+  background-color: #0C5DA5 !important;
 }
 .dialogHeader table.et2_grid tr {
   height: 30px;
@@ -3347,8 +3352,8 @@ table.dialog-main-view {
   text-align: right;
 }
 .dialogHeader td.space span img {
-  background: #ffffff;
-  border: 2px solid #ffffff;
+  background: #FFFFFF;
+  border: 2px solid #FFFFFF;
   /*filter grey*/
   filter: url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#grayscale");
   /* Firefox 10+, Firefox on Android */
@@ -3382,7 +3387,7 @@ tr.dialogHeader4 .et2_label {
   padding-left: 0em;
   margin: 0;
   background-image: none;
-  background-color: #ffffff;
+  background-color: #FFFFFF;
 }
 .et2_tabheader :first-child {
   margin-left: 0px;
@@ -3400,7 +3405,7 @@ tr.dialogHeader4 .et2_label {
   -moz-user-select: none;
   user-select: none;
   min-width: 73px;
-  border-bottom: 3px solid #e6e6e6;
+  border-bottom: 3px solid #E6E6E6;
   margin-bottom: -3px;
 }
 .et2_tabflag:hover,
@@ -3431,10 +3436,10 @@ td.etemplate_tab_active.th {
 .et2_tabs,
 .tab_body {
   border: none;
-  border-bottom: 1px solid #e6e6e6;
-  border-top: 1px solid #e6e6e6;
+  border-bottom: 1px solid #E6E6E6;
+  border-top: 1px solid #E6E6E6;
   padding: 5px;
-  background-color: #ffffff;
+  background-color: #FFFFFF;
   margin-bottom: 11px;
   margin-top: 3px;
   padding-top: 15px;
@@ -3467,8 +3472,8 @@ div#etemplate\.tab_widget {
 #   dialogOperators                        #
 #############################################*/
 .dialogOperators {
-  border-top: 0px solid #e6e6e6;
-  border-bottom: 0px solid #e6e6e6;
+  border-top: 0px solid #E6E6E6;
+  border-bottom: 0px solid #E6E6E6;
 }
 .dialogOperators td {
   padding: 2px 2px;
@@ -3765,7 +3770,7 @@ table.nextmatch_lettersearch {
   margin-bottom: 6px;
 }
 .lettersearch {
-  border: 1px solid #e6e6e6;
+  border: 1px solid #E6E6E6;
   background: #f8f8f8;
   text-align: center;
   cursor: pointer;
@@ -3775,7 +3780,7 @@ table.nextmatch_lettersearch {
   color: #ffffff;
 }
 .lettersearch_active {
-  border: 1px solid #e6e6e6;
+  border: 1px solid #E6E6E6;
   background: #f8f8f8;
   text-align: center;
   cursor: pointer;
@@ -3836,7 +3841,7 @@ td.lettersearch {
   -moz-transition-timing-function: linear;
   -o-transition-timing-function: linear;
   transition-timing-function: linear;
-  background-color: #e6e6e6;
+  background-color: #E6E6E6;
   height: 24px;
   padding: 0 5px;
 }
@@ -4060,7 +4065,7 @@ td.lettersearch {
 }
 /*popup Messsage*/
 div#egwpopup_message {
-  background-color: #ffffff;
+  background-color: #FFFFFF;
   padding: 1em;
   overflow-y: auto;
 }
@@ -4068,7 +4073,7 @@ div#egwpopup_message {
 .message {
   color: red;
   font-style: italic;
-  background: #ffffff;
+  background: #FFFFFF;
 }
 .egw_fw_ui_app_header_container {
   height: auto;
@@ -4093,15 +4098,15 @@ div#egwpopup_message {
 }
 /*Calendar ##############*/
 td.message {
-  background-color: #e6e6e6 !important;
+  background-color: #E6E6E6 !important;
   height: 0px;
   padding: 0px;
 }
 td.message span.message {
   height: 35px;
-  border-bottom: 2px solid #e6e6e6;
+  border-bottom: 2px solid #E6E6E6;
   color: red;
-  background: #e6e6e6;
+  background: #E6E6E6;
   height: auto;
   width: 100%;
 }
@@ -4372,13 +4377,13 @@ td.message span.message {
   /*print*/
 }
 #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li {
-  color: #ffffff;
+  color: #FFFFFF;
   padding: 8px 10px;
-  border-top: #e6e6e6;
+  border-top: #E6E6E6;
 }
 #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li:hover {
   background: rgba(153, 204, 255, 0.4);
-  color: #ffffff;
+  color: #FFFFFF;
 }
 #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li a {
   color: #000000;
@@ -4596,7 +4601,7 @@ td.message span.message {
   font-weight: bold;
 }
 #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header .egw_fw_ui_tab_header .notifyTabDiv:hover {
-  background-color: #1e1e1e;
+  background-color: #1E1E1E;
 }
 #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header .egw_fw_ui_tab_header:hover {
   background-color: rgba(153, 204, 255, 0.4);
@@ -4745,7 +4750,7 @@ td.message span.message {
   line-height: 17px;
 }
 #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_sidemenu_entry_header object {
-  background-color: #ffffff;
+  background-color: #FFFFFF;
   width: 24px;
   height: 24px;
 }
@@ -4833,7 +4838,7 @@ td.message span.message {
 #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_sidemenu_entry_content {
   display: block;
   background-image: none;
-  border-color: #b4b4b4;
+  border-color: #B4B4B4;
   border-style: solid;
   border-width: 1px;
   margin: 0 0 2em 0;
@@ -4842,7 +4847,7 @@ td.message span.message {
 }
 #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_sidemenu_entry_content:nth-last-of-type(-n+3) {
   background-color: #ffffff;
-  border-color: #b4b4b4;
+  border-color: #B4B4B4;
   border-right: 0px;
   margin-bottom: 0px;
   border-top-color: white;
@@ -4852,8 +4857,8 @@ td.message span.message {
   margin: 4px 5px 5px 5px;
   padding: 2px 0 2px 0;
   cursor: pointer;
-  border-color: #b4b4b4;
-  background-color: #e6e6e6;
+  border-color: #B4B4B4;
+  background-color: #E6E6E6;
   /*background-color: @egw_color_2_d;*/
 }
 #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category h1,
@@ -4880,7 +4885,7 @@ td.message span.message {
 #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category_active {
   border-bottom-width: 0px;
   margin-top: 4px;
-  background-color: #0c5da5;
+  background-color: #0C5DA5;
   color: #f2f2f2;
 }
 #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category_active h1,
@@ -4912,7 +4917,7 @@ td.message span.message {
   background-color: inherit;
 }
 #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category_active:hover {
-  background-color: #408dd2;
+  background-color: #408DD2;
   -webkit-transition: all 0.2s ease-out;
   -moz-transition: all 0.2s ease-out;
   -o-transition: all 0.2s ease-out;
@@ -4926,7 +4931,7 @@ td.message span.message {
   right: 0px;
 }
 #egw_fw_sidebar #egw_fw_splitter:hover {
-  border-color: #e6e6e6;
+  border-color: #E6E6E6;
 }
 #egw_fw_basecontainer #egw_fw_toggler {
   display: block;
@@ -5087,7 +5092,7 @@ td.message span.message {
   /*min-height: 50px;*/
 }
 .egw_fw_ui_category_content:last-of-type {
-  border-color: #b4b4b4;
+  border-color: #B4B4B4;
   margin-bottom: -2px;
 }
 .egw_fw_ui_category_content img {
@@ -5114,7 +5119,7 @@ td.message span.message {
   margin: 0px 0 1px 0px;
   position: relative;
   min-height: 18px;
-  background-color: #ffffff;
+  background-color: #FFFFFF;
   overflow-x: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
@@ -5186,7 +5191,7 @@ td.message span.message {
   width: 10px;
 }
 .egw_fw_ui_sidemenu_listitem div a:nth-child(2):hover {
-  background-color: #ff0000;
+  background-color: #FF0000;
   /*.background_color_20_gray;*/
   -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
   -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
@@ -5522,7 +5527,7 @@ td.message span.message {
 #egw_fw_topmenu_info_items #topmenu_info_quick_add span#quick_add:before {
   content: " ";
   font-size: 2em;
-  color: #0c5da5;
+  color: #0C5DA5;
   line-height: 0.6em;
   background-color: white;
 }
@@ -5533,7 +5538,7 @@ td.message span.message {
   top: 47px;
   min-width: 160px !important;
   width: 160px !important;
-  background: #ffffff;
+  background: #FFFFFF;
 }
 #egw_fw_topmenu_info_items #topmenu_info_quick_add .chzn-container:before {
   content: '';
@@ -5590,7 +5595,7 @@ td.message span.message {
   top: 6px;
   right: 112px;
   z-index: 200;
-  background-color: #ff0000;
+  background-color: #FF0000;
   -moz-transition: all 1s ease-in-out;
   -webkit-transition: all 1s ease-in-out;
   -o-transition: all 1s ease-in-out;
@@ -5753,7 +5758,7 @@ button.image_button {
   outline: 0;
   border-width: 1px;
   border-style: solid;
-  border-color: #b4b4b4;
+  border-color: #B4B4B4;
   -webkit-box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1);
   -moz-box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1);
   box-shadow: 0 0 2px 1px rgba(0, 0, 0, 0.1);
@@ -5821,11 +5826,11 @@ button.image_button {
   display: block;
   outline: none;
   padding: 7px 0 7px 3px;
-  color: #26537c;
+  color: #26537C;
 }
 .sbOptions a:link,
 .sbOptions a:visited {
-  color: #26537c;
+  color: #26537C;
   text-decoration: none;
 }
 .sbOptions a:hover,
@@ -5900,7 +5905,7 @@ button.image_button {
  */
 /* TABLE STYLE */
 .th {
-  border-bottom: 1px solid #e6e6e6;
+  border-bottom: 1px solid #E6E6E6;
 }
 .th.thb {
   border-color: darkgray;
@@ -5935,7 +5940,7 @@ table.egwGridView_outer thead tr th {
   background-position: -200px;
   font-weight: normal;
   padding: 3px 1px 3px 4px;
-  border: 1px solid #b4b4b4;
+  border: 1px solid #B4B4B4;
   border-top: transparent;
   vertical-align: middle;
   overflow: auto;
@@ -6003,7 +6008,7 @@ table.egwGridView_outer > tbody > tr > td {
 }
 table.egwGridView_outer > tbody > tr > td .et2_link {
   margin-left: 0px;
-  color: #26537c;
+  color: #26537C;
 }
 table.egwGridView_outer > tbody > tr > td img {
   border: 1px solid transparent;
@@ -6043,7 +6048,7 @@ table.egwGridView_grid tbody tr.selected {
   background-color: rgba(102, 153, 204, 0.7) !important;
 }
 table.egwGridView_grid tbody td {
-  border-bottom: 1px solid #e6e6e6;
+  border-bottom: 1px solid #E6E6E6;
   color: #000000;
 }
 table.egwGridView_grid tbody td .innerContainer {
@@ -6077,7 +6082,7 @@ table.egwGridView_grid > tr > td {
   border-right: 1px;
   padding: 0.3em 0 0.3em 0.3em;
   border-bottom: 1px solid;
-  color: #e6e6e6;
+  color: #E6E6E6;
   /*&:hover {background-color: @egw_color_2_e;} legacy*/
 }
 table.egwGridView_grid > tr > td:active {
@@ -6166,7 +6171,7 @@ table.nextmatch_header img {
   font-size: 1.5em;
 }
 .egwGridView_empty td {
-  color: #1e1e1e !important;
+  color: #1E1E1E !important;
 }
 /**
  * EGroupware: Stylite Pixelegg template
@@ -6432,7 +6437,7 @@ a.textSidebox {
   }
 }
 .egw-loading-prompt-container::before {
-  opacity: .3;
+  opacity: 0.3;
   content: "";
   background-color: #aaaaaa;
   width: 100%;
@@ -6511,7 +6516,7 @@ a.textSidebox {
   z-index: 999;
   width: 100px;
   border-radius: 5px;
-  border: solid 10px  #679FD2;
+  border: solid 10px #679FD2;
   transform: translate(-50%, -50%);
 }
 /**
@@ -6706,10 +6711,10 @@ div[id^="bookmarks-"] .search.nm-mob-header,
 form[id^="bookmarks-"] .search.nm-mob-header,
 div[id^="bookmarks-"] .dialogHeadbar,
 form[id^="bookmarks-"] .dialogHeadbar {
-  background-color: #cc6633;
+  background-color: #CC6633;
 }
 #bookmarks_sidebox_header {
-  border-left: 6px solid #cc6633 !important;
+  border-left: 6px solid #CC6633 !important;
 }
 div[id^="calendar-"] .nm_favorites_div .et2_dropdown button:nth-child(2),
 form[id^="calendar-"] .nm_favorites_div .et2_dropdown button:nth-child(2),
@@ -6719,10 +6724,10 @@ div[id^="calendar-"] .search.nm-mob-header,
 form[id^="calendar-"] .search.nm-mob-header,
 div[id^="calendar-"] .dialogHeadbar,
 form[id^="calendar-"] .dialogHeadbar {
-  background-color: #cc0033;
+  background-color: #CC0033;
 }
 #calendar_sidebox_header {
-  border-left: 6px solid #cc0033 !important;
+  border-left: 6px solid #CC0033 !important;
 }
 div[id^="filemanager-"] .nm_favorites_div .et2_dropdown button:nth-child(2),
 form[id^="filemanager-"] .nm_favorites_div .et2_dropdown button:nth-child(2),
@@ -6888,7 +6893,7 @@ table.egwGridView_grid img.et2_appicon {
   background-color: #006699 !important;
 }
 #egw_fw_sidebar #egw_fw_sidemenu #calendar_sidebox_content .egw_fw_ui_category_active {
-  background-color: #cc0033 !important;
+  background-color: #CC0033 !important;
 }
 #egw_fw_sidebar #egw_fw_sidemenu #tracker_sidebox_content .egw_fw_ui_category_active {
   background-color: #009966 !important;
@@ -6906,7 +6911,7 @@ table.egwGridView_grid img.et2_appicon {
   background-color: #ff9933 !important;
 }
 #egw_fw_sidebar #egw_fw_sidemenu #bookmarks_sidebox_content .egw_fw_ui_category_active {
-  background-color: #cc6633 !important;
+  background-color: #CC6633 !important;
 }
 #egw_fw_sidebar #egw_fw_sidemenu #projectmanager_sidebox_content .egw_fw_ui_category_active {
   background-color: #669999 !important;
@@ -6947,34 +6952,34 @@ table.egwGridView_grid img.et2_appicon {
 }
 #egw_fw_basecontainer.egw_fw_sidebar_toggleOn #bookmarks_sidebox_header.egw_fw_ui_sidemenu_entry_header_active {
   background-color: rgba(204, 102, 51, 0.3);
-  border-left: 4px solid #cc6633 !important;
+  border-left: 4px solid #CC6633 !important;
 }
 #bookmarks_sidebox_header.egw_fw_ui_sidemenu_entry_header_active {
-  border-top: 4px solid #cc6633 !important;
+  border-top: 4px solid #CC6633 !important;
   border-left: 0px !important;
 }
 #bookmarks_sidebox_header {
-  border-left: 4px solid #cc6633 !important;
+  border-left: 4px solid #CC6633 !important;
 }
 #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header #bookmarks-egw_fw_ui_tab_header.egw_fw_ui_tab_header_active {
   border-top: 4px solid;
-  border-top-color: #cc6633;
+  border-top-color: #CC6633;
   border-top-width: 4px !important;
 }
 #egw_fw_basecontainer.egw_fw_sidebar_toggleOn #calendar_sidebox_header.egw_fw_ui_sidemenu_entry_header_active {
   background-color: rgba(204, 0, 51, 0.3);
-  border-left: 4px solid #cc0033 !important;
+  border-left: 4px solid #CC0033 !important;
 }
 #calendar_sidebox_header.egw_fw_ui_sidemenu_entry_header_active {
-  border-top: 4px solid #cc0033 !important;
+  border-top: 4px solid #CC0033 !important;
   border-left: 0px !important;
 }
 #calendar_sidebox_header {
-  border-left: 4px solid #cc0033 !important;
+  border-left: 4px solid #CC0033 !important;
 }
 #egw_fw_main #egw_fw_tabs .egw_fw_ui_tabs_header #calendar-egw_fw_ui_tab_header.egw_fw_ui_tab_header_active {
   border-top: 4px solid;
-  border-top-color: #cc0033;
+  border-top-color: #CC0033;
   border-top-width: 4px !important;
 }
 #egw_fw_basecontainer.egw_fw_sidebar_toggleOn #filemanager_sidebox_header.egw_fw_ui_sidemenu_entry_header_active {
diff --git a/pixelegg/less/layout_loginPage.less b/pixelegg/less/layout_loginPage.less
index a5df2b8eac..6a5deb6ce6 100644
--- a/pixelegg/less/layout_loginPage.less
+++ b/pixelegg/less/layout_loginPage.less
@@ -177,6 +177,9 @@ div#loginMainDiv.stockLoginBackground {
 				}
 				span {display:none;}
 			}
+			.app[data-id="guacamole"] {
+				.content img.icon2-bg {right:15px;}
+			}
 			.tooltip {
 				display: inline-flex;
 				position: absolute;
@@ -257,7 +260,7 @@ div#loginMainDiv.stockLoginBackground {
 		z-index: 100;
 		padding: 0;
 		width: 280px;
-
+		border-radius: 5px;
 		.egw_logo {
 			width: 24px;
 			height: 24px;
@@ -280,6 +283,7 @@ div#loginMainDiv.stockLoginBackground {
 			background-color: white;
 			padding:1em;
 			border: 1px solid #cdcdce;
+			border-radius: 5px;
 			.hiddenCredential {display: none;}
 			// Table
 			table.divLoginbox {
diff --git a/pixelegg/login/login.json b/pixelegg/login/login.json
index e8944d8210..2c422015b0 100644
--- a/pixelegg/login/login.json
+++ b/pixelegg/login/login.json
@@ -34,7 +34,8 @@
 		},
 		"guacamole": {
 			"title":"Guacamole",
-			"icon":"data:image/png;base64,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",
+			"icon":"data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' version='1.1' id='mail_navbar' x='0px' y='0px' width='28.348px' height='28.348px' viewBox='0 0 28.348 28.348' enable-background='new 0 0 28.348 28.348' xml:space='preserve'%3E%3Cpath fill='none' stroke='%23FFFFFF' stroke-linejoin='round' stroke-miterlimit='10' d='M23.25,9.536 C23.256,9.529,21.825,7.886,23.25,9.536l3.165-2.05c2.907-1.833-0.195-3.518-1.671-4.584c-0.971-0.701-2.123-0.15-3.219,1.373 l-1.302,1.808L23.25,9.536z'/%3E%3Cpath fill='none' stroke='%23FFFFFF' stroke-linejoin='round' stroke-miterlimit='10' d='M25.548,8.116 c-0.011-0.016-0.022-0.031-0.032-0.047L23.25,9.536l-3.026-3.453l1.15-1.596c-1.776-0.888-3.881-1.446-6.11-1.575 c-0.308-0.014-0.617-0.027-0.931-0.027c-0.326,0-0.646,0.013-0.965,0.028C8.844,3.178,4.86,5.237,3.075,8.217 c-0.028-0.012-0.014-0.006,0,0c-0.162,0.449-0.25,0.915-0.25,1.392c0,1.736,1.136,3.313,2.984,4.506 c2.403,1.179,5.291,1.874,8.412,1.874c3.538,0,6.771-0.896,9.343-2.377c1.423-1.12,2.276-2.501,2.276-4.003 c0-0.507-0.104-0.999-0.286-1.474C25.489,8.163,25.614,8.087,25.548,8.116z'/%3E%3Cg%3E%3Cpath fill='%23FFFFFF' stroke='%23FFFFFF' stroke-width='0.5' stroke-linejoin='round' stroke-miterlimit='10' d='M14.081,22.266 c-4.182,0-6.366-0.384-11.77-3.213c2.248,3.833,6.726,6.454,11.91,6.454c5.277,0,9.824-2.717,12.028-6.663 C20.779,21.966,18.456,22.266,14.081,22.266z'/%3E%3Cg%3E%3Cpath fill='%23FFFFFF' d='M14.009,19.066c-4.233,0-7.627-0.847-10.681-2.666c-0.927-0.636-1.694-1.363-2.269-2.156L1.047,14.12 c-0.009-0.085-0.019-0.171-0.022-0.258L1.023,13.8l-0.03-0.053c-0.389-0.687-0.586-1.398-0.586-2.113 c0-1.787,1.217-3.491,3.398-4.825c-0.362,0.407-0.677,0.834-0.943,1.28C2.664,8.62,2.575,9.117,2.575,9.608 c0,1.751,1.1,3.426,3.098,4.716c2.561,1.258,5.507,1.914,8.547,1.914c3.455,0,6.729-0.834,9.468-2.41 c1.581-1.241,2.401-2.693,2.401-4.22c0-0.477-0.087-0.962-0.259-1.446l0.316-0.205c1.236,1.126,1.888,2.394,1.888,3.676 c0,0.716-0.197,1.427-0.587,2.113l-0.03,0.054l-0.002,0.061c-0.003,0.1-0.015,0.197-0.024,0.295l-0.013,0.12 c-0.394,0.534-0.873,1.044-1.39,1.476C22.844,17.915,18.695,19.066,14.009,19.066z'/%3E%3Cpath fill='%23FFFFFF' d='M2.593,7.995L2.57,8.111L2.557,8.186C2.404,8.656,2.325,9.135,2.325,9.608 c0,1.839,1.141,3.589,3.213,4.926l0.024,0.016l0.026,0.013c2.569,1.259,5.554,1.925,8.632,1.925c3.499,0,6.815-0.846,9.592-2.444 l0.032-0.018l0.028-0.022c1.613-1.27,2.467-2.791,2.467-4.396c0-0.434-0.067-0.874-0.202-1.313l0.003-0.002 c1.077,1.038,1.645,2.187,1.645,3.34c0,0.672-0.187,1.342-0.554,1.989l-0.061,0.107l-0.005,0.123 c-0.003,0.093-0.014,0.185-0.023,0.277c-0.002,0.018-0.004,0.036-0.006,0.054c-0.374,0.499-0.821,0.971-1.271,1.349 c-3.122,2.147-7.223,3.283-11.857,3.283c-4.186,0-7.539-0.836-10.526-2.613c-0.894-0.612-1.627-1.302-2.181-2.051 c-0.002-0.02-0.004-0.039-0.006-0.059c-0.009-0.08-0.018-0.159-0.021-0.24L1.271,13.73L1.21,13.623 c-0.367-0.648-0.554-1.318-0.554-1.99C0.656,10.341,1.338,9.087,2.593,7.995 M5.32,5.738c-3.151,1.396-5.164,3.519-5.164,5.896 c0,0.779,0.218,1.529,0.619,2.236c0.005,0.157,0.03,0.309,0.042,0.465c0.578,0.813,1.371,1.586,2.383,2.28 c3.33,1.983,6.922,2.701,10.809,2.701c4.409,0,8.702-1.006,12.141-3.371c0.499-0.417,1.021-0.953,1.472-1.576 c0.014-0.166,0.039-0.331,0.045-0.499c0.401-0.707,0.619-1.458,0.619-2.236c0-1.467-0.783-2.83-2.113-3.99l-0.656,0.425 c0.01,0.016,0.021,0.031,0.032,0.047c0.011-0.005,0.017-0.007,0.019-0.007c0.009,0-0.04,0.032-0.031,0.032 c0.002,0,0.008-0.002,0.019-0.007c0.183,0.475,0.286,0.967,0.286,1.474c0,1.502-0.854,2.884-2.276,4.003 c-2.571,1.48-5.805,2.377-9.343,2.377c-3.121,0-6.008-0.695-8.412-1.874c-1.848-1.193-2.984-2.77-2.984-4.506 c0-0.477,0.088-0.942,0.25-1.392C3.064,8.212,3.059,8.21,3.059,8.21s0.008,0.003,0.016,0.007C3.628,7.293,4.394,6.458,5.32,5.738 L5.32,5.738z'/%3E%3C/g%3E%3C/g%3E%3C/svg%3E",
+			"icon2":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAASdAAAEnQB3mYfeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAABNXSURBVHic7Vt5lFTVmf/dt79ae5VegO6mBRpoJIIbJooJIgSjMznReCQzGBITEj2JJzPHODnxOBnjCBI0YJaJjpjJxF2UAUMgEjDaalpA1pZutoa26b2ruqprefu988erLqq6qzdUSDLzO+edqnfffd/7vu9+9/vu9933CGMM/5fBXWgGLjT+XwEXmoELjQuqAEJIHiGE/5hpBsfV/3w6QULIdFEVvs0T3GZbNE9UeMsyqCDKfBchaEjGzT+AYgdj7Og50FbKy4oOV1WV+to7QpppWtvOnOn5V8ZY74j3nQ8FEEJqVK+wFjy34LLFlfLs68rFgglegACMMfR1JtHd0o/mgz3a8b1dlp6wqSDxIQKYIDAIcFyL23sppY0AdjDG9MHPqKwseXzNqpXfXnDtHMHnU7Hjj3vpQw8/09nTE3n9w9buHzDGOj9RBaRM+TOyKvy9IPHTAFbq2ChyLCdfkDmy4Lbp6twbKjiOJ6PSSkQNGAkbtuXAtihiIR3dLTG75Ugo2XEikjQ0+2uMsW0Zz56y4Jo572x9bVVJff0RXHXVzDSt+veOsH/78W/aT53ufP3MmZ67GWPax64AXuLv4TnyYPEkvzPz06V5hWU+4s2T4Q3K8AYlCFLuaZ6wDSQdE0WyH6OrxUXbsT5sfvxALNlvvqYnrG8wxpJVVaXvvLbp36+uqip16SY0UMrg93vS9239fb35/X95orWtvXeZZdm7B9o/kgIIIfmKV3ghv9Q3/9bvX+YPFCoAAJtRUEYhccKI9/caMcQsA1W+onE9lzoMO35zRDv0RmvY1Jxnvrp88Td/tv67+Y5DQQiBZdlIJnXk5/sBuArp7oki4Pfg69/8SVdDw6lnO7vC9zHG7HNWACGkUlaFuitvmlJ8zZenyoQQJG0TPUYM/ZaOCm8BAqKa7s8lKTjNgV0ontPzhLAFqnCgnrPW1HEyirrfnHRe/K8f8VOnTkRzczt4gUfF5AlZ92q6iQ9bujB9+iQAwDPP7Ug8+NB/v9/eHlp4TmGQEPINSRWOfP6bsydee9s0mRDXgPstDVFTA2NsyOiLIQtSpzkq7bZkH3qNGHTHylZAnw2xO7utsNyLwsIgP3XqRABAVVVplvBbfvcuAEBVpLTwAPAPyxZ5H/7xnZdPnFj8xJgVQAjxEEJWe/xysqDM++TtP7xCrb22PJtJjgdHCDyCBHmQAqxiEWa5DNCRn9Nv6WhPRhEyElnterUKo1LJajv6ThfuuH1x+vz48TNZ12/+wtVD6L+3uxGNTS1YsvgKlVK6YORJCoAQUsjz/H/IHvFLvjyFu/6OGky9bELOvoWSF0WyL+c1qnCgyuj6DogqDGpB5EZfH53e24ebf3ANTNOGJAmYNs0d5Xf/3ADGgE9fXQsAOHW6E1WVJQCAk83tuPRTF2P5ilW90Whi5bA+gBAiEkK+KwjCQ5LCKzfeVYtpV5QMywxHADoOd0IAyDyB7pybD+o61Q+9QcK6R74DAJDlsfuWtY+9FH/yqd893tbW88OcQ0IIWaKqanNVVdVDF0+boiy+c+aIwgNATYBHkez6AjKMJloTYTC41wISwbQAB2Gs8W8Q4hEDBw+fxGtb300L394RGvEew7Cw8q7H+p7asHVLe3vv/UCOXEAUxfslSdqyevXqiU8//bQS1Xsx8zNl6esmddCjx2Cz7Mnc1O8gZDCIXSbUD5I5GciMCjGLoSHiwM7QFQNDtx5LK2kwpgV4lHtclqsvLcaS703Hz377Et6qOwQA6OmJDLmn7u1D6OmJ4NSpDnxmwXeNbdvfu7f1TPdXWMr001OAEKKqqvqM3+9fum3bNmXOnDkoKSvGgn+cghlXl6YJJh0TJ2PdqPAWZgk0AOIwEINmhauxgjKG04leVHqLwJFs0/AKBFMDHDqSDF36WeXH+wy8+3QLdm79KQaiUSQSR16e64soZfjPDVux+bV9iMdNo7GxsUPTtOsZYyeBlAUQQjhVVV+fNWvW0kOHDilz587F3HlzIQeBGfNLsxjx8BKqfRflFB4AGE+GCC+O4Ps4nYJLOu5/QjDFV5wlfJFMoPAEBmU40U8RNrMtz5cvY/IVQdx06w/Q2RkGAAQCXgDAn+s/wGc/fw9WrX0Wq1c/ht27d8vLli2b6PF4thNCPEDKAgRBuL+4uPj+pqYmORgM4le/+hXu+afvYOW6BQgWZQvKEdeBUYZhDHUoZufxONbvwKBww2CGQoQ+G0LYgl6dW6E+kcBwGKzB4ZMBmevnntYY9j7fhje2rUdHZwj3/vCXCJl9uPKWCjQf6MHpOhv73z8E27Yxf/58vaGhYZOmacsIgEsFQdj95ptvCldf7cZNr8+DT986BVfeVAWT2qCMQeFdR1Pp45AnEZyKU0TNbBVELQ3dWj/KPfnwCFK6XeEJTMogntIBgcCYKGcJwhl0TCFyAMRm8HyQQGK2L0uZ+7edgd0moCPciytvnYwJVQH3EZThsa/twKnjH2LChAloa2vDjBkzjFgsdgvH8/ztt9xyCxsQvre3F7ZjYVbK8XVqUTTHe0BTvqJLc4c+V1IXNTXo1ELcNrLadYe5FiMRWEWDwhXBmIRnjCFpm4haGsJUg1kiYXAGdcn1ZfDXAjd/vzYtPAAQjmBChR+bN28GAJSXl2P58uW8KIo3cR6P56alS5emuVq3bh18eTJ8+e4oFcl+VHrPJiuaw9AYdRA2XIWIvRaEsLtELVb8mBEsxUWKP6cQZpmcJSxlDBEzCSczojBAbUpCiNhDFHU60YuWeAgJ24A1YagCeJFDzVW5w/XE6QV44cUX0uef+9znBEmSFnPxeHz6vHnzzjJpmnDsswz5HAH5bRRS31mGjMz5yAAuNRVUXoQwjgoXRwhak2F0aNGzclIG6yIRVOVSfVw5CQhKlCB8oowCyTvmZwwgETVBMjQ2Z84cJBKJyRwAxnFnR2XlypXQ4iZM3RWY73cg9Nng47kX8Vax6JrjCLCoM+y1gKim/QvgRhG7QASVORTJBJfk8/CkVksFshdTfMVZ/iUTI62pWj7oxYoVK9LnlFJwHEc5QkiWJ6uurgYv8Gh8160g2fkC9CoFZsm5pbGaY6Fb70+fB0QCLoPTCm/h2fyBMsgf6umEqddwQ582huWywhPMzOMh53AnfZ1JxMI6br/99nSbZVngOM7hBEEwNS2rSoS7Vn4Hr/+6AbGwDiYQOEEBTMqmHDYSaEmEsoTzCgT5khu3B6DyIso9+enzpM2GzRkIA0BIlmePD9Of77ehnNTSvkJ3GD6IONnTE67zfHnNHiy5YSl4/uz0NE0ThBCHUxTlVFNTU9ZNa9euRUFeMV75yT5YRm7zHcj9nYxkqkQlqPBxCIjDG2Pm0nfw1GA8gTFJzmpzGMXhyJkh9QFCAT7mgEsMP70AYNdvm6BHKLZs2ZLVfuDAASiKcpLTNG3Lz3/+c23wjfv37Ue0y8RT99YhFh5ShEWB7MVkb0GWx2+OURwIO+jWh/qLXKvBXiOOD6LtaE2EhxWAJ1zO0pqdJyBZ64VVnNsfUIdh8/oDOLizDfV/3jPk+vbt281EIvEaAVDAcVxPY2MjN23atKxOuq5jes10hCJd+OL3LkXl7JFrd8RiIDZLe3AAkHmg2sdD4IBDfdmjFTU1tCRC8AgSLvZflEWHMykcr2uyDCztwceSRke6k/ifdQeghRmaT5xGIBAY0qeoqEgPhUJf4BhjYVVVO44eHboXoSgKTp86jcULb8TGNe/j2R+9h3B7Ykg/wE2C1ONJSO3ZiyCfQCDxuWsFHkFCnqQiX/JktUttBqQzZ+lkhq+ASFDhzb1wMjQbO359BE9+7y1UFs9AT1cop/CdnZ0IhUIKgP0CABBCmo4dO1Y+pKd7Da+88gp6enqw8PqFeOreOky/ogSXL61E2dS8dD/GEzBCwBkUxGZgqdDVZzJETGdI3kBsBlHgMdlbOFSQCmXYRCNqMfRb2ZbUH9Jx4I+t2L21GSUTSnGkoQnV1dW5CQDYv38/vF5vZzweDwsAkEgkDjQ1NS0AMGyJrLi4GIcOHsK+ffuwYsUKPPfj3ZA9Ai5fWonaa8rhy5ehV6tgUrYDzDXyygkNTCSuoLlAMGJQZwAsw8HJ/d2o33IKPR/GMHlSBbZs2opFixYNf2MK+/btA4A9QEpgxtjRw4cPGxhBAQOYO3cuDh48CMdx8Mgjj2Dd4z/FWy8ehaSKmDKnGBfPK0bFzEJ48+RhaZjlMpg8vlKQbVG0HetD84FeHNvTib6uJAJBP5Z/5atYs2YNRHHs65T6+no9kUi8A6TSYULItQWFhX9obO5QLgqMf8FDKcXGjRvxi1/8AocaDiCZdCtCwWIVxZP8KJkSQEGpF5IqQFYFyB4BkiJAUgVwPIGRtGHqNkzNgZG0YOoOoj0auk73o7ulH31dSViGA69PxbSLZ+DOr9+JFStWjEvoAWgmRVVFudbV2XkTY2zngAJKAHS8dbgTs6oKUeAd1RBGRUtLC3bs2IGdO3ficMNh9IQ6YVkmHMeB41BQh7oZJgMIB3AcB0HgwfM8BEFEYX4xZtTMxHXXXYcbbrgBNTU1H5knzaR4/1gHrpk9CQArYIz1gTEGxhhkWe5/+uU/sL3N/awvYbG/NUQSFtt3OsZWrd/AvF7vaZaSOx1PCCGb3vj9qw4DcKJLw4kuDfqQMsxfH3SL4kSXhuNdGhzK8MpzG/REIvHEwPXMoujCYDBv6+t7T8lcas3MEYKLAiJK8yTw3DnWry8QbIehI2Kiu99MR9T21hZ88bNzKKV0EmOsHcgui79hmkby4J630w2UMXRGTTScSaInZoH9FbxSxwB0pXjuyhAeALZvepapqvqnAeGBDAUwxqht28/u2PJSdtYBwHIoWnp1HGlzFeGMZwvoPMFyUoPVmkBr2IBNs6cvpRQvP7PBSCQSv8xsz9oaI4Rc4fF46t46dEZiI+ztEwAFPhFFfhE+mUvX4883KGPo1xyEYjYiSWvEKvX7b+/APd9YFjMMo5Axlh7kLCkZY7u9Xm/7m797puK6v1tB6DAmzwCE4hZCcQs8IQh4BARVHgFVgHSue11jhGZSRDUb/ZqNuE4xHI9ZoDZWPfDPmmmaD2cKD+R4Q4QQslBV1d8fajwuxRAct7nLAgePxEMWCVSJgyrxUAQCbpxO1KYMmklhWBSaSaGlfi1nfJFJETm88vRj9JHVq05qmjaTMZZVbc25O+z1el9asmTJzc+98LLcGjYQSdpD+owLDOB5Ap4jEDj3lyMAz7nW5FAGSgGHuoI7lI1tZEcAAUGRX4AVacesWTMs0zSvY4y9O6RfLgUQQiZIktS8efNmz5IlSxDTHbSGDCTNkasvfykIqgImFshQJQ6LFi3S6+rqntN1/eu5+o70fsC3ysrKfnr06FHF53OLlqG4jTNhY9xmeL6gShwmFcgIqK5rW79+Pb3vvvuihmFMYYwN3TrGyArgPB5PfW1t7SU7d+6UB5RAKUNv3EZfwkZct8e8P/hJgSMEfoVHgU9AgVdIR6QNGzawu+66SzNN80YAfxpWzhEU4AVQqqrqi7Nnz56VqYQBOBSIJC1Ekg6iSfsjz9uxQuAI8jwCgqnoM9jBPv/887jjjjsMy7K+DGAvgChjLGcpazgfwAGYADfkq6qqPl9bW3vJrl27hihhAJQxxHWKSNJGJGnDtD/GacJc8w56BOR5BHhHWHts2rQJt912m2VZ1nIAb52lgC7G2BCmhlOAAqAgo0nxeDzP1dTUfGrjxo1yVVXVqDxT5iYiukWhmxSGTeFQBocCDqWu13dTcfAE4NKRwY0UishBkTjIAgdZ5DBaFLUsCw888ICzdu1aatv2twBsH9QlzHK8Y5xOhzMPAAEAZYOOKlmWN0qSZD388MOOaZrnIYkdGxoaGtiMGTM0VVWbASzMwXsZgADLJWvORsA/DJEyAF9SVfXD6upqra6u7kLJzBhjzDRN9uijj1JRFC1BEJ4EUDkC3/6csuZsBOQRCJUBqOA4bo0gCOaSJUu0V199lZ1Pi+ju7mYPPvggLSws1BVF6QBwyyj8lgGQx6MAAqBkDEQv5zjuUY/H0+X3+427777b3rt37ycitOM4bPfu3Wz58uWmKIq21+vdB+BOAJPGwGcJUv5u8DFSGBzsCEcCAXCVoihfcRznxry8PHrZZZdh/vz57gtXc+eitLR0VCKZ0DQNe/bswdtvv41du3bp9fX1vGmajOf5zbquPwGgcRzkcjtAjPK6fOr7m/G+jeABMA/AbFVV53Ec96lEIlESCASMwsJCJxgMsvz8fJKfn88XFhYKwWCQj0ajtLOz0+ru7nZ6e3sRDof5aDQqSpKUEEVxbywWexNuHb8BwHgTkwRjLDrcxVFflyeE+OE6xY8CH4AaAPkpWumD4zg/pTQBIAKgL+O3A8Dpj/jcGGMsNlKHMX0vkJoOefjr+cyOAogMZ/aZGPMHE6nVoQ/ulPhLrZAyAAkAcZZj1ZcL4/5iJPVxlA+Air8ci6AANLiCjytn/yifzBAAClxFDLPL+YlDhyu4zs5RkI/lq7GUMiS4CygpdXwSMFOHAcA8V6Ez8Yl8OJlSiACAH/TL4ezmd+YmOBt0ULjhzsn8/TgEHoz/BUoA/f6SxabWAAAAAElFTkSuQmCC",
 			"desc":"The new “Guacamole” module provides a fully-fledged home office workplace by accessing the company PC via web browser. Complex applications can be transferred to the browser of weaker PCs and used there. This also eliminates licensing cost issues for specialised applications on local PCs in the home office.",
 			"url": "https://www.egroupware.org/en/guacamole"
 		},
@@ -69,7 +70,7 @@
 		},
 		"collabora": {
 			"title":"Collabora",
-			"icon":"data:image/svg+xml,%3Csvg xmlns:dc='http://purl.org/dc/elements/1.1/' xmlns:cc='http://creativecommons.org/ns%23' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns%23' xmlns:svg='http://www.w3.org/2000/svg' xmlns='http://www.w3.org/2000/svg' id='svg4530' version='1.1' viewBox='0 0 472.8 472.8' height='28.347px' width='28.347px'%3E%3Cg transform='translate(-320.0,236.5)' id='layer1'%3E%3Cpolygon id='polygon14' points='17.914,44.893 17.358,44.386 17.258,20.718 17.772,20.172 30.958,32.599 ' style='fill:%23ffffff' transform='matrix(10.216927,0,0,10.216927,237.11117,-332.2152)' /%3E%3Cpolygon style='fill:%23504999;fill-opacity:1' id='polygon16' points='17.772,20.172 30.379,32.053 30.958,32.599 30.379,33.145 17.914,44.893 28.654,55.638 51.742,32.55 28.561,9.362 17.763,20.162 ' transform='matrix(10.216927,0,0,10.216927,237.11117,-332.2152)' /%3E%3Cpolygon id='polygon18' points='17.358,44.386 17.258,20.718 29.864,32.599 ' style='fill:%23c8c8c8' transform='matrix(10.216927,0,0,10.216927,237.11117,-332.2152)' /%3E%3Cpolygon style='fill:%2338257a;fill-opacity:1' id='polygon20' points='27.743,35.628 18.807,44.052 31.847,41.483 ' transform='matrix(10.216927,0,0,10.216927,237.11117,-332.2152)' /%3E%3C/g%3E%3C/svg%3E%0A",
+			"icon":"data:image/svg+xml,%3Csvg xmlns:svg='http://www.w3.org/2000/svg' xmlns:cc='http://creativecommons.org/ns%23' xmlns:dc='http://purl.org/dc/elements/1.1/' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns%23' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' version='1.1' id='svg4530' x='0px' y='0px' width='28.348px' height='28.348px' viewBox='0 0 28.348 28.348' enable-background='new 0 0 28.348 28.348' xml:space='preserve'%3E%3Cpolygon fill='%23504999' points='12.526,-0.004 6.644,5.879 15.521,14.247 6.753,22.51 12.583,28.344 26.725,14.2 '/%3E%3Cpolygon id='polygon18' fill='%23504999' points='5.663,21.451 5.602,6.952 13.324,14.23 '/%3E%3Cpath fill='%23006699' d='M55.831,5.785V5.781L32.67,5.77c-0.755,0.104-1.348,0.7-1.439,1.459h-0.008V8.23l12.979,8.124L57.27,8.197 v-0.97C57.17,6.475,56.583,5.885,55.831,5.785z'/%3E%3Cpath fill='%23006699' d='M55.815,23.624c0.758-0.101,1.354-0.699,1.445-1.461h0.01V10.632l-13.068,8.312L31.222,10.92v11.244h0.003 c0.092,0.762,0.687,1.36,1.444,1.461v0.002h8.085l15.06,0.004L55.815,23.624L55.815,23.624z'/%3E%3C/svg%3E",
 			"desc":"With Collabora Online Office you can edit texts or tables together with other people in real time directly in EGroupware! With the file sharing function, you can also directly involve external parties (partners, customers or employees in the home office).",
 			"url": "https://www.egroupware.org/en/online-office"
 		},
diff --git a/pixelegg/mobile/fw_mobile.css b/pixelegg/mobile/fw_mobile.css
index 858ffb9a6e..bcfe90ab9e 100644
--- a/pixelegg/mobile/fw_mobile.css
+++ b/pixelegg/mobile/fw_mobile.css
@@ -45,6 +45,7 @@
   html[data-darkmode='1'] #blueimp-gallery ol,
   html[data-darkmode='1'] iframe,
   html[data-darkmode='1'] #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category_active,
+  html[data-darkmode='1'] #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category_content,
   html[data-darkmode='1'] video,
   html[data-darkmode='1'] #loginMainDiv,
   html[data-darkmode='1'] .et2_taglist_tags_icon {
@@ -2067,6 +2068,9 @@ div#loginMainDiv.stockLoginBackground div#centerBox form {
 #loginMainDiv div#login_footer .apps .app span {
   display: none;
 }
+#loginMainDiv div#login_footer .apps .app[data-id="guacamole"] .content img.icon2-bg {
+  right: 15px;
+}
 #loginMainDiv div#login_footer .apps .tooltip {
   display: inline-flex;
   position: absolute;
@@ -2146,6 +2150,7 @@ div#loginMainDiv.stockLoginBackground div#centerBox form {
   z-index: 100;
   padding: 0;
   width: 280px;
+  border-radius: 5px;
 }
 #loginMainDiv div#centerBox .egw_logo {
   width: 24px;
@@ -2166,6 +2171,7 @@ div#loginMainDiv.stockLoginBackground div#centerBox form {
   background-color: white;
   padding: 1em;
   border: 1px solid #cdcdce;
+  border-radius: 5px;
 }
 #loginMainDiv div#centerBox form .hiddenCredential {
   display: none;
@@ -4864,7 +4870,7 @@ td.message span.message {
   background-color: #ffffff;
   border-color: #B4B4B4;
   border-right: 0px;
-  margin-bottom: 10px;
+  margin-bottom: 0px;
   border-top-color: white;
   padding-top: 0px;
 }
@@ -4876,16 +4882,21 @@ td.message span.message {
   background-color: #E6E6E6;
   /*background-color: @egw_color_2_d;*/
 }
+#egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category h1,
 #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category h2 {
   margin: 5px 0px 3px 5px;
   padding: 0px 0px 0px 24px;
   line-height: 1em;
   font-size: 12px;
+  font-weight: normal;
   background-image: url(../images/arrow_right.svg);
   background-repeat: no-repeat;
   background-position: left center;
   background-size: 12px;
 }
+#egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category h2 {
+  padding-bottom: 2px;
+}
 #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category div.egw_fw_ui_category:nth-last-of-type(-n+3) img.egw_fw_ui_sidemenu_listitem_icon {
   display: block;
 }
@@ -4898,6 +4909,7 @@ td.message span.message {
   background-color: #0C5DA5;
   color: #f2f2f2;
 }
+#egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category_active h1,
 #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category_active h2 {
   background-image: url(../images/arrow_down.svg);
   line-height: 1em;
@@ -4905,13 +4917,16 @@ td.message span.message {
   background-size: 12px;
   filter: brightness(3);
 }
+#egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category_active h1 a,
 #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category_active h2 a {
   color: #FFF;
 }
+#egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category_active h1 a img,
 #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category_active h2 a img {
   width: 16px;
   height: 16px;
 }
+#egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category_active h1 a:hover,
 #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_sidemenu_entry_content .egw_fw_ui_category_active h2 a:hover {
   padding: 5px 30px 5px 0px;
   width: 200px;
@@ -5089,30 +5104,17 @@ td.message span.message {
   border-top-width: 0;
   border-left: 0px solid;
   border-bottom: 0px solid;
-  margin-left: 4px;
+  margin-left: 0px;
   margin-top: 0px;
   padding-bottom: 5px;
   padding-left: 0px;
   padding-top: 3px;
-  margin-right: 5px;
+  margin-right: 0px;
   /*min-height: 50px;*/
 }
 .egw_fw_ui_category_content:last-of-type {
-  -webkit-border-top-right-radius: 0;
-  -webkit-border-bottom-right-radius: 0;
-  -webkit-border-bottom-left-radius: 10px;
-  -webkit-border-top-left-radius: 0;
-  -moz-border-radius-topright: 0;
-  -moz-border-radius-bottomright: 0;
-  -moz-border-radius-bottomleft: 10px;
-  -moz-border-radius-topleft: 0;
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 0;
-  border-bottom-left-radius: 10px;
-  border-top-left-radius: 0;
-  /*.background-clip(padding-box);*/
   border-color: #B4B4B4;
-  margin-bottom: 5px;
+  margin-bottom: -2px;
 }
 .egw_fw_ui_category_content img {
   height: 16px;
@@ -7490,7 +7492,8 @@ img.et2_button_icon[src*="svg"]:hover {
     -moz-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
     box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
   }
-  body #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_sidemenu_entry_apps .egw_fw_ui_sidemenu_entry_header h1 {
+  body #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_sidemenu_entry_apps .egw_fw_ui_sidemenu_entry_header h1,
+  body #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_sidemenu_entry_apps .egw_fw_ui_sidemenu_entry_header h2 {
     margin: 6px 0 10px 0;
     padding-top: 0.31em;
     padding-left: 3em;
@@ -7533,7 +7536,8 @@ img.et2_button_icon[src*="svg"]:hover {
     padding-top: 6px;
     height: 18px;
   }
-  body #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_sidemenu_entry_header_active h1 {
+  body #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_sidemenu_entry_header_active h1,
+  body #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_sidemenu_entry_header_active h2 {
     text-transform: uppercase;
     font-size: 12px;
     color: #000000;