diff --git a/public/themes/luna-amber/theme.css b/public/themes/luna-amber/theme.css
index b05066219..bc3c6fcab 100644
--- a/public/themes/luna-amber/theme.css
+++ b/public/themes/luna-amber/theme.css
@@ -940,6 +940,9 @@ body .p-datepicker table {
 body .p-datepicker table th {
   padding: 0.5em;
 }
+body .p-datepicker table th.p-datepicker-weekheader {
+  border-right: 1px solid #191919;
+}
 body .p-datepicker table td {
   padding: 0.5em;
 }
@@ -965,6 +968,9 @@ body .p-datepicker table td.p-datepicker-today > span.p-highlight {
   color: #212121;
   background-color: #FFB300;
 }
+body .p-datepicker table td.p-datepicker-weeknumber {
+  border-right: 1px solid #191919;
+}
 body .p-datepicker .p-datepicker-buttonbar {
   border-top: 1px solid #3f3f3f;
 }
@@ -1510,10 +1516,10 @@ body .p-panel .p-panel-titlebar {
 }
 body .p-panel .p-panel-titlebar .p-panel-title {
   vertical-align: middle;
-  font-weight: 400;
+  font-weight: 700;
 }
 body .p-panel .p-panel-titlebar .p-panel-titlebar-icon {
-  margin: 0;
+  margin: 0.143em 0 0 0;
   position: relative;
   font-size: 14px;
   color: #888888;
@@ -1541,7 +1547,6 @@ body .p-panel .p-panel-content {
   border: 1px solid #191919;
   background-color: #323232;
   color: #dedede;
-  padding: 0.571em 1em;
   border-top: 0 none;
   -moz-border-radius-bottomleft: 3px;
   -webkit-border-bottom-left-radius: 3px;
@@ -1571,6 +1576,7 @@ body .p-fieldset .p-fieldset-legend a {
   border: 1px solid #191919;
   color: #dedede;
   background-color: #191919;
+  font-weight: 700;
   -moz-border-radius: 3px;
   -webkit-border-radius: 3px;
   border-radius: 3px;
@@ -1616,7 +1622,7 @@ body .p-accordion .p-accordion-header a {
   color: #dedede;
   background-color: #191919;
   color: #dedede;
-  font-weight: 400;
+  font-weight: 700;
   -moz-border-radius: 3px;
   -webkit-border-radius: 3px;
   border-radius: 3px;
@@ -1634,7 +1640,7 @@ body .p-accordion .p-accordion-header a .p-accordion-toggle-icon.pi-caret-right:
 body .p-accordion .p-accordion-header a .p-accordion-toggle-icon.pi-caret-down:before {
   content: "";
 }
-body .p-accordion .p-accordion-header a:not(.p-disabled):focus {
+body .p-accordion .p-accordion-header:not(.p-disabled) a:focus {
   outline: 0 none;
   outline-offset: 0;
   -webkit-box-shadow: 0 0 0 0.2em #ffe8b3;
@@ -1709,7 +1715,7 @@ body .p-tabview.p-tabview-top .p-tabview-nav li a, body .p-tabview.p-tabview-bot
   display: inline-block;
   color: #dedede;
   padding: 0.571em 1em;
-  font-weight: 400;
+  font-weight: 700;
   -moz-transition: background-color 0.2s, box-shadow 0.2s;
   -o-transition: background-color 0.2s, box-shadow 0.2s;
   -webkit-transition: background-color 0.2s, box-shadow 0.2s;
@@ -2115,7 +2121,7 @@ body .p-datagrid .p-datagrid-header {
   color: #dedede;
   border: 1px solid #191919;
   padding: 0.571em 1em;
-  font-weight: 400;
+  font-weight: 700;
   border-bottom: 0 none;
 }
 body .p-datagrid .p-datagrid-content {
@@ -2137,7 +2143,7 @@ body .p-datalist .p-datalist-header {
   color: #dedede;
   border: 1px solid #191919;
   padding: 0.571em 1em;
-  font-weight: 400;
+  font-weight: 700;
   border-bottom: 0 none;
 }
 body .p-datalist .p-datalist-content {
@@ -2159,7 +2165,7 @@ body .p-datascroller .p-datascroller-header {
   color: #dedede;
   border: 1px solid #191919;
   padding: 0.571em 1em;
-  font-weight: 400;
+  font-weight: 700;
   border-bottom: 0 none;
 }
 body .p-datascroller .p-datascroller-content {
@@ -2181,7 +2187,7 @@ body .p-dataview .p-dataview-header {
   color: #dedede;
   border: 1px solid #191919;
   padding: 0.571em 1em;
-  font-weight: 400;
+  font-weight: 700;
   border-bottom: 0 none;
   -moz-border-radius-topleft: 3px;
   -webkit-border-top-left-radius: 3px;
@@ -2232,7 +2238,7 @@ body .fc .fc-event {
   border: 1px solid #FFA000;
   color: #212121;
 }
-body .fc .fc-toolbar .ui-button {
+body .fc .fc-toolbar .fc-button {
   color: #212121;
   background-color: #FFB300;
   border: 1px solid #FFB300;
@@ -2245,38 +2251,38 @@ body .fc .fc-toolbar .ui-button {
   -webkit-border-radius: 3px;
   border-radius: 3px;
 }
-body .fc .fc-toolbar .ui-button:enabled:hover {
+body .fc .fc-toolbar .fc-button:enabled:hover {
   background-color: #FFA000;
   color: #212121;
   border-color: #FFA000;
 }
-body .fc .fc-toolbar .ui-button .ui-icon-circle-triangle-w {
-  font-family: "PrimeIcons";
+body .fc .fc-toolbar .fc-button .fc-icon-chevron-left {
+  font-family: "PrimeIcons" !important;
   text-indent: 0;
 }
-body .fc .fc-toolbar .ui-button .ui-icon-circle-triangle-w:before {
+body .fc .fc-toolbar .fc-button .fc-icon-chevron-left:before {
   content: "";
 }
-body .fc .fc-toolbar .ui-button .ui-icon-circle-triangle-e {
-  font-family: "PrimeIcons";
+body .fc .fc-toolbar .fc-button .fc-icon-chevron-right {
+  font-family: "PrimeIcons" !important;
   text-indent: 0;
 }
-body .fc .fc-toolbar .ui-button .ui-icon-circle-triangle-e:before {
+body .fc .fc-toolbar .fc-button .fc-icon-chevron-right:before {
   content: "";
 }
-body .fc .fc-toolbar .ui-button:focus {
+body .fc .fc-toolbar .fc-button:focus {
   outline: 0 none;
   outline-offset: 0;
   -webkit-box-shadow: 0 0 0 0.2em #ffe8b3;
   -moz-box-shadow: 0 0 0 0.2em #ffe8b3;
   box-shadow: 0 0 0 0.2em #ffe8b3;
 }
-body .fc .fc-toolbar .fc-button-group .ui-button {
+body .fc .fc-toolbar .fc-button-group .fc-button {
   -moz-border-radius: 0;
   -webkit-border-radius: 0;
   border-radius: 0;
 }
-body .fc .fc-toolbar .fc-button-group .ui-button:first-child {
+body .fc .fc-toolbar .fc-button-group .fc-button:first-child {
   -moz-border-radius-topleft: 3px;
   -webkit-border-top-left-radius: 3px;
   border-top-left-radius: 3px;
@@ -2284,7 +2290,7 @@ body .fc .fc-toolbar .fc-button-group .ui-button:first-child {
   -webkit-border-bottom-left-radius: 3px;
   border-bottom-left-radius: 3px;
 }
-body .fc .fc-toolbar .fc-button-group .ui-button:last-child {
+body .fc .fc-toolbar .fc-button-group .fc-button:last-child {
   -moz-border-radius-topright: 3px;
   -webkit-border-top-right-radius: 3px;
   border-top-right-radius: 3px;
@@ -2307,7 +2313,7 @@ body .p-picklist .p-picklist-caption {
   color: #dedede;
   border: 1px solid #191919;
   padding: 0.571em 1em;
-  font-weight: 400;
+  font-weight: 700;
   border-bottom: 0 none;
   -moz-border-radius-topleft: 3px;
   -webkit-border-top-left-radius: 3px;
@@ -2396,7 +2402,7 @@ body .p-orderlist .p-orderlist-caption {
   color: #dedede;
   border: 1px solid #191919;
   padding: 0.571em 1em;
-  font-weight: 400;
+  font-weight: 700;
   border-bottom: 0 none;
   -moz-border-radius-topleft: 3px;
   -webkit-border-top-left-radius: 3px;
@@ -2584,6 +2590,17 @@ body .p-tree.p-tree-horizontal .p-treenode .p-treenode-content.p-treenode-select
   background-color: #4c4c4c;
   color: #dedede;
 }
+body .p-tree .p-tree-filter-container .p-tree-filter {
+  width: 100%;
+  padding-right: 2em;
+}
+body .p-tree .p-tree-filter-container .p-tree-filter-icon {
+  top: 50%;
+  left: auto;
+  margin-top: -0.5em;
+  right: 0.8em;
+  color: #252525;
+}
 body .p-organizationchart .p-organizationchart-node-content.p-organizationchart-selectable-node:not(.p-highlight):hover {
   background-color: #4c4c4c;
   color: #dedede;
@@ -3015,7 +3032,7 @@ body .p-overlaypanel {
   box-shadow: 0 0 6px 0 rgba(0, 0, 0, 0.16);
 }
 body .p-overlaypanel .p-overlaypanel-content {
-  padding: 0.571em 1em;
+  padding: 1em;
 }
 body .p-overlaypanel .p-overlaypanel-close {
   background-color: #FFB300;
@@ -3070,7 +3087,7 @@ body .p-dialog .p-dialog-titlebar {
   background-color: #191919;
   color: #dedede;
   padding: 1em;
-  font-weight: 400;
+  font-weight: 700;
   border-bottom: 0 none;
   -moz-border-radius-topleft: 3px;
   -webkit-border-top-left-radius: 3px;
@@ -3082,6 +3099,7 @@ body .p-dialog .p-dialog-titlebar {
 body .p-dialog .p-dialog-titlebar .p-dialog-title {
   margin: 0;
   float: none;
+  font-weight: 700;
 }
 body .p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon {
   color: #888888;
@@ -3100,7 +3118,7 @@ body .p-dialog .p-dialog-content {
   background-color: #323232;
   color: #dedede;
   border: 1px solid #191919;
-  padding: 0.571em 1em;
+  padding: 1em;
 }
 body .p-dialog .p-dialog-footer {
   border: 1px solid #191919;
@@ -3177,7 +3195,7 @@ body .p-lightbox .p-lightbox-caption {
   background-color: #191919;
   color: #dedede;
   padding: 0.571em 1em;
-  font-weight: 400;
+  font-weight: 700;
 }
 body .p-lightbox .p-lightbox-caption .p-lightbox-caption-text {
   color: #dedede;
@@ -3422,7 +3440,7 @@ body .p-menu .p-submenu-header {
   padding: 0.714em 0.857em;
   color: #dedede;
   background-color: #191919;
-  font-weight: 400;
+  font-weight: 700;
   border: 0 none;
   -moz-border-radius-topleft: 3px;
   -webkit-border-top-left-radius: 3px;
@@ -3585,7 +3603,7 @@ body .p-slidemenu .p-slidemenu-backward {
   padding: 0.571em 1em;
   color: #dedede;
   background-color: #191919;
-  font-weight: 400;
+  font-weight: 700;
   border: 0 none;
 }
 body .p-slidemenu .p-slidemenu-backward:hover {
@@ -3680,7 +3698,7 @@ body .p-megamenu .p-megamenu-submenu-header {
   padding: 0.571em 1em;
   color: #dedede;
   background-color: #191919;
-  font-weight: 400;
+  font-weight: 700;
   border: 0 none;
 }
 body .p-megamenu .p-megamenu-panel {
@@ -3726,7 +3744,7 @@ body .p-panelmenu .p-panelmenu-header > a {
   background-color: #191919;
   color: #dedede;
   padding: 0.714em 0.857em;
-  font-weight: 400;
+  font-weight: 700;
   position: static;
   font-size: 14px;
   -moz-border-radius: 3px;
diff --git a/public/themes/luna-blue/theme.css b/public/themes/luna-blue/theme.css
index 2c3450516..2fc25c8fd 100644
--- a/public/themes/luna-blue/theme.css
+++ b/public/themes/luna-blue/theme.css
@@ -940,6 +940,9 @@ body .p-datepicker table {
 body .p-datepicker table th {
   padding: 0.5em;
 }
+body .p-datepicker table th.p-datepicker-weekheader {
+  border-right: 1px solid #191919;
+}
 body .p-datepicker table td {
   padding: 0.5em;
 }
@@ -965,6 +968,9 @@ body .p-datepicker table td.p-datepicker-today > span.p-highlight {
   color: #ffffff;
   background-color: #1f7ed0;
 }
+body .p-datepicker table td.p-datepicker-weeknumber {
+  border-right: 1px solid #191919;
+}
 body .p-datepicker .p-datepicker-buttonbar {
   border-top: 1px solid #3f3f3f;
 }
@@ -1510,10 +1516,10 @@ body .p-panel .p-panel-titlebar {
 }
 body .p-panel .p-panel-titlebar .p-panel-title {
   vertical-align: middle;
-  font-weight: 400;
+  font-weight: 700;
 }
 body .p-panel .p-panel-titlebar .p-panel-titlebar-icon {
-  margin: 0;
+  margin: 0.143em 0 0 0;
   position: relative;
   font-size: 14px;
   color: #888888;
@@ -1541,7 +1547,6 @@ body .p-panel .p-panel-content {
   border: 1px solid #191919;
   background-color: #323232;
   color: #dedede;
-  padding: 0.571em 1em;
   border-top: 0 none;
   -moz-border-radius-bottomleft: 3px;
   -webkit-border-bottom-left-radius: 3px;
@@ -1571,6 +1576,7 @@ body .p-fieldset .p-fieldset-legend a {
   border: 1px solid #191919;
   color: #dedede;
   background-color: #191919;
+  font-weight: 700;
   -moz-border-radius: 3px;
   -webkit-border-radius: 3px;
   border-radius: 3px;
@@ -1616,7 +1622,7 @@ body .p-accordion .p-accordion-header a {
   color: #dedede;
   background-color: #191919;
   color: #dedede;
-  font-weight: 400;
+  font-weight: 700;
   -moz-border-radius: 3px;
   -webkit-border-radius: 3px;
   border-radius: 3px;
@@ -1634,7 +1640,7 @@ body .p-accordion .p-accordion-header a .p-accordion-toggle-icon.pi-caret-right:
 body .p-accordion .p-accordion-header a .p-accordion-toggle-icon.pi-caret-down:before {
   content: "";
 }
-body .p-accordion .p-accordion-header a:not(.p-disabled):focus {
+body .p-accordion .p-accordion-header:not(.p-disabled) a:focus {
   outline: 0 none;
   outline-offset: 0;
   -webkit-box-shadow: 0 0 0 0.2em #aed3f3;
@@ -1709,7 +1715,7 @@ body .p-tabview.p-tabview-top .p-tabview-nav li a, body .p-tabview.p-tabview-bot
   display: inline-block;
   color: #dedede;
   padding: 0.571em 1em;
-  font-weight: 400;
+  font-weight: 700;
   -moz-transition: background-color 0.2s, box-shadow 0.2s;
   -o-transition: background-color 0.2s, box-shadow 0.2s;
   -webkit-transition: background-color 0.2s, box-shadow 0.2s;
@@ -2115,7 +2121,7 @@ body .p-datagrid .p-datagrid-header {
   color: #dedede;
   border: 1px solid #191919;
   padding: 0.571em 1em;
-  font-weight: 400;
+  font-weight: 700;
   border-bottom: 0 none;
 }
 body .p-datagrid .p-datagrid-content {
@@ -2137,7 +2143,7 @@ body .p-datalist .p-datalist-header {
   color: #dedede;
   border: 1px solid #191919;
   padding: 0.571em 1em;
-  font-weight: 400;
+  font-weight: 700;
   border-bottom: 0 none;
 }
 body .p-datalist .p-datalist-content {
@@ -2159,7 +2165,7 @@ body .p-datascroller .p-datascroller-header {
   color: #dedede;
   border: 1px solid #191919;
   padding: 0.571em 1em;
-  font-weight: 400;
+  font-weight: 700;
   border-bottom: 0 none;
 }
 body .p-datascroller .p-datascroller-content {
@@ -2181,7 +2187,7 @@ body .p-dataview .p-dataview-header {
   color: #dedede;
   border: 1px solid #191919;
   padding: 0.571em 1em;
-  font-weight: 400;
+  font-weight: 700;
   border-bottom: 0 none;
   -moz-border-radius-topleft: 3px;
   -webkit-border-top-left-radius: 3px;
@@ -2232,7 +2238,7 @@ body .fc .fc-event {
   border: 1px solid #1b71bb;
   color: #ffffff;
 }
-body .fc .fc-toolbar .ui-button {
+body .fc .fc-toolbar .fc-button {
   color: #ffffff;
   background-color: #1f7ed0;
   border: 1px solid #1f7ed0;
@@ -2245,38 +2251,38 @@ body .fc .fc-toolbar .ui-button {
   -webkit-border-radius: 3px;
   border-radius: 3px;
 }
-body .fc .fc-toolbar .ui-button:enabled:hover {
+body .fc .fc-toolbar .fc-button:enabled:hover {
   background-color: #1b71bb;
   color: #ffffff;
   border-color: #1b71bb;
 }
-body .fc .fc-toolbar .ui-button .ui-icon-circle-triangle-w {
-  font-family: "PrimeIcons";
+body .fc .fc-toolbar .fc-button .fc-icon-chevron-left {
+  font-family: "PrimeIcons" !important;
   text-indent: 0;
 }
-body .fc .fc-toolbar .ui-button .ui-icon-circle-triangle-w:before {
+body .fc .fc-toolbar .fc-button .fc-icon-chevron-left:before {
   content: "";
 }
-body .fc .fc-toolbar .ui-button .ui-icon-circle-triangle-e {
-  font-family: "PrimeIcons";
+body .fc .fc-toolbar .fc-button .fc-icon-chevron-right {
+  font-family: "PrimeIcons" !important;
   text-indent: 0;
 }
-body .fc .fc-toolbar .ui-button .ui-icon-circle-triangle-e:before {
+body .fc .fc-toolbar .fc-button .fc-icon-chevron-right:before {
   content: "";
 }
-body .fc .fc-toolbar .ui-button:focus {
+body .fc .fc-toolbar .fc-button:focus {
   outline: 0 none;
   outline-offset: 0;
   -webkit-box-shadow: 0 0 0 0.2em #aed3f3;
   -moz-box-shadow: 0 0 0 0.2em #aed3f3;
   box-shadow: 0 0 0 0.2em #aed3f3;
 }
-body .fc .fc-toolbar .fc-button-group .ui-button {
+body .fc .fc-toolbar .fc-button-group .fc-button {
   -moz-border-radius: 0;
   -webkit-border-radius: 0;
   border-radius: 0;
 }
-body .fc .fc-toolbar .fc-button-group .ui-button:first-child {
+body .fc .fc-toolbar .fc-button-group .fc-button:first-child {
   -moz-border-radius-topleft: 3px;
   -webkit-border-top-left-radius: 3px;
   border-top-left-radius: 3px;
@@ -2284,7 +2290,7 @@ body .fc .fc-toolbar .fc-button-group .ui-button:first-child {
   -webkit-border-bottom-left-radius: 3px;
   border-bottom-left-radius: 3px;
 }
-body .fc .fc-toolbar .fc-button-group .ui-button:last-child {
+body .fc .fc-toolbar .fc-button-group .fc-button:last-child {
   -moz-border-radius-topright: 3px;
   -webkit-border-top-right-radius: 3px;
   border-top-right-radius: 3px;
@@ -2307,7 +2313,7 @@ body .p-picklist .p-picklist-caption {
   color: #dedede;
   border: 1px solid #191919;
   padding: 0.571em 1em;
-  font-weight: 400;
+  font-weight: 700;
   border-bottom: 0 none;
   -moz-border-radius-topleft: 3px;
   -webkit-border-top-left-radius: 3px;
@@ -2396,7 +2402,7 @@ body .p-orderlist .p-orderlist-caption {
   color: #dedede;
   border: 1px solid #191919;
   padding: 0.571em 1em;
-  font-weight: 400;
+  font-weight: 700;
   border-bottom: 0 none;
   -moz-border-radius-topleft: 3px;
   -webkit-border-top-left-radius: 3px;
@@ -2584,6 +2590,17 @@ body .p-tree.p-tree-horizontal .p-treenode .p-treenode-content.p-treenode-select
   background-color: #4c4c4c;
   color: #dedede;
 }
+body .p-tree .p-tree-filter-container .p-tree-filter {
+  width: 100%;
+  padding-right: 2em;
+}
+body .p-tree .p-tree-filter-container .p-tree-filter-icon {
+  top: 50%;
+  left: auto;
+  margin-top: -0.5em;
+  right: 0.8em;
+  color: #252525;
+}
 body .p-organizationchart .p-organizationchart-node-content.p-organizationchart-selectable-node:not(.p-highlight):hover {
   background-color: #4c4c4c;
   color: #dedede;
@@ -3015,7 +3032,7 @@ body .p-overlaypanel {
   box-shadow: 0 0 6px 0 rgba(0, 0, 0, 0.16);
 }
 body .p-overlaypanel .p-overlaypanel-content {
-  padding: 0.571em 1em;
+  padding: 1em;
 }
 body .p-overlaypanel .p-overlaypanel-close {
   background-color: #1f7ed0;
@@ -3070,7 +3087,7 @@ body .p-dialog .p-dialog-titlebar {
   background-color: #191919;
   color: #dedede;
   padding: 1em;
-  font-weight: 400;
+  font-weight: 700;
   border-bottom: 0 none;
   -moz-border-radius-topleft: 3px;
   -webkit-border-top-left-radius: 3px;
@@ -3082,6 +3099,7 @@ body .p-dialog .p-dialog-titlebar {
 body .p-dialog .p-dialog-titlebar .p-dialog-title {
   margin: 0;
   float: none;
+  font-weight: 700;
 }
 body .p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon {
   color: #888888;
@@ -3100,7 +3118,7 @@ body .p-dialog .p-dialog-content {
   background-color: #323232;
   color: #dedede;
   border: 1px solid #191919;
-  padding: 0.571em 1em;
+  padding: 1em;
 }
 body .p-dialog .p-dialog-footer {
   border: 1px solid #191919;
@@ -3177,7 +3195,7 @@ body .p-lightbox .p-lightbox-caption {
   background-color: #191919;
   color: #dedede;
   padding: 0.571em 1em;
-  font-weight: 400;
+  font-weight: 700;
 }
 body .p-lightbox .p-lightbox-caption .p-lightbox-caption-text {
   color: #dedede;
@@ -3422,7 +3440,7 @@ body .p-menu .p-submenu-header {
   padding: 0.714em 0.857em;
   color: #dedede;
   background-color: #191919;
-  font-weight: 400;
+  font-weight: 700;
   border: 0 none;
   -moz-border-radius-topleft: 3px;
   -webkit-border-top-left-radius: 3px;
@@ -3585,7 +3603,7 @@ body .p-slidemenu .p-slidemenu-backward {
   padding: 0.571em 1em;
   color: #dedede;
   background-color: #191919;
-  font-weight: 400;
+  font-weight: 700;
   border: 0 none;
 }
 body .p-slidemenu .p-slidemenu-backward:hover {
@@ -3680,7 +3698,7 @@ body .p-megamenu .p-megamenu-submenu-header {
   padding: 0.571em 1em;
   color: #dedede;
   background-color: #191919;
-  font-weight: 400;
+  font-weight: 700;
   border: 0 none;
 }
 body .p-megamenu .p-megamenu-panel {
@@ -3726,7 +3744,7 @@ body .p-panelmenu .p-panelmenu-header > a {
   background-color: #191919;
   color: #dedede;
   padding: 0.714em 0.857em;
-  font-weight: 400;
+  font-weight: 700;
   position: static;
   font-size: 14px;
   -moz-border-radius: 3px;
diff --git a/public/themes/luna-green/theme.css b/public/themes/luna-green/theme.css
index 5fda655de..d8e84a5d2 100644
--- a/public/themes/luna-green/theme.css
+++ b/public/themes/luna-green/theme.css
@@ -940,6 +940,9 @@ body .p-datepicker table {
 body .p-datepicker table th {
   padding: 0.5em;
 }
+body .p-datepicker table th.p-datepicker-weekheader {
+  border-right: 1px solid #191919;
+}
 body .p-datepicker table td {
   padding: 0.5em;
 }
@@ -965,6 +968,9 @@ body .p-datepicker table td.p-datepicker-today > span.p-highlight {
   color: #ffffff;
   background-color: #1ea04c;
 }
+body .p-datepicker table td.p-datepicker-weeknumber {
+  border-right: 1px solid #191919;
+}
 body .p-datepicker .p-datepicker-buttonbar {
   border-top: 1px solid #3f3f3f;
 }
@@ -1510,10 +1516,10 @@ body .p-panel .p-panel-titlebar {
 }
 body .p-panel .p-panel-titlebar .p-panel-title {
   vertical-align: middle;
-  font-weight: 400;
+  font-weight: 700;
 }
 body .p-panel .p-panel-titlebar .p-panel-titlebar-icon {
-  margin: 0;
+  margin: 0.143em 0 0 0;
   position: relative;
   font-size: 14px;
   color: #888888;
@@ -1541,7 +1547,6 @@ body .p-panel .p-panel-content {
   border: 1px solid #191919;
   background-color: #323232;
   color: #dedede;
-  padding: 0.571em 1em;
   border-top: 0 none;
   -moz-border-radius-bottomleft: 3px;
   -webkit-border-bottom-left-radius: 3px;
@@ -1571,6 +1576,7 @@ body .p-fieldset .p-fieldset-legend a {
   border: 1px solid #191919;
   color: #dedede;
   background-color: #191919;
+  font-weight: 700;
   -moz-border-radius: 3px;
   -webkit-border-radius: 3px;
   border-radius: 3px;
@@ -1616,7 +1622,7 @@ body .p-accordion .p-accordion-header a {
   color: #dedede;
   background-color: #191919;
   color: #dedede;
-  font-weight: 400;
+  font-weight: 700;
   -moz-border-radius: 3px;
   -webkit-border-radius: 3px;
   border-radius: 3px;
@@ -1634,7 +1640,7 @@ body .p-accordion .p-accordion-header a .p-accordion-toggle-icon.pi-caret-right:
 body .p-accordion .p-accordion-header a .p-accordion-toggle-icon.pi-caret-down:before {
   content: "";
 }
-body .p-accordion .p-accordion-header a:not(.p-disabled):focus {
+body .p-accordion .p-accordion-header:not(.p-disabled) a:focus {
   outline: 0 none;
   outline-offset: 0;
   -webkit-box-shadow: 0 0 0 0.2em #88e9aa;
@@ -1709,7 +1715,7 @@ body .p-tabview.p-tabview-top .p-tabview-nav li a, body .p-tabview.p-tabview-bot
   display: inline-block;
   color: #dedede;
   padding: 0.571em 1em;
-  font-weight: 400;
+  font-weight: 700;
   -moz-transition: background-color 0.2s, box-shadow 0.2s;
   -o-transition: background-color 0.2s, box-shadow 0.2s;
   -webkit-transition: background-color 0.2s, box-shadow 0.2s;
@@ -2115,7 +2121,7 @@ body .p-datagrid .p-datagrid-header {
   color: #dedede;
   border: 1px solid #191919;
   padding: 0.571em 1em;
-  font-weight: 400;
+  font-weight: 700;
   border-bottom: 0 none;
 }
 body .p-datagrid .p-datagrid-content {
@@ -2137,7 +2143,7 @@ body .p-datalist .p-datalist-header {
   color: #dedede;
   border: 1px solid #191919;
   padding: 0.571em 1em;
-  font-weight: 400;
+  font-weight: 700;
   border-bottom: 0 none;
 }
 body .p-datalist .p-datalist-content {
@@ -2159,7 +2165,7 @@ body .p-datascroller .p-datascroller-header {
   color: #dedede;
   border: 1px solid #191919;
   padding: 0.571em 1em;
-  font-weight: 400;
+  font-weight: 700;
   border-bottom: 0 none;
 }
 body .p-datascroller .p-datascroller-content {
@@ -2181,7 +2187,7 @@ body .p-dataview .p-dataview-header {
   color: #dedede;
   border: 1px solid #191919;
   padding: 0.571em 1em;
-  font-weight: 400;
+  font-weight: 700;
   border-bottom: 0 none;
   -moz-border-radius-topleft: 3px;
   -webkit-border-top-left-radius: 3px;
@@ -2232,7 +2238,7 @@ body .fc .fc-event {
   border: 1px solid #1b9044;
   color: #ffffff;
 }
-body .fc .fc-toolbar .ui-button {
+body .fc .fc-toolbar .fc-button {
   color: #ffffff;
   background-color: #1ea04c;
   border: 1px solid #1ea04c;
@@ -2245,38 +2251,38 @@ body .fc .fc-toolbar .ui-button {
   -webkit-border-radius: 3px;
   border-radius: 3px;
 }
-body .fc .fc-toolbar .ui-button:enabled:hover {
+body .fc .fc-toolbar .fc-button:enabled:hover {
   background-color: #1b9044;
   color: #ffffff;
   border-color: #1b9044;
 }
-body .fc .fc-toolbar .ui-button .ui-icon-circle-triangle-w {
-  font-family: "PrimeIcons";
+body .fc .fc-toolbar .fc-button .fc-icon-chevron-left {
+  font-family: "PrimeIcons" !important;
   text-indent: 0;
 }
-body .fc .fc-toolbar .ui-button .ui-icon-circle-triangle-w:before {
+body .fc .fc-toolbar .fc-button .fc-icon-chevron-left:before {
   content: "";
 }
-body .fc .fc-toolbar .ui-button .ui-icon-circle-triangle-e {
-  font-family: "PrimeIcons";
+body .fc .fc-toolbar .fc-button .fc-icon-chevron-right {
+  font-family: "PrimeIcons" !important;
   text-indent: 0;
 }
-body .fc .fc-toolbar .ui-button .ui-icon-circle-triangle-e:before {
+body .fc .fc-toolbar .fc-button .fc-icon-chevron-right:before {
   content: "";
 }
-body .fc .fc-toolbar .ui-button:focus {
+body .fc .fc-toolbar .fc-button:focus {
   outline: 0 none;
   outline-offset: 0;
   -webkit-box-shadow: 0 0 0 0.2em #88e9aa;
   -moz-box-shadow: 0 0 0 0.2em #88e9aa;
   box-shadow: 0 0 0 0.2em #88e9aa;
 }
-body .fc .fc-toolbar .fc-button-group .ui-button {
+body .fc .fc-toolbar .fc-button-group .fc-button {
   -moz-border-radius: 0;
   -webkit-border-radius: 0;
   border-radius: 0;
 }
-body .fc .fc-toolbar .fc-button-group .ui-button:first-child {
+body .fc .fc-toolbar .fc-button-group .fc-button:first-child {
   -moz-border-radius-topleft: 3px;
   -webkit-border-top-left-radius: 3px;
   border-top-left-radius: 3px;
@@ -2284,7 +2290,7 @@ body .fc .fc-toolbar .fc-button-group .ui-button:first-child {
   -webkit-border-bottom-left-radius: 3px;
   border-bottom-left-radius: 3px;
 }
-body .fc .fc-toolbar .fc-button-group .ui-button:last-child {
+body .fc .fc-toolbar .fc-button-group .fc-button:last-child {
   -moz-border-radius-topright: 3px;
   -webkit-border-top-right-radius: 3px;
   border-top-right-radius: 3px;
@@ -2307,7 +2313,7 @@ body .p-picklist .p-picklist-caption {
   color: #dedede;
   border: 1px solid #191919;
   padding: 0.571em 1em;
-  font-weight: 400;
+  font-weight: 700;
   border-bottom: 0 none;
   -moz-border-radius-topleft: 3px;
   -webkit-border-top-left-radius: 3px;
@@ -2396,7 +2402,7 @@ body .p-orderlist .p-orderlist-caption {
   color: #dedede;
   border: 1px solid #191919;
   padding: 0.571em 1em;
-  font-weight: 400;
+  font-weight: 700;
   border-bottom: 0 none;
   -moz-border-radius-topleft: 3px;
   -webkit-border-top-left-radius: 3px;
@@ -2584,6 +2590,17 @@ body .p-tree.p-tree-horizontal .p-treenode .p-treenode-content.p-treenode-select
   background-color: #4c4c4c;
   color: #dedede;
 }
+body .p-tree .p-tree-filter-container .p-tree-filter {
+  width: 100%;
+  padding-right: 2em;
+}
+body .p-tree .p-tree-filter-container .p-tree-filter-icon {
+  top: 50%;
+  left: auto;
+  margin-top: -0.5em;
+  right: 0.8em;
+  color: #252525;
+}
 body .p-organizationchart .p-organizationchart-node-content.p-organizationchart-selectable-node:not(.p-highlight):hover {
   background-color: #4c4c4c;
   color: #dedede;
@@ -3015,7 +3032,7 @@ body .p-overlaypanel {
   box-shadow: 0 0 6px 0 rgba(0, 0, 0, 0.16);
 }
 body .p-overlaypanel .p-overlaypanel-content {
-  padding: 0.571em 1em;
+  padding: 1em;
 }
 body .p-overlaypanel .p-overlaypanel-close {
   background-color: #1ea04c;
@@ -3070,7 +3087,7 @@ body .p-dialog .p-dialog-titlebar {
   background-color: #191919;
   color: #dedede;
   padding: 1em;
-  font-weight: 400;
+  font-weight: 700;
   border-bottom: 0 none;
   -moz-border-radius-topleft: 3px;
   -webkit-border-top-left-radius: 3px;
@@ -3082,6 +3099,7 @@ body .p-dialog .p-dialog-titlebar {
 body .p-dialog .p-dialog-titlebar .p-dialog-title {
   margin: 0;
   float: none;
+  font-weight: 700;
 }
 body .p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon {
   color: #888888;
@@ -3100,7 +3118,7 @@ body .p-dialog .p-dialog-content {
   background-color: #323232;
   color: #dedede;
   border: 1px solid #191919;
-  padding: 0.571em 1em;
+  padding: 1em;
 }
 body .p-dialog .p-dialog-footer {
   border: 1px solid #191919;
@@ -3177,7 +3195,7 @@ body .p-lightbox .p-lightbox-caption {
   background-color: #191919;
   color: #dedede;
   padding: 0.571em 1em;
-  font-weight: 400;
+  font-weight: 700;
 }
 body .p-lightbox .p-lightbox-caption .p-lightbox-caption-text {
   color: #dedede;
@@ -3422,7 +3440,7 @@ body .p-menu .p-submenu-header {
   padding: 0.714em 0.857em;
   color: #dedede;
   background-color: #191919;
-  font-weight: 400;
+  font-weight: 700;
   border: 0 none;
   -moz-border-radius-topleft: 3px;
   -webkit-border-top-left-radius: 3px;
@@ -3585,7 +3603,7 @@ body .p-slidemenu .p-slidemenu-backward {
   padding: 0.571em 1em;
   color: #dedede;
   background-color: #191919;
-  font-weight: 400;
+  font-weight: 700;
   border: 0 none;
 }
 body .p-slidemenu .p-slidemenu-backward:hover {
@@ -3680,7 +3698,7 @@ body .p-megamenu .p-megamenu-submenu-header {
   padding: 0.571em 1em;
   color: #dedede;
   background-color: #191919;
-  font-weight: 400;
+  font-weight: 700;
   border: 0 none;
 }
 body .p-megamenu .p-megamenu-panel {
@@ -3726,7 +3744,7 @@ body .p-panelmenu .p-panelmenu-header > a {
   background-color: #191919;
   color: #dedede;
   padding: 0.714em 0.857em;
-  font-weight: 400;
+  font-weight: 700;
   position: static;
   font-size: 14px;
   -moz-border-radius: 3px;
diff --git a/public/themes/luna-pink/theme.css b/public/themes/luna-pink/theme.css
index c0ca69671..16d8c0ad6 100644
--- a/public/themes/luna-pink/theme.css
+++ b/public/themes/luna-pink/theme.css
@@ -940,6 +940,9 @@ body .p-datepicker table {
 body .p-datepicker table th {
   padding: 0.5em;
 }
+body .p-datepicker table th.p-datepicker-weekheader {
+  border-right: 1px solid #191919;
+}
 body .p-datepicker table td {
   padding: 0.5em;
 }
@@ -965,6 +968,9 @@ body .p-datepicker table td.p-datepicker-today > span.p-highlight {
   color: #ffffff;
   background-color: #cc285c;
 }
+body .p-datepicker table td.p-datepicker-weeknumber {
+  border-right: 1px solid #191919;
+}
 body .p-datepicker .p-datepicker-buttonbar {
   border-top: 1px solid #3f3f3f;
 }
@@ -1510,10 +1516,10 @@ body .p-panel .p-panel-titlebar {
 }
 body .p-panel .p-panel-titlebar .p-panel-title {
   vertical-align: middle;
-  font-weight: 400;
+  font-weight: 700;
 }
 body .p-panel .p-panel-titlebar .p-panel-titlebar-icon {
-  margin: 0;
+  margin: 0.143em 0 0 0;
   position: relative;
   font-size: 14px;
   color: #888888;
@@ -1541,7 +1547,6 @@ body .p-panel .p-panel-content {
   border: 1px solid #191919;
   background-color: #323232;
   color: #dedede;
-  padding: 0.571em 1em;
   border-top: 0 none;
   -moz-border-radius-bottomleft: 3px;
   -webkit-border-bottom-left-radius: 3px;
@@ -1571,6 +1576,7 @@ body .p-fieldset .p-fieldset-legend a {
   border: 1px solid #191919;
   color: #dedede;
   background-color: #191919;
+  font-weight: 700;
   -moz-border-radius: 3px;
   -webkit-border-radius: 3px;
   border-radius: 3px;
@@ -1616,7 +1622,7 @@ body .p-accordion .p-accordion-header a {
   color: #dedede;
   background-color: #191919;
   color: #dedede;
-  font-weight: 400;
+  font-weight: 700;
   -moz-border-radius: 3px;
   -webkit-border-radius: 3px;
   border-radius: 3px;
@@ -1634,7 +1640,7 @@ body .p-accordion .p-accordion-header a .p-accordion-toggle-icon.pi-caret-right:
 body .p-accordion .p-accordion-header a .p-accordion-toggle-icon.pi-caret-down:before {
   content: "";
 }
-body .p-accordion .p-accordion-header a:not(.p-disabled):focus {
+body .p-accordion .p-accordion-header:not(.p-disabled) a:focus {
   outline: 0 none;
   outline-offset: 0;
   -webkit-box-shadow: 0 0 0 0.2em #f1b6c8;
@@ -1709,7 +1715,7 @@ body .p-tabview.p-tabview-top .p-tabview-nav li a, body .p-tabview.p-tabview-bot
   display: inline-block;
   color: #dedede;
   padding: 0.571em 1em;
-  font-weight: 400;
+  font-weight: 700;
   -moz-transition: background-color 0.2s, box-shadow 0.2s;
   -o-transition: background-color 0.2s, box-shadow 0.2s;
   -webkit-transition: background-color 0.2s, box-shadow 0.2s;
@@ -2115,7 +2121,7 @@ body .p-datagrid .p-datagrid-header {
   color: #dedede;
   border: 1px solid #191919;
   padding: 0.571em 1em;
-  font-weight: 400;
+  font-weight: 700;
   border-bottom: 0 none;
 }
 body .p-datagrid .p-datagrid-content {
@@ -2137,7 +2143,7 @@ body .p-datalist .p-datalist-header {
   color: #dedede;
   border: 1px solid #191919;
   padding: 0.571em 1em;
-  font-weight: 400;
+  font-weight: 700;
   border-bottom: 0 none;
 }
 body .p-datalist .p-datalist-content {
@@ -2159,7 +2165,7 @@ body .p-datascroller .p-datascroller-header {
   color: #dedede;
   border: 1px solid #191919;
   padding: 0.571em 1em;
-  font-weight: 400;
+  font-weight: 700;
   border-bottom: 0 none;
 }
 body .p-datascroller .p-datascroller-content {
@@ -2181,7 +2187,7 @@ body .p-dataview .p-dataview-header {
   color: #dedede;
   border: 1px solid #191919;
   padding: 0.571em 1em;
-  font-weight: 400;
+  font-weight: 700;
   border-bottom: 0 none;
   -moz-border-radius-topleft: 3px;
   -webkit-border-top-left-radius: 3px;
@@ -2232,7 +2238,7 @@ body .fc .fc-event {
   border: 1px solid #b72452;
   color: #ffffff;
 }
-body .fc .fc-toolbar .ui-button {
+body .fc .fc-toolbar .fc-button {
   color: #ffffff;
   background-color: #cc285c;
   border: 1px solid #cc285c;
@@ -2245,38 +2251,38 @@ body .fc .fc-toolbar .ui-button {
   -webkit-border-radius: 3px;
   border-radius: 3px;
 }
-body .fc .fc-toolbar .ui-button:enabled:hover {
+body .fc .fc-toolbar .fc-button:enabled:hover {
   background-color: #b72452;
   color: #ffffff;
   border-color: #b72452;
 }
-body .fc .fc-toolbar .ui-button .ui-icon-circle-triangle-w {
-  font-family: "PrimeIcons";
+body .fc .fc-toolbar .fc-button .fc-icon-chevron-left {
+  font-family: "PrimeIcons" !important;
   text-indent: 0;
 }
-body .fc .fc-toolbar .ui-button .ui-icon-circle-triangle-w:before {
+body .fc .fc-toolbar .fc-button .fc-icon-chevron-left:before {
   content: "";
 }
-body .fc .fc-toolbar .ui-button .ui-icon-circle-triangle-e {
-  font-family: "PrimeIcons";
+body .fc .fc-toolbar .fc-button .fc-icon-chevron-right {
+  font-family: "PrimeIcons" !important;
   text-indent: 0;
 }
-body .fc .fc-toolbar .ui-button .ui-icon-circle-triangle-e:before {
+body .fc .fc-toolbar .fc-button .fc-icon-chevron-right:before {
   content: "";
 }
-body .fc .fc-toolbar .ui-button:focus {
+body .fc .fc-toolbar .fc-button:focus {
   outline: 0 none;
   outline-offset: 0;
   -webkit-box-shadow: 0 0 0 0.2em #f1b6c8;
   -moz-box-shadow: 0 0 0 0.2em #f1b6c8;
   box-shadow: 0 0 0 0.2em #f1b6c8;
 }
-body .fc .fc-toolbar .fc-button-group .ui-button {
+body .fc .fc-toolbar .fc-button-group .fc-button {
   -moz-border-radius: 0;
   -webkit-border-radius: 0;
   border-radius: 0;
 }
-body .fc .fc-toolbar .fc-button-group .ui-button:first-child {
+body .fc .fc-toolbar .fc-button-group .fc-button:first-child {
   -moz-border-radius-topleft: 3px;
   -webkit-border-top-left-radius: 3px;
   border-top-left-radius: 3px;
@@ -2284,7 +2290,7 @@ body .fc .fc-toolbar .fc-button-group .ui-button:first-child {
   -webkit-border-bottom-left-radius: 3px;
   border-bottom-left-radius: 3px;
 }
-body .fc .fc-toolbar .fc-button-group .ui-button:last-child {
+body .fc .fc-toolbar .fc-button-group .fc-button:last-child {
   -moz-border-radius-topright: 3px;
   -webkit-border-top-right-radius: 3px;
   border-top-right-radius: 3px;
@@ -2307,7 +2313,7 @@ body .p-picklist .p-picklist-caption {
   color: #dedede;
   border: 1px solid #191919;
   padding: 0.571em 1em;
-  font-weight: 400;
+  font-weight: 700;
   border-bottom: 0 none;
   -moz-border-radius-topleft: 3px;
   -webkit-border-top-left-radius: 3px;
@@ -2396,7 +2402,7 @@ body .p-orderlist .p-orderlist-caption {
   color: #dedede;
   border: 1px solid #191919;
   padding: 0.571em 1em;
-  font-weight: 400;
+  font-weight: 700;
   border-bottom: 0 none;
   -moz-border-radius-topleft: 3px;
   -webkit-border-top-left-radius: 3px;
@@ -2584,6 +2590,17 @@ body .p-tree.p-tree-horizontal .p-treenode .p-treenode-content.p-treenode-select
   background-color: #4c4c4c;
   color: #dedede;
 }
+body .p-tree .p-tree-filter-container .p-tree-filter {
+  width: 100%;
+  padding-right: 2em;
+}
+body .p-tree .p-tree-filter-container .p-tree-filter-icon {
+  top: 50%;
+  left: auto;
+  margin-top: -0.5em;
+  right: 0.8em;
+  color: #252525;
+}
 body .p-organizationchart .p-organizationchart-node-content.p-organizationchart-selectable-node:not(.p-highlight):hover {
   background-color: #4c4c4c;
   color: #dedede;
@@ -3015,7 +3032,7 @@ body .p-overlaypanel {
   box-shadow: 0 0 6px 0 rgba(0, 0, 0, 0.16);
 }
 body .p-overlaypanel .p-overlaypanel-content {
-  padding: 0.571em 1em;
+  padding: 1em;
 }
 body .p-overlaypanel .p-overlaypanel-close {
   background-color: #cc285c;
@@ -3070,7 +3087,7 @@ body .p-dialog .p-dialog-titlebar {
   background-color: #191919;
   color: #dedede;
   padding: 1em;
-  font-weight: 400;
+  font-weight: 700;
   border-bottom: 0 none;
   -moz-border-radius-topleft: 3px;
   -webkit-border-top-left-radius: 3px;
@@ -3082,6 +3099,7 @@ body .p-dialog .p-dialog-titlebar {
 body .p-dialog .p-dialog-titlebar .p-dialog-title {
   margin: 0;
   float: none;
+  font-weight: 700;
 }
 body .p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon {
   color: #888888;
@@ -3100,7 +3118,7 @@ body .p-dialog .p-dialog-content {
   background-color: #323232;
   color: #dedede;
   border: 1px solid #191919;
-  padding: 0.571em 1em;
+  padding: 1em;
 }
 body .p-dialog .p-dialog-footer {
   border: 1px solid #191919;
@@ -3177,7 +3195,7 @@ body .p-lightbox .p-lightbox-caption {
   background-color: #191919;
   color: #dedede;
   padding: 0.571em 1em;
-  font-weight: 400;
+  font-weight: 700;
 }
 body .p-lightbox .p-lightbox-caption .p-lightbox-caption-text {
   color: #dedede;
@@ -3422,7 +3440,7 @@ body .p-menu .p-submenu-header {
   padding: 0.714em 0.857em;
   color: #dedede;
   background-color: #191919;
-  font-weight: 400;
+  font-weight: 700;
   border: 0 none;
   -moz-border-radius-topleft: 3px;
   -webkit-border-top-left-radius: 3px;
@@ -3585,7 +3603,7 @@ body .p-slidemenu .p-slidemenu-backward {
   padding: 0.571em 1em;
   color: #dedede;
   background-color: #191919;
-  font-weight: 400;
+  font-weight: 700;
   border: 0 none;
 }
 body .p-slidemenu .p-slidemenu-backward:hover {
@@ -3680,7 +3698,7 @@ body .p-megamenu .p-megamenu-submenu-header {
   padding: 0.571em 1em;
   color: #dedede;
   background-color: #191919;
-  font-weight: 400;
+  font-weight: 700;
   border: 0 none;
 }
 body .p-megamenu .p-megamenu-panel {
@@ -3726,7 +3744,7 @@ body .p-panelmenu .p-panelmenu-header > a {
   background-color: #191919;
   color: #dedede;
   padding: 0.714em 0.857em;
-  font-weight: 400;
+  font-weight: 700;
   position: static;
   font-size: 14px;
   -moz-border-radius: 3px;
diff --git a/public/themes/nova-colored/theme.css b/public/themes/nova-colored/theme.css
index 44a9017e1..daca42902 100644
--- a/public/themes/nova-colored/theme.css
+++ b/public/themes/nova-colored/theme.css
@@ -940,6 +940,9 @@ body .p-datepicker table {
 body .p-datepicker table th {
   padding: 0.5em;
 }
+body .p-datepicker table th.p-datepicker-weekheader {
+  border-right: 1px solid #a6a6a6;
+}
 body .p-datepicker table td {
   padding: 0.5em;
 }
@@ -965,6 +968,9 @@ body .p-datepicker table td.p-datepicker-today > span.p-highlight {
   color: #ffffff;
   background-color: #007ad9;
 }
+body .p-datepicker table td.p-datepicker-weeknumber {
+  border-right: 1px solid #a6a6a6;
+}
 body .p-datepicker .p-datepicker-buttonbar {
   border-top: 1px solid #d8dae2;
 }
@@ -1510,10 +1516,10 @@ body .p-panel .p-panel-titlebar {
 }
 body .p-panel .p-panel-titlebar .p-panel-title {
   vertical-align: middle;
-  font-weight: 400;
+  font-weight: 700;
 }
 body .p-panel .p-panel-titlebar .p-panel-titlebar-icon {
-  margin: 0;
+  margin: 0.143em 0 0 0;
   position: relative;
   font-size: 14px;
   color: #ffffff;
@@ -1541,7 +1547,6 @@ body .p-panel .p-panel-content {
   border: 1px solid #c8c8c8;
   background-color: #ffffff;
   color: #333333;
-  padding: 0.571em 1em;
   border-top: 0 none;
   -moz-border-radius-bottomleft: 3px;
   -webkit-border-bottom-left-radius: 3px;
@@ -1571,6 +1576,7 @@ body .p-fieldset .p-fieldset-legend a {
   border: 1px solid #007ad9;
   color: #ffffff;
   background-color: #007ad9;
+  font-weight: 700;
   -moz-border-radius: 3px;
   -webkit-border-radius: 3px;
   border-radius: 3px;
@@ -1616,7 +1622,7 @@ body .p-accordion .p-accordion-header a {
   color: #ffffff;
   background-color: #007ad9;
   color: #ffffff;
-  font-weight: 400;
+  font-weight: 700;
   -moz-border-radius: 3px;
   -webkit-border-radius: 3px;
   border-radius: 3px;
@@ -1634,7 +1640,7 @@ body .p-accordion .p-accordion-header a .p-accordion-toggle-icon.pi-caret-right:
 body .p-accordion .p-accordion-header a .p-accordion-toggle-icon.pi-caret-down:before {
   content: "";
 }
-body .p-accordion .p-accordion-header a:not(.p-disabled):focus {
+body .p-accordion .p-accordion-header:not(.p-disabled) a:focus {
   outline: 0 none;
   outline-offset: 0;
   -webkit-box-shadow: 0 0 0 0.2em #8dcdff;
@@ -1709,7 +1715,7 @@ body .p-tabview.p-tabview-top .p-tabview-nav li a, body .p-tabview.p-tabview-bot
   display: inline-block;
   color: #ffffff;
   padding: 0.571em 1em;
-  font-weight: 400;
+  font-weight: 700;
   -moz-transition: background-color 0.2s, box-shadow 0.2s;
   -o-transition: background-color 0.2s, box-shadow 0.2s;
   -webkit-transition: background-color 0.2s, box-shadow 0.2s;
@@ -2115,7 +2121,7 @@ body .p-datagrid .p-datagrid-header {
   color: #ffffff;
   border: 1px solid #007ad9;
   padding: 0.571em 1em;
-  font-weight: 400;
+  font-weight: 700;
   border-bottom: 0 none;
 }
 body .p-datagrid .p-datagrid-content {
@@ -2137,7 +2143,7 @@ body .p-datalist .p-datalist-header {
   color: #ffffff;
   border: 1px solid #007ad9;
   padding: 0.571em 1em;
-  font-weight: 400;
+  font-weight: 700;
   border-bottom: 0 none;
 }
 body .p-datalist .p-datalist-content {
@@ -2159,7 +2165,7 @@ body .p-datascroller .p-datascroller-header {
   color: #ffffff;
   border: 1px solid #007ad9;
   padding: 0.571em 1em;
-  font-weight: 400;
+  font-weight: 700;
   border-bottom: 0 none;
 }
 body .p-datascroller .p-datascroller-content {
@@ -2181,7 +2187,7 @@ body .p-dataview .p-dataview-header {
   color: #ffffff;
   border: 1px solid #007ad9;
   padding: 0.571em 1em;
-  font-weight: 400;
+  font-weight: 700;
   border-bottom: 0 none;
   -moz-border-radius-topleft: 3px;
   -webkit-border-top-left-radius: 3px;
@@ -2232,7 +2238,7 @@ body .fc .fc-event {
   border: 1px solid #116fbf;
   color: #ffffff;
 }
-body .fc .fc-toolbar .ui-button {
+body .fc .fc-toolbar .fc-button {
   color: #ffffff;
   background-color: #007ad9;
   border: 1px solid #007ad9;
@@ -2245,38 +2251,38 @@ body .fc .fc-toolbar .ui-button {
   -webkit-border-radius: 3px;
   border-radius: 3px;
 }
-body .fc .fc-toolbar .ui-button:enabled:hover {
+body .fc .fc-toolbar .fc-button:enabled:hover {
   background-color: #116fbf;
   color: #ffffff;
   border-color: #116fbf;
 }
-body .fc .fc-toolbar .ui-button .ui-icon-circle-triangle-w {
-  font-family: "PrimeIcons";
+body .fc .fc-toolbar .fc-button .fc-icon-chevron-left {
+  font-family: "PrimeIcons" !important;
   text-indent: 0;
 }
-body .fc .fc-toolbar .ui-button .ui-icon-circle-triangle-w:before {
+body .fc .fc-toolbar .fc-button .fc-icon-chevron-left:before {
   content: "";
 }
-body .fc .fc-toolbar .ui-button .ui-icon-circle-triangle-e {
-  font-family: "PrimeIcons";
+body .fc .fc-toolbar .fc-button .fc-icon-chevron-right {
+  font-family: "PrimeIcons" !important;
   text-indent: 0;
 }
-body .fc .fc-toolbar .ui-button .ui-icon-circle-triangle-e:before {
+body .fc .fc-toolbar .fc-button .fc-icon-chevron-right:before {
   content: "";
 }
-body .fc .fc-toolbar .ui-button:focus {
+body .fc .fc-toolbar .fc-button:focus {
   outline: 0 none;
   outline-offset: 0;
   -webkit-box-shadow: 0 0 0 0.2em #8dcdff;
   -moz-box-shadow: 0 0 0 0.2em #8dcdff;
   box-shadow: 0 0 0 0.2em #8dcdff;
 }
-body .fc .fc-toolbar .fc-button-group .ui-button {
+body .fc .fc-toolbar .fc-button-group .fc-button {
   -moz-border-radius: 0;
   -webkit-border-radius: 0;
   border-radius: 0;
 }
-body .fc .fc-toolbar .fc-button-group .ui-button:first-child {
+body .fc .fc-toolbar .fc-button-group .fc-button:first-child {
   -moz-border-radius-topleft: 3px;
   -webkit-border-top-left-radius: 3px;
   border-top-left-radius: 3px;
@@ -2284,7 +2290,7 @@ body .fc .fc-toolbar .fc-button-group .ui-button:first-child {
   -webkit-border-bottom-left-radius: 3px;
   border-bottom-left-radius: 3px;
 }
-body .fc .fc-toolbar .fc-button-group .ui-button:last-child {
+body .fc .fc-toolbar .fc-button-group .fc-button:last-child {
   -moz-border-radius-topright: 3px;
   -webkit-border-top-right-radius: 3px;
   border-top-right-radius: 3px;
@@ -2307,7 +2313,7 @@ body .p-picklist .p-picklist-caption {
   color: #ffffff;
   border: 1px solid #007ad9;
   padding: 0.571em 1em;
-  font-weight: 400;
+  font-weight: 700;
   border-bottom: 0 none;
   -moz-border-radius-topleft: 3px;
   -webkit-border-top-left-radius: 3px;
@@ -2396,7 +2402,7 @@ body .p-orderlist .p-orderlist-caption {
   color: #ffffff;
   border: 1px solid #007ad9;
   padding: 0.571em 1em;
-  font-weight: 400;
+  font-weight: 700;
   border-bottom: 0 none;
   -moz-border-radius-topleft: 3px;
   -webkit-border-top-left-radius: 3px;
@@ -2584,6 +2590,17 @@ body .p-tree.p-tree-horizontal .p-treenode .p-treenode-content.p-treenode-select
   background-color: #eaeaea;
   color: #333333;
 }
+body .p-tree .p-tree-filter-container .p-tree-filter {
+  width: 100%;
+  padding-right: 2em;
+}
+body .p-tree .p-tree-filter-container .p-tree-filter-icon {
+  top: 50%;
+  left: auto;
+  margin-top: -0.5em;
+  right: 0.8em;
+  color: #007ad9;
+}
 body .p-organizationchart .p-organizationchart-node-content.p-organizationchart-selectable-node:not(.p-highlight):hover {
   background-color: #eaeaea;
   color: #333333;
@@ -3015,7 +3032,7 @@ body .p-overlaypanel {
   box-shadow: 0 0 6px 0 rgba(0, 0, 0, 0.16);
 }
 body .p-overlaypanel .p-overlaypanel-content {
-  padding: 0.571em 1em;
+  padding: 1em;
 }
 body .p-overlaypanel .p-overlaypanel-close {
   background-color: #007ad9;
@@ -3070,7 +3087,7 @@ body .p-dialog .p-dialog-titlebar {
   background-color: #007ad9;
   color: #ffffff;
   padding: 1em;
-  font-weight: 400;
+  font-weight: 700;
   border-bottom: 0 none;
   -moz-border-radius-topleft: 3px;
   -webkit-border-top-left-radius: 3px;
@@ -3082,6 +3099,7 @@ body .p-dialog .p-dialog-titlebar {
 body .p-dialog .p-dialog-titlebar .p-dialog-title {
   margin: 0;
   float: none;
+  font-weight: 700;
 }
 body .p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon {
   color: #ffffff;
@@ -3100,7 +3118,7 @@ body .p-dialog .p-dialog-content {
   background-color: #ffffff;
   color: #333333;
   border: 1px solid #c8c8c8;
-  padding: 0.571em 1em;
+  padding: 1em;
 }
 body .p-dialog .p-dialog-footer {
   border: 1px solid #c8c8c8;
@@ -3177,7 +3195,7 @@ body .p-lightbox .p-lightbox-caption {
   background-color: #007ad9;
   color: #ffffff;
   padding: 0.571em 1em;
-  font-weight: 400;
+  font-weight: 700;
 }
 body .p-lightbox .p-lightbox-caption .p-lightbox-caption-text {
   color: #ffffff;
@@ -3422,7 +3440,7 @@ body .p-menu .p-submenu-header {
   padding: 0.714em 0.857em;
   color: #ffffff;
   background-color: #007ad9;
-  font-weight: 400;
+  font-weight: 700;
   border: 0 none;
   -moz-border-radius-topleft: 3px;
   -webkit-border-top-left-radius: 3px;
@@ -3585,7 +3603,7 @@ body .p-slidemenu .p-slidemenu-backward {
   padding: 0.571em 1em;
   color: #ffffff;
   background-color: #007ad9;
-  font-weight: 400;
+  font-weight: 700;
   border: 0 none;
 }
 body .p-slidemenu .p-slidemenu-backward:hover {
@@ -3680,7 +3698,7 @@ body .p-megamenu .p-megamenu-submenu-header {
   padding: 0.571em 1em;
   color: #ffffff;
   background-color: #007ad9;
-  font-weight: 400;
+  font-weight: 700;
   border: 0 none;
 }
 body .p-megamenu .p-megamenu-panel {
@@ -3726,7 +3744,7 @@ body .p-panelmenu .p-panelmenu-header > a {
   background-color: #007ad9;
   color: #ffffff;
   padding: 0.714em 0.857em;
-  font-weight: 400;
+  font-weight: 700;
   position: static;
   font-size: 14px;
   -moz-border-radius: 3px;
diff --git a/public/themes/nova-dark/theme.css b/public/themes/nova-dark/theme.css
index a63a1f4e7..d8d194aaf 100644
--- a/public/themes/nova-dark/theme.css
+++ b/public/themes/nova-dark/theme.css
@@ -940,6 +940,9 @@ body .p-datepicker table {
 body .p-datepicker table th {
   padding: 0.5em;
 }
+body .p-datepicker table th.p-datepicker-weekheader {
+  border-right: 1px solid #a6a6a6;
+}
 body .p-datepicker table td {
   padding: 0.5em;
 }
@@ -965,6 +968,9 @@ body .p-datepicker table td.p-datepicker-today > span.p-highlight {
   color: #ffffff;
   background-color: #007ad9;
 }
+body .p-datepicker table td.p-datepicker-weeknumber {
+  border-right: 1px solid #a6a6a6;
+}
 body .p-datepicker .p-datepicker-buttonbar {
   border-top: 1px solid #d8dae2;
 }
@@ -1510,10 +1516,10 @@ body .p-panel .p-panel-titlebar {
 }
 body .p-panel .p-panel-titlebar .p-panel-title {
   vertical-align: middle;
-  font-weight: 400;
+  font-weight: 700;
 }
 body .p-panel .p-panel-titlebar .p-panel-titlebar-icon {
-  margin: 0;
+  margin: 0.143em 0 0 0;
   position: relative;
   font-size: 14px;
   color: #ffffff;
@@ -1541,7 +1547,6 @@ body .p-panel .p-panel-content {
   border: 1px solid #c8c8c8;
   background-color: #ffffff;
   color: #333333;
-  padding: 0.571em 1em;
   border-top: 0 none;
   -moz-border-radius-bottomleft: 3px;
   -webkit-border-bottom-left-radius: 3px;
@@ -1571,6 +1576,7 @@ body .p-fieldset .p-fieldset-legend a {
   border: 1px solid #333333;
   color: #ffffff;
   background-color: #333333;
+  font-weight: 700;
   -moz-border-radius: 3px;
   -webkit-border-radius: 3px;
   border-radius: 3px;
@@ -1616,7 +1622,7 @@ body .p-accordion .p-accordion-header a {
   color: #ffffff;
   background-color: #333333;
   color: #ffffff;
-  font-weight: 400;
+  font-weight: 700;
   -moz-border-radius: 3px;
   -webkit-border-radius: 3px;
   border-radius: 3px;
@@ -1634,7 +1640,7 @@ body .p-accordion .p-accordion-header a .p-accordion-toggle-icon.pi-caret-right:
 body .p-accordion .p-accordion-header a .p-accordion-toggle-icon.pi-caret-down:before {
   content: "";
 }
-body .p-accordion .p-accordion-header a:not(.p-disabled):focus {
+body .p-accordion .p-accordion-header:not(.p-disabled) a:focus {
   outline: 0 none;
   outline-offset: 0;
   -webkit-box-shadow: 0 0 0 0.2em #8dcdff;
@@ -1709,7 +1715,7 @@ body .p-tabview.p-tabview-top .p-tabview-nav li a, body .p-tabview.p-tabview-bot
   display: inline-block;
   color: #ffffff;
   padding: 0.571em 1em;
-  font-weight: 400;
+  font-weight: 700;
   -moz-transition: background-color 0.2s, box-shadow 0.2s;
   -o-transition: background-color 0.2s, box-shadow 0.2s;
   -webkit-transition: background-color 0.2s, box-shadow 0.2s;
@@ -2115,7 +2121,7 @@ body .p-datagrid .p-datagrid-header {
   color: #ffffff;
   border: 1px solid #333333;
   padding: 0.571em 1em;
-  font-weight: 400;
+  font-weight: 700;
   border-bottom: 0 none;
 }
 body .p-datagrid .p-datagrid-content {
@@ -2137,7 +2143,7 @@ body .p-datalist .p-datalist-header {
   color: #ffffff;
   border: 1px solid #333333;
   padding: 0.571em 1em;
-  font-weight: 400;
+  font-weight: 700;
   border-bottom: 0 none;
 }
 body .p-datalist .p-datalist-content {
@@ -2159,7 +2165,7 @@ body .p-datascroller .p-datascroller-header {
   color: #ffffff;
   border: 1px solid #333333;
   padding: 0.571em 1em;
-  font-weight: 400;
+  font-weight: 700;
   border-bottom: 0 none;
 }
 body .p-datascroller .p-datascroller-content {
@@ -2181,7 +2187,7 @@ body .p-dataview .p-dataview-header {
   color: #ffffff;
   border: 1px solid #333333;
   padding: 0.571em 1em;
-  font-weight: 400;
+  font-weight: 700;
   border-bottom: 0 none;
   -moz-border-radius-topleft: 3px;
   -webkit-border-top-left-radius: 3px;
@@ -2232,7 +2238,7 @@ body .fc .fc-event {
   border: 1px solid #116fbf;
   color: #ffffff;
 }
-body .fc .fc-toolbar .ui-button {
+body .fc .fc-toolbar .fc-button {
   color: #ffffff;
   background-color: #007ad9;
   border: 1px solid #007ad9;
@@ -2245,38 +2251,38 @@ body .fc .fc-toolbar .ui-button {
   -webkit-border-radius: 3px;
   border-radius: 3px;
 }
-body .fc .fc-toolbar .ui-button:enabled:hover {
+body .fc .fc-toolbar .fc-button:enabled:hover {
   background-color: #116fbf;
   color: #ffffff;
   border-color: #116fbf;
 }
-body .fc .fc-toolbar .ui-button .ui-icon-circle-triangle-w {
-  font-family: "PrimeIcons";
+body .fc .fc-toolbar .fc-button .fc-icon-chevron-left {
+  font-family: "PrimeIcons" !important;
   text-indent: 0;
 }
-body .fc .fc-toolbar .ui-button .ui-icon-circle-triangle-w:before {
+body .fc .fc-toolbar .fc-button .fc-icon-chevron-left:before {
   content: "";
 }
-body .fc .fc-toolbar .ui-button .ui-icon-circle-triangle-e {
-  font-family: "PrimeIcons";
+body .fc .fc-toolbar .fc-button .fc-icon-chevron-right {
+  font-family: "PrimeIcons" !important;
   text-indent: 0;
 }
-body .fc .fc-toolbar .ui-button .ui-icon-circle-triangle-e:before {
+body .fc .fc-toolbar .fc-button .fc-icon-chevron-right:before {
   content: "";
 }
-body .fc .fc-toolbar .ui-button:focus {
+body .fc .fc-toolbar .fc-button:focus {
   outline: 0 none;
   outline-offset: 0;
   -webkit-box-shadow: 0 0 0 0.2em #8dcdff;
   -moz-box-shadow: 0 0 0 0.2em #8dcdff;
   box-shadow: 0 0 0 0.2em #8dcdff;
 }
-body .fc .fc-toolbar .fc-button-group .ui-button {
+body .fc .fc-toolbar .fc-button-group .fc-button {
   -moz-border-radius: 0;
   -webkit-border-radius: 0;
   border-radius: 0;
 }
-body .fc .fc-toolbar .fc-button-group .ui-button:first-child {
+body .fc .fc-toolbar .fc-button-group .fc-button:first-child {
   -moz-border-radius-topleft: 3px;
   -webkit-border-top-left-radius: 3px;
   border-top-left-radius: 3px;
@@ -2284,7 +2290,7 @@ body .fc .fc-toolbar .fc-button-group .ui-button:first-child {
   -webkit-border-bottom-left-radius: 3px;
   border-bottom-left-radius: 3px;
 }
-body .fc .fc-toolbar .fc-button-group .ui-button:last-child {
+body .fc .fc-toolbar .fc-button-group .fc-button:last-child {
   -moz-border-radius-topright: 3px;
   -webkit-border-top-right-radius: 3px;
   border-top-right-radius: 3px;
@@ -2307,7 +2313,7 @@ body .p-picklist .p-picklist-caption {
   color: #ffffff;
   border: 1px solid #333333;
   padding: 0.571em 1em;
-  font-weight: 400;
+  font-weight: 700;
   border-bottom: 0 none;
   -moz-border-radius-topleft: 3px;
   -webkit-border-top-left-radius: 3px;
@@ -2396,7 +2402,7 @@ body .p-orderlist .p-orderlist-caption {
   color: #ffffff;
   border: 1px solid #333333;
   padding: 0.571em 1em;
-  font-weight: 400;
+  font-weight: 700;
   border-bottom: 0 none;
   -moz-border-radius-topleft: 3px;
   -webkit-border-top-left-radius: 3px;
@@ -2584,6 +2590,17 @@ body .p-tree.p-tree-horizontal .p-treenode .p-treenode-content.p-treenode-select
   background-color: #eaeaea;
   color: #333333;
 }
+body .p-tree .p-tree-filter-container .p-tree-filter {
+  width: 100%;
+  padding-right: 2em;
+}
+body .p-tree .p-tree-filter-container .p-tree-filter-icon {
+  top: 50%;
+  left: auto;
+  margin-top: -0.5em;
+  right: 0.8em;
+  color: #007ad9;
+}
 body .p-organizationchart .p-organizationchart-node-content.p-organizationchart-selectable-node:not(.p-highlight):hover {
   background-color: #eaeaea;
   color: #333333;
@@ -3015,7 +3032,7 @@ body .p-overlaypanel {
   box-shadow: 0 0 6px 0 rgba(0, 0, 0, 0.16);
 }
 body .p-overlaypanel .p-overlaypanel-content {
-  padding: 0.571em 1em;
+  padding: 1em;
 }
 body .p-overlaypanel .p-overlaypanel-close {
   background-color: #007ad9;
@@ -3070,7 +3087,7 @@ body .p-dialog .p-dialog-titlebar {
   background-color: #333333;
   color: #ffffff;
   padding: 1em;
-  font-weight: 400;
+  font-weight: 700;
   border-bottom: 0 none;
   -moz-border-radius-topleft: 3px;
   -webkit-border-top-left-radius: 3px;
@@ -3082,6 +3099,7 @@ body .p-dialog .p-dialog-titlebar {
 body .p-dialog .p-dialog-titlebar .p-dialog-title {
   margin: 0;
   float: none;
+  font-weight: 700;
 }
 body .p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon {
   color: #ffffff;
@@ -3100,7 +3118,7 @@ body .p-dialog .p-dialog-content {
   background-color: #ffffff;
   color: #333333;
   border: 1px solid #c8c8c8;
-  padding: 0.571em 1em;
+  padding: 1em;
 }
 body .p-dialog .p-dialog-footer {
   border: 1px solid #c8c8c8;
@@ -3177,7 +3195,7 @@ body .p-lightbox .p-lightbox-caption {
   background-color: #333333;
   color: #ffffff;
   padding: 0.571em 1em;
-  font-weight: 400;
+  font-weight: 700;
 }
 body .p-lightbox .p-lightbox-caption .p-lightbox-caption-text {
   color: #ffffff;
@@ -3422,7 +3440,7 @@ body .p-menu .p-submenu-header {
   padding: 0.714em 0.857em;
   color: #ffffff;
   background-color: #333333;
-  font-weight: 400;
+  font-weight: 700;
   border: 0 none;
   -moz-border-radius-topleft: 3px;
   -webkit-border-top-left-radius: 3px;
@@ -3585,7 +3603,7 @@ body .p-slidemenu .p-slidemenu-backward {
   padding: 0.571em 1em;
   color: #ffffff;
   background-color: #333333;
-  font-weight: 400;
+  font-weight: 700;
   border: 0 none;
 }
 body .p-slidemenu .p-slidemenu-backward:hover {
@@ -3680,7 +3698,7 @@ body .p-megamenu .p-megamenu-submenu-header {
   padding: 0.571em 1em;
   color: #ffffff;
   background-color: #333333;
-  font-weight: 400;
+  font-weight: 700;
   border: 0 none;
 }
 body .p-megamenu .p-megamenu-panel {
@@ -3726,7 +3744,7 @@ body .p-panelmenu .p-panelmenu-header > a {
   background-color: #333333;
   color: #ffffff;
   padding: 0.714em 0.857em;
-  font-weight: 400;
+  font-weight: 700;
   position: static;
   font-size: 14px;
   -moz-border-radius: 3px;
diff --git a/public/themes/nova-light/theme.css b/public/themes/nova-light/theme.css
index 9887acdae..2ab91ed3b 100644
--- a/public/themes/nova-light/theme.css
+++ b/public/themes/nova-light/theme.css
@@ -940,6 +940,9 @@ body .p-datepicker table {
 body .p-datepicker table th {
   padding: 0.5em;
 }
+body .p-datepicker table th.p-datepicker-weekheader {
+  border-right: 1px solid #a6a6a6;
+}
 body .p-datepicker table td {
   padding: 0.5em;
 }
@@ -965,6 +968,9 @@ body .p-datepicker table td.p-datepicker-today > span.p-highlight {
   color: #ffffff;
   background-color: #007ad9;
 }
+body .p-datepicker table td.p-datepicker-weeknumber {
+  border-right: 1px solid #a6a6a6;
+}
 body .p-datepicker .p-datepicker-buttonbar {
   border-top: 1px solid #d8dae2;
 }
@@ -2584,6 +2590,17 @@ body .p-tree.p-tree-horizontal .p-treenode .p-treenode-content.p-treenode-select
   background-color: #eaeaea;
   color: #333333;
 }
+body .p-tree .p-tree-filter-container .p-tree-filter {
+  width: 100%;
+  padding-right: 2em;
+}
+body .p-tree .p-tree-filter-container .p-tree-filter-icon {
+  top: 50%;
+  left: auto;
+  margin-top: -0.5em;
+  right: 0.8em;
+  color: #007ad9;
+}
 body .p-organizationchart .p-organizationchart-node-content.p-organizationchart-selectable-node:not(.p-highlight):hover {
   background-color: #eaeaea;
   color: #333333;
diff --git a/public/themes/rhea/theme.css b/public/themes/rhea/theme.css
index 938b4a001..03bbbfb85 100644
--- a/public/themes/rhea/theme.css
+++ b/public/themes/rhea/theme.css
@@ -940,6 +940,9 @@ body .p-datepicker table {
 body .p-datepicker table th {
   padding: 0.5em;
 }
+body .p-datepicker table th.p-datepicker-weekheader {
+  border-right: 1px solid #dadada;
+}
 body .p-datepicker table td {
   padding: 0.5em;
 }
@@ -965,6 +968,9 @@ body .p-datepicker table td.p-datepicker-today > span.p-highlight {
   color: #ffffff;
   background-color: #7B95A3;
 }
+body .p-datepicker table td.p-datepicker-weeknumber {
+  border-right: 1px solid #dadada;
+}
 body .p-datepicker .p-datepicker-buttonbar {
   border-top: 1px solid #d8dae2;
 }
@@ -1510,10 +1516,10 @@ body .p-panel .p-panel-titlebar {
 }
 body .p-panel .p-panel-titlebar .p-panel-title {
   vertical-align: middle;
-  font-weight: 400;
+  font-weight: 700;
 }
 body .p-panel .p-panel-titlebar .p-panel-titlebar-icon {
-  margin: 0;
+  margin: 0.143em 0 0 0;
   position: relative;
   font-size: 14px;
   color: #ffffff;
@@ -1541,7 +1547,6 @@ body .p-panel .p-panel-content {
   border: 1px solid #dadada;
   background-color: #ffffff;
   color: #666666;
-  padding: 0.571em 1em;
   border-top: 0 none;
   -moz-border-radius-bottomleft: 2px;
   -webkit-border-bottom-left-radius: 2px;
@@ -1571,6 +1576,7 @@ body .p-fieldset .p-fieldset-legend a {
   border: 1px solid #7B95A3;
   color: #ffffff;
   background-color: #7B95A3;
+  font-weight: 700;
   -moz-border-radius: 2px;
   -webkit-border-radius: 2px;
   border-radius: 2px;
@@ -1616,7 +1622,7 @@ body .p-accordion .p-accordion-header a {
   color: #ffffff;
   background-color: #7B95A3;
   color: #ffffff;
-  font-weight: 400;
+  font-weight: 700;
   -moz-border-radius: 2px;
   -webkit-border-radius: 2px;
   border-radius: 2px;
@@ -1634,7 +1640,7 @@ body .p-accordion .p-accordion-header a .p-accordion-toggle-icon.pi-caret-right:
 body .p-accordion .p-accordion-header a .p-accordion-toggle-icon.pi-caret-down:before {
   content: "";
 }
-body .p-accordion .p-accordion-header a:not(.p-disabled):focus {
+body .p-accordion .p-accordion-header:not(.p-disabled) a:focus {
   outline: 0 none;
   outline-offset: 0;
   -webkit-box-shadow: 0 0 0 0.2em #e4e9ec;
@@ -1709,7 +1715,7 @@ body .p-tabview.p-tabview-top .p-tabview-nav li a, body .p-tabview.p-tabview-bot
   display: inline-block;
   color: #ffffff;
   padding: 0.571em 1em;
-  font-weight: 400;
+  font-weight: 700;
   -moz-transition: background-color 0.2s, box-shadow 0.2s;
   -o-transition: background-color 0.2s, box-shadow 0.2s;
   -webkit-transition: background-color 0.2s, box-shadow 0.2s;
@@ -2115,7 +2121,7 @@ body .p-datagrid .p-datagrid-header {
   color: #ffffff;
   border: 1px solid #7B95A3;
   padding: 0.571em 1em;
-  font-weight: 400;
+  font-weight: 700;
   border-bottom: 0 none;
 }
 body .p-datagrid .p-datagrid-content {
@@ -2137,7 +2143,7 @@ body .p-datalist .p-datalist-header {
   color: #ffffff;
   border: 1px solid #7B95A3;
   padding: 0.571em 1em;
-  font-weight: 400;
+  font-weight: 700;
   border-bottom: 0 none;
 }
 body .p-datalist .p-datalist-content {
@@ -2159,7 +2165,7 @@ body .p-datascroller .p-datascroller-header {
   color: #ffffff;
   border: 1px solid #7B95A3;
   padding: 0.571em 1em;
-  font-weight: 400;
+  font-weight: 700;
   border-bottom: 0 none;
 }
 body .p-datascroller .p-datascroller-content {
@@ -2181,7 +2187,7 @@ body .p-dataview .p-dataview-header {
   color: #ffffff;
   border: 1px solid #7B95A3;
   padding: 0.571em 1em;
-  font-weight: 400;
+  font-weight: 700;
   border-bottom: 0 none;
   -moz-border-radius-topleft: 2px;
   -webkit-border-top-left-radius: 2px;
@@ -2232,7 +2238,7 @@ body .fc .fc-event {
   border: 1px solid #6c8999;
   color: #385048;
 }
-body .fc .fc-toolbar .ui-button {
+body .fc .fc-toolbar .fc-button {
   color: #ffffff;
   background-color: #7B95A3;
   border: 1px solid #617c8a;
@@ -2245,38 +2251,38 @@ body .fc .fc-toolbar .ui-button {
   -webkit-border-radius: 2px;
   border-radius: 2px;
 }
-body .fc .fc-toolbar .ui-button:enabled:hover {
+body .fc .fc-toolbar .fc-button:enabled:hover {
   background-color: #6c8999;
   color: #ffffff;
   border-color: #6c8999;
 }
-body .fc .fc-toolbar .ui-button .ui-icon-circle-triangle-w {
-  font-family: "PrimeIcons";
+body .fc .fc-toolbar .fc-button .fc-icon-chevron-left {
+  font-family: "PrimeIcons" !important;
   text-indent: 0;
 }
-body .fc .fc-toolbar .ui-button .ui-icon-circle-triangle-w:before {
+body .fc .fc-toolbar .fc-button .fc-icon-chevron-left:before {
   content: "";
 }
-body .fc .fc-toolbar .ui-button .ui-icon-circle-triangle-e {
-  font-family: "PrimeIcons";
+body .fc .fc-toolbar .fc-button .fc-icon-chevron-right {
+  font-family: "PrimeIcons" !important;
   text-indent: 0;
 }
-body .fc .fc-toolbar .ui-button .ui-icon-circle-triangle-e:before {
+body .fc .fc-toolbar .fc-button .fc-icon-chevron-right:before {
   content: "";
 }
-body .fc .fc-toolbar .ui-button:focus {
+body .fc .fc-toolbar .fc-button:focus {
   outline: 0 none;
   outline-offset: 0;
   -webkit-box-shadow: 0 0 0 0.2em #e4e9ec;
   -moz-box-shadow: 0 0 0 0.2em #e4e9ec;
   box-shadow: 0 0 0 0.2em #e4e9ec;
 }
-body .fc .fc-toolbar .fc-button-group .ui-button {
+body .fc .fc-toolbar .fc-button-group .fc-button {
   -moz-border-radius: 0;
   -webkit-border-radius: 0;
   border-radius: 0;
 }
-body .fc .fc-toolbar .fc-button-group .ui-button:first-child {
+body .fc .fc-toolbar .fc-button-group .fc-button:first-child {
   -moz-border-radius-topleft: 2px;
   -webkit-border-top-left-radius: 2px;
   border-top-left-radius: 2px;
@@ -2284,7 +2290,7 @@ body .fc .fc-toolbar .fc-button-group .ui-button:first-child {
   -webkit-border-bottom-left-radius: 2px;
   border-bottom-left-radius: 2px;
 }
-body .fc .fc-toolbar .fc-button-group .ui-button:last-child {
+body .fc .fc-toolbar .fc-button-group .fc-button:last-child {
   -moz-border-radius-topright: 2px;
   -webkit-border-top-right-radius: 2px;
   border-top-right-radius: 2px;
@@ -2307,7 +2313,7 @@ body .p-picklist .p-picklist-caption {
   color: #ffffff;
   border: 1px solid #7B95A3;
   padding: 0.571em 1em;
-  font-weight: 400;
+  font-weight: 700;
   border-bottom: 0 none;
   -moz-border-radius-topleft: 2px;
   -webkit-border-top-left-radius: 2px;
@@ -2396,7 +2402,7 @@ body .p-orderlist .p-orderlist-caption {
   color: #ffffff;
   border: 1px solid #7B95A3;
   padding: 0.571em 1em;
-  font-weight: 400;
+  font-weight: 700;
   border-bottom: 0 none;
   -moz-border-radius-topleft: 2px;
   -webkit-border-top-left-radius: 2px;
@@ -2584,6 +2590,17 @@ body .p-tree.p-tree-horizontal .p-treenode .p-treenode-content.p-treenode-select
   background-color: #f4f4f4;
   color: #666666;
 }
+body .p-tree .p-tree-filter-container .p-tree-filter {
+  width: 100%;
+  padding-right: 2em;
+}
+body .p-tree .p-tree-filter-container .p-tree-filter-icon {
+  top: 50%;
+  left: auto;
+  margin-top: -0.5em;
+  right: 0.8em;
+  color: #a6a6a6;
+}
 body .p-organizationchart .p-organizationchart-node-content.p-organizationchart-selectable-node:not(.p-highlight):hover {
   background-color: #f4f4f4;
   color: #666666;
@@ -3015,7 +3032,7 @@ body .p-overlaypanel {
   box-shadow: 0 0 6px 0 rgba(0, 0, 0, 0.16);
 }
 body .p-overlaypanel .p-overlaypanel-content {
-  padding: 0.571em 1em;
+  padding: 1em;
 }
 body .p-overlaypanel .p-overlaypanel-close {
   background-color: #7B95A3;
@@ -3070,7 +3087,7 @@ body .p-dialog .p-dialog-titlebar {
   background-color: #7B95A3;
   color: #ffffff;
   padding: 1em;
-  font-weight: 400;
+  font-weight: 700;
   border-bottom: 0 none;
   -moz-border-radius-topleft: 2px;
   -webkit-border-top-left-radius: 2px;
@@ -3082,6 +3099,7 @@ body .p-dialog .p-dialog-titlebar {
 body .p-dialog .p-dialog-titlebar .p-dialog-title {
   margin: 0;
   float: none;
+  font-weight: 700;
 }
 body .p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon {
   color: #ffffff;
@@ -3100,7 +3118,7 @@ body .p-dialog .p-dialog-content {
   background-color: #ffffff;
   color: #666666;
   border: 1px solid #f1f1f1;
-  padding: 0.571em 1em;
+  padding: 1em;
 }
 body .p-dialog .p-dialog-footer {
   border: 1px solid #dadada;
@@ -3177,7 +3195,7 @@ body .p-lightbox .p-lightbox-caption {
   background-color: #7B95A3;
   color: #ffffff;
   padding: 0.571em 1em;
-  font-weight: 400;
+  font-weight: 700;
 }
 body .p-lightbox .p-lightbox-caption .p-lightbox-caption-text {
   color: #ffffff;
@@ -3422,7 +3440,7 @@ body .p-menu .p-submenu-header {
   padding: 0.714em 0.857em;
   color: #ffffff;
   background-color: #7B95A3;
-  font-weight: 400;
+  font-weight: 700;
   border: 0 none;
   -moz-border-radius-topleft: 2px;
   -webkit-border-top-left-radius: 2px;
@@ -3585,7 +3603,7 @@ body .p-slidemenu .p-slidemenu-backward {
   padding: 0.571em 1em;
   color: #ffffff;
   background-color: #7B95A3;
-  font-weight: 400;
+  font-weight: 700;
   border: 0 none;
 }
 body .p-slidemenu .p-slidemenu-backward:hover {
@@ -3680,7 +3698,7 @@ body .p-megamenu .p-megamenu-submenu-header {
   padding: 0.571em 1em;
   color: #ffffff;
   background-color: #7B95A3;
-  font-weight: 400;
+  font-weight: 700;
   border: 0 none;
 }
 body .p-megamenu .p-megamenu-panel {
@@ -3726,7 +3744,7 @@ body .p-panelmenu .p-panelmenu-header > a {
   background-color: #7B95A3;
   color: #ffffff;
   padding: 0.714em 0.857em;
-  font-weight: 400;
+  font-weight: 700;
   position: static;
   font-size: 14px;
   -moz-border-radius: 2px;
diff --git a/src/components/calendar/Calendar.vue b/src/components/calendar/Calendar.vue
index 0379cd1c3..044fd67e3 100644
--- a/src/components/calendar/Calendar.vue
+++ b/src/components/calendar/Calendar.vue
@@ -28,13 +28,21 @@
                             <table class="p-datepicker-calendar">
                                 <thead>
                                     <tr>
+                                        <th scope="col" v-if="showWeek" class="p-datepicker-weekheader p-disabled">
+                                            <span>{{locale['weekHeader']}}</span>
+                                        </th>
                                         <th scope="col" v-for="weekDay of weekDays" :key="weekDay">
                                             <span>{{weekDay}}</span>
                                         </th>
                                     </tr>
                                 </thead>
                                 <tbody>
-                                    <tr v-for="week of month.dates" :key="week[0].day + '' + week[0].month">
+                                    <tr v-for="(week,i) of month.dates" :key="week[0].day + '' + week[0].month">
+                                        <td v-if="showWeek" class="p-datepicker-weeknumber">
+                                            <span class="p-disabled">
+                                                {{month.weekNumbers[i]}}
+                                            </span>
+                                        </td>
                                         <td v-for="date of week" :key="date.day + '' + date.month" :class="{'p-datepicker-other-month': date.otherMonth, 'p-datepicker-today': date.today}">
                                             <span :class="{'p-highlight': isSelected(date), 'p-disabled': !date.selectable}" @click="onDateSelect(date)" draggable="false">
                                                 <slot name="date" :date="date">{{date.day}}</slot>
@@ -275,6 +283,10 @@ export default {
             type: String,
             default: ':'
         },
+        showWeek: {
+            type: Boolean,
+            default: false
+        },
         locale: {
             type: Object,
             default: () => {
@@ -296,6 +308,18 @@ export default {
     created() {
         this.updateCurrentMetaData();
     },
+    beforeDestroy() {
+        if (this.timePickerTimer) {
+            clearTimeout(this.timePickerTimer);
+        }
+
+        if (this.mask) {
+            this.disableModality();
+            this.mask = null;
+        }
+
+        this.unbindOutsideClickListener();
+    },
     data() {
         return {
             currentMonth: null,
@@ -533,28 +557,23 @@ export default {
         incrementYear() {
             this.currentYear++;
         },
-        initTime(date) {
-            this.pm = date.getHours() > 11;
+        updateCurrentTimeMeta(date) {
+            const hours = date.getHours();
 
-            if (this.showTime) {
-                this.currentMinute = date.getMinutes();
-                this.currentSecond = date.getSeconds();
+            if (this.hourFormat === '12') {
+                this.pm = hours > 11;
                 
-                if (this.hourFormat == '12') {
-                    if (hours >= 12)
-                        this.currentHour = (hours == 12) ? 12 : hours - 12;
-                    else
-                        this.currentHour = (hours == 0) ? 12 : hours;
-                }
-                else {
-                    this.currentHour = date.getHours();
-                }
+                if (hours >= 12)
+                    this.currentHour = (hours == 12) ? 12 : hours - 12;
+                else
+                    this.currentHour = (hours == 0) ? 12 : hours;
             }
-            else if (this.timeOnly) {
-                this.currentMinute = 0;
-                this.currentHour = 0;
-                this.currentSecond = 0;
+            else {
+                this.currentHour = date.getHours();
             }
+            
+            this.currentMinute = date.getMinutes();
+            this.currentSecond = date.getSeconds();
         },
         bindOutsideClickListener() {
             if (!this.outsideClickListener) {
@@ -573,7 +592,7 @@ export default {
             }
         },
         isOutsideClicked(event) {
-            return !(this.$el.isSameNode(event.target) || this.isNavIconClicked(event) || 
+            return !(this.$el.isSameNode(event.target) || this.isNavIconClicked(event) ||
                     this.$el.contains(event.target) || (this.$refs.overlay && this.$refs.overlay.contains(event.target)));
         },
         isNavIconClicked(event) {
@@ -633,7 +652,7 @@ export default {
             }
             
             if (this.isMultipleSelection() && this.isSelected(dateMeta)) {
-                let newValue = this.value.filter((date, i) => !this.isDateEquals(date, dateMeta));
+                let newValue = this.value.filter(date => !this.isDateEquals(date, dateMeta));
                 this.updateModel(newValue);
             }
             else {
@@ -717,9 +736,9 @@ export default {
         updateModel(value) {
             this.$emit('input', value);
         },
-        shouldSelectDate(dateMeta) {
+        shouldSelectDate() {
             if (this.isMultipleSelection())
-                return this.maxDateCount != null ? this.maxDateCount > (this.value ? this.value.length : 0) : true;
+                return this.maxDateCount != null ? this.maxDateCount > (this.value ? this.value.length : 0) : true;
             else
                 return true;
         },
@@ -882,6 +901,7 @@ export default {
             this.updateModel(null);
             this.overlayVisible = false;
             this.$emit('click-clear');
+            event.preventDefault();
         },
         onTimePickerElementMouseDown(event, type, direction) {
             if (!this.$attrs.disabled) {
@@ -893,6 +913,7 @@ export default {
             if (!this.$attrs.disabled) {
                 this.clearTimePickerTimer();
                 this.updateModelTime();
+                event.preventDefault();
             }
         },
         repeat(event, interval, type, direction) {
@@ -1166,7 +1187,10 @@ export default {
             const viewDate = this.viewDate;
             this.currentMonth = viewDate.getMonth();
             this.currentYear = viewDate.getFullYear();
-            this.initTime(viewDate);
+
+            if (this.showTime || this.timeOnly) {
+                this.updateCurrentTimeMeta(viewDate);
+            }
         },
         isValidSelection(value) {
             let isValid = true;
@@ -1393,6 +1417,7 @@ export default {
                     }
                     month++;
                     day -= dim;
+                // eslint-disable-next-line
                 } while (true);
             }
 
@@ -1403,31 +1428,32 @@ export default {
 
             return date;
         },
-        daylightSavingAdjust(date) {
-            if (!date) {
-                return null;
-            }
-
-            date.setHours(date.getHours() > 12 ? date.getHours() + 2 : 0);
-            
-            return date;
+        getWeekNumber(date) {
+            let checkDate = new Date(date.getTime());
+            checkDate.setDate(checkDate.getDate() + 4 - ( checkDate.getDay() || 7 ));
+            let time = checkDate.getTime();
+            checkDate.setMonth( 0 );
+            checkDate.setDate( 1 );
+            return Math.floor( Math.round((time - checkDate.getTime()) / 86400000 ) / 7 ) + 1;
         }
     },
     computed: {
         listeners() {
+            let $vm = this;
+
             return {
-                ...this.$listeners,
+                ...$vm.$listeners,
                 input: val => {
                      // IE 11 Workaround for input placeholder : https://github.com/primefaces/primeng/issues/2026
-                    if (!this.isKeydown) {
+                    if (!$vm.isKeydown) {
                         return;
                     }
-                    this.isKeydown = false;
+                    $vm.isKeydown = false;
                     
                     try {
-                        let value = this.parseValueFromString(val);
-                        if (this.isValidSelection(value)) {
-                            this.updateModel(value);
+                        let value = $vm.parseValueFromString(val);
+                        if ($vm.isValidSelection(value)) {
+                            $vm.updateModel(value);
                         }
                     }
                     catch(err) {
@@ -1435,25 +1461,25 @@ export default {
                     }
                 },
                 focus: event => {
-                    this.focus = true;
-                    if (this.showOnFocus) {
-                        this.overlayVisible = true;
+                    $vm.focus = true;
+                    if ($vm.showOnFocus) {
+                        $vm.overlayVisible = true;
                     }
-                    this.$emit('focus', event)
+                    $vm.$emit('focus', event)
                 },
                 blur: event => {
-                    this.$emit('blur', event);
+                    $vm.$emit('blur', event);
                 },
                 keydown: event => {
-                    this.isKeydown = true;
+                    $vm.isKeydown = true;
                     if (event.keyCode === 9) {
-                        if (this.touchUI)
-                            this.disableModality();
+                        if ($vm.touchUI)
+                            $vm.disableModality();
                         else
-                            this.overlayVisible = false;
+                            $vm.overlayVisible = false;
                     }
 
-                    this.$emit('keydown', event);
+                    $vm.$emit('keydown', event);
                 }
             };
         },
@@ -1541,6 +1567,7 @@ export default {
                 let prevMonthDaysLength = this.getDaysCountInPrevMonth(month, year);
                 let dayNo = 1;
                 let today = new Date();
+                let weekNumbers = [];
                 
                 for (let i = 0; i < 6; i++) {
                     let week = [];
@@ -1575,6 +1602,10 @@ export default {
                             dayNo++;
                         }
                     }
+
+                    if (this.showWeek) {
+                        weekNumbers.push(this.getWeekNumber(new Date(week[0].year, week[0].month, week[0].day))); 
+                    }
                     
                     dates.push(week);
                 }
@@ -1582,7 +1613,8 @@ export default {
                 months.push({
                     month: month,
                     year: year,
-                    dates: dates
+                    dates: dates,
+                    weekNumbers: weekNumbers
                 });
             }
 
@@ -1608,17 +1640,17 @@ export default {
             return this.dateFormat || this.locale.dateFormat;
         },
         yearOptions() {
+            let $vm = this;
             const years = this.yearRange.split(':');
             let yearStart = parseInt(years[0]);
             let yearEnd = parseInt(years[1]);
-            let diff = yearEnd - yearStart;
             let yearOptions = [];
 
             if (this.currentYear < yearStart) {
-                this.currentYear = yearEnd;
+                $vm.currentYear = yearEnd;
             }
             else if (this.currentYear > yearEnd) {
-                this.currentYear = yearStart;
+                $vm.currentYear = yearStart;
             }
 
             for (let i = yearStart; i <= yearEnd; i++) {