diff --git a/genweb/organs/browser/stylesheets/genweb_organs.css b/genweb/organs/browser/stylesheets/genweb_organs.css
index eb471aa4..37e49201 100644
--- a/genweb/organs/browser/stylesheets/genweb_organs.css
+++ b/genweb/organs/browser/stylesheets/genweb_organs.css
@@ -16,11 +16,8 @@ th.centerMiddle {
 .portaltype-genweb-organs-organgovern div.tab-pane.active,
 .portaltype-genweb-organs-sessio div.tab-pane.active,
 .portaltype-genweb-organs-acta div.tab-pane.active {
-    padding-top: 20px;
+    padding: 20px;
     background-color: #f0f0f0;
-    padding-left: 20px;
-    padding-bottom: 20px;
-    padding-right: 20px;
 }
 
 ul#tabs.nav.nav-tabs {
@@ -91,9 +88,7 @@ a.collapsed .icon-chevron-down{
     background-position: -456px -72px;
 }
 
-table th {
-    background-color: #F7F7F7!important;
-}
+
 
 .containerIcons {
     text-align: center;
@@ -824,10 +819,6 @@ padding: 0px 0px 32px 0px !important;
     top: 30px;
     z-index: 10;
 }
-.clickable-row:hover {
-    cursor: pointer;
-    ;
- }
 
 .ul-session span {
     float: right;
@@ -1939,3 +1930,115 @@ td.organevent.cal_has_events .popover-content a {
     right: 3px;
 }
 
+.calendari {
+    width: 100%;
+    text-align: center;
+    color: #4a4a4a;
+}
+
+.calendari th {
+    background-color: white;
+}
+
+.calendari th, .calendari td {
+    text-align: center;
+    height: 30px;
+    width: calc(100% / 7);
+}
+
+.portlet-calendari .cal_has_events {
+    border: 1px solid white;
+}
+
+.portlet-calendari .cal_has_events a {
+    color: #ffffff;
+    font-weight: bold;
+}
+
+.cal_has_events {
+    background-color: #384e65;
+    text-shadow: none;
+    cursor: pointer;
+}
+
+.cal_has_events:hover {
+    filter: brightness(80%);
+}
+
+.icons-ul {
+    list-style: none;
+    margin: 15px 0 0 0;
+    font-size: 14px;
+    margin-top: 0px;
+
+}
+
+.icons-ul li p {
+    font-weight: bold;
+}
+
+.icons-ul li {
+    border-bottom: 1px solid #eee;
+    line-height: 15px;
+    margin-bottom: 8px;
+    padding-bottom: 8px;
+    padding-top: 8px;
+    padding-left: 8px;
+    font-size: 14px;
+    border-left: 5px solid #007bc0;
+}
+
+.icons-ul .text2 {
+    font-size:13px;
+}
+
+.text2 a {
+    color: black;
+}
+
+.btn:hover {
+    filter: brightness(90%);
+}
+
+
+#calendari header {
+        border-bottom: 5px solid #007bc0;
+        display: flex;
+}
+
+.portlet-calendari .portlet-header {
+    display: flex;
+    min-height: 40px;
+}
+
+
+.portlet-calendari .calendari-anterior::before, .portlet-calendari .calendari-seguent::before {
+    content: "\f060";
+    font-size: 1.125rem;
+    font-family: "FontAwesome";
+    border-radius: 50%;
+    padding: 5px;
+    border: 1px solid transparent;
+}
+
+.portlet-calendari .calendari-anterior:hover::before, .portlet-calendari .calendari-seguent:hover::before {
+    border: 1px solid #01559B;
+    transition: .25s all ease;
+}
+
+.portlet-calendari h3 {
+    font-weight: 700;
+    font-size: 1.125rem;
+    text-align: center;
+    width: 100%;
+    margin: 2px;
+}
+
+a.calendari-anterior:hover,
+a.calendari-seguent:hover  {
+    text-decoration: none;
+}
+
+.portlet-calendari .calendari-seguent::before {
+    content: "\f061";
+}
diff --git a/genweb/organs/browser/stylesheets/print.css b/genweb/organs/browser/stylesheets/print.css
index 1768866f..4ef2cfd6 100644
--- a/genweb/organs/browser/stylesheets/print.css
+++ b/genweb/organs/browser/stylesheets/print.css
@@ -1,156 +1,165 @@
 @media print {
 
-  body {
-    width: 210mm; height: 297mm;
-    margin: 0mm 2mm 20mm 5mm;
-  }
+body {
+  width: 210mm; height: 297mm;
+  margin: 0mm 2mm 20mm 5mm;
+}
 
-  html, body {
-    font-size: 15pt!important;
-    font-family: Arial, Helvetica, sans-serif;
-    line-height: 130% !important;
-  }
+html, body {
+  font-size: 15pt!important;
+  font-family: Arial, Helvetica, sans-serif;
+  line-height: 130% !important;
+}
 
 li {
-    line-height: 130% !important;
-  }
+  line-height: 130% !important;
+}
 
-  #portal-header {
-    padding-bottom:50px;
-  }
+#portal-header {
+  padding-bottom:50px;
+}
 
-  .template-printacta header#portal-header {
-    display: none;
-  }
+.template-printacta header#portal-header {
+  display: none;
+}
 
 div.sessionCustomActions {display: none !important;}
 .sessionActions,
 #expandAll,
 #collapseAll,
 button.label.dropdown-toggle,
-button.remove.label.label-important {display: none !important;}
-
-  nav#portal-breadcrumbs,
-  .nav-collapse-eines,
-  #portal-personaltools-wrapper,
-  #portal-globalnav,
-  #portal-column-one,
-  .alert,
-  #edit-bar,
-  #viewlet-below-content-title,
-  #viewlet-above-content-title,
-  .header-image,
-  #cookies,
-  .extraInfo,
-  #commenting,
-  #viewlet-below-content > a,
-  input[type="submit"],
-  #content-core > button,
-  .linkNotificacions,
-  .btnActa,
-  #peu > div > div.row-fluid,
-  .reply-to-comment-button,
-  .bannerOrgans {
-    display: none !important;
-  }
-
-  #portal-column-content {
-      margin:0 !important;
-      width:100% !important;
-  }
-
-  #peu .span8 {
-      width:100% !important;
-  }
-
-  div.pageBreak {
-      page-break-before: always !important;
-  }
-
-  #portal-breadcrumbs {
-    display: inline !important;
-  }
+button.remove.label.label-important {
+  display: none !important;
+}
+
+nav#portal-breadcrumbs,
+.nav-collapse-eines,
+#portal-personaltools-wrapper,
+#portal-globalnav,
+#portal-column-one,
+.alert,
+#edit-bar,
+#viewlet-below-content-title,
+#viewlet-above-content-title,
+.header-image,
+#cookies,
+.extraInfo,
+#commenting,
+#viewlet-below-content > a,
+input[type="submit"],
+#content-core > button,
+.linkNotificacions,
+.btnActa,
+#peu > div > div.row-fluid,
+.reply-to-comment-button,
+.bannerOrgans {
+  display: none !important;
+}
+
+#portal-column-content {
+  margin:0 !important;
+  width:100% !important;
+}
+
+#peu .span8 {
+  width:100% !important;
+}
+
+div.pageBreak {
+    page-break-before: always !important;
+}
+
+#portal-breadcrumbs {
+  display: inline !important;
+}
 
 /*    #content a:link:after,
   #content a:visited:after {
      content: " [" attr() "] " !important;
   }*/
 
-  a:hover {
-    text-decoration:none;
-  }
-
-  a {
-    text-decoration:underline;
-    color: black;
-  }
-
-  .plain a {
-    color:#555555;
-    font-family: Arial, Helvetica, sans-serif;
-    font-size: 12pt;
-  }
-
-  h1, h2, h3 {
-    color: #557C95;
-    margin-top: 27px;
-  }
-
-  h1 {
-    font-size: 24pt;
-  }
-
-  h1 > span{
-    color: #557C95;
-  }
-
-  h2 {
-    margin-bottom: 20px !important;
-    font-size: 20pt;
-  }
-
-  h3 {
-    font-family: Arial, Helvetica, sans-serif;
-    font-size: 18pt;
-  }
-
-  h4 {
-    font-size:15pt !important;
-  }
-
-  .caixa {
-    width: 9cm;
-    vertical-align: top;
-  }
-
-  table {
-    font-size: 15pt !important;
-    line-height: 120% !important;
-  }
-
-  h1.h1Print {
-    text-align: left;
-    font-size: 24pt;
-  }
-
-  .h4Print {color: #557C95; }
-
-  tbody > tr {
-    height: auto!important;
-  }
-
-  header#portal-header,
-  footer#peu {
-    border: 0px;
-  }
-
-  section#content-area {
-    margin-top: 0px;
-  }
-
-  tbody {
-    font-size: 15pt !important;
-    font-family: Arial, Helvetica, sans-serif !important;
-    line-height: 130% !important;}
+a:hover {
+  text-decoration:none;
+}
+
+a {
+  text-decoration:underline;
+  color: black;
+}
+
+.plain a {
+  color:#555555;
+  font-family: Arial, Helvetica, sans-serif;
+  font-size: 12pt;
+}
+
+h1, h2, h3 {
+  color: #557C95;
+  margin-top: 27px;
+}
+
+h1 {
+  font-size: 24pt;
+}
+
+h1 > span{
+  color: #557C95;
+}
+
+h2 {
+  margin-bottom: 20px !important;
+  font-size: 20pt;
+}
+
+h3 {
+  font-family: Arial, Helvetica, sans-serif;
+  font-size: 18pt;
+}
+
+h4 {
+  font-size:15pt !important;
+}
+
+.caixa {
+  width: 9cm;
+  vertical-align: top;
+}
+
+table {
+  font-size: 15pt !important;
+  line-height: 120% !important;
+}
+
+h1.h1Print {
+  text-align: left;
+  font-size: 24pt;
+}
+
+.h4Print {
+  color: #557C95;
+}
+
+tbody > tr {
+  height: auto!important;
+}
+
+header#portal-header,
+footer#peu {
+  border: 0px;
+}
+
+section#content-area {
+  margin-top: 0px;
+}
+
+tbody {
+  font-size: 15pt !important;
+  font-family: Arial, Helvetica, sans-serif !important;
+  line-height: 130% !important;
+}
+
+.h2butlleti {
+    line-height: inherit;
+}
 
 }
diff --git a/genweb/organs/browser/utils.py b/genweb/organs/browser/utils.py
index 956e3186..cd8967d8 100644
--- a/genweb/organs/browser/utils.py
+++ b/genweb/organs/browser/utils.py
@@ -315,3 +315,25 @@ def render(self):
         <br/>usage: /movefilestoprivateorpublic?  <b><a href="?showfiles">showfiles</a></b>\
          | <b><a href="?move2Private">move2Private</a></b> \
          | <b><a href="?move2Public">move2Public</a></b>'
+
+
+class showColorOrgans(grok.View):
+
+    grok.context(IDexterityContent)
+    grok.name('showColorOrgans')
+    grok.require('cmf.ManagePortal')
+    grok.layer(IGenwebOrgansLayer)
+
+    def render(self):
+        path = '/'.join(self.context.getPhysicalPath())
+        all_brains = api.content.find(portal_type='genweb.organs.organgovern', path=path)
+        results = []
+        for brain in all_brains:
+            obj = brain.getObject()
+            element = {
+                'color': obj.eventsColor,
+                'path': obj.absolute_url() + '/edit'
+            }
+
+            results.append(element)
+        return json.dumps(results, indent=2, sort_keys=True)
diff --git a/genweb/organs/browser/views/butlleti.pt b/genweb/organs/browser/views/butlleti.pt
index 1c3d568b..bfbf9505 100644
--- a/genweb/organs/browser/views/butlleti.pt
+++ b/genweb/organs/browser/views/butlleti.pt
@@ -77,7 +77,7 @@
             <span tal:content="view/getUnitat"></span> -
             <span tal:content="view/getOrganTitle">Butlletin Session Title</span>
           </h1>
-          <h2 tal:content="view/getTitle">Butlletin Session Title</h2>
+          <h2 tal:content="view/getTitle" class="h2butlleti">Butlletin Session Title</h2>
         </td>
         <td style="width:20%; vertical-align: top;">
           <h1>
@@ -93,7 +93,7 @@
             <span tal:content="view/getUnitat"></span> -
             <span tal:content="view/getOrganTitle">Butlletin Session Title</span>
           </h1>
-          <h2 tal:content="view/getTitle">Butlletin Session Title</h2>
+          <h2 tal:content="view/getTitle" class="h2butlleti">Butlletin Session Title</h2>
         </td>
       </tr>
     </table>
diff --git a/genweb/organs/content/templates/organgovern_view.pt b/genweb/organs/content/templates/organgovern_view.pt
index df33b035..418ea763 100644
--- a/genweb/organs/content/templates/organgovern_view.pt
+++ b/genweb/organs/content/templates/organgovern_view.pt
@@ -55,7 +55,7 @@
       <li tal:condition="actes"><a href="#actasTab" data-toggle="tab">
         <i class="fa fa-file-text-o" aria-hidden="True">&nbsp;<tal:omit-tag i18n:translate="">Actes</tal:omit-tag></i></a></li>
     </ul>
-    
+
     <div id="organTabs" class="tab-content" >
       <div class="tab-pane active" id="sessionsTab" tal:condition="sessions">
         <table class="table table-bordered table-condensed table-hover logFont">
@@ -76,11 +76,11 @@
             </tr>
           </thead>
           <tal:objects repeat="item sessions">
-            <tr class="clickable-row" tal:attributes="data-href item/absolute_url;">
+            <tr>
               <td style="vertical-align: middle;">
                   <i class="fa fa-list" aria-hidden="True">&nbsp;
-                  <span tal:content="item/title" style="color:#007BC0; font-size: 13px;"> Item Title </span>
-                  [<span tal:content="item/sessionNumber" style="font-size: 11px;">
+                  <a tal:attributes="href item/absolute_url;" tal:content="item/title" style="color:#007BC0; font-size: 14px;"> Item Title </a>
+                  [<span tal:content="item/sessionNumber" style="font-size: 13px;">
                           Session Number
                   </span>]
               </td>
@@ -160,19 +160,19 @@
             </thead>
             <tbody>
               <tal:documents repeat="item acords">
-                <tr class="clickable-row" tal:attributes="data-href item/absolute_url;">
-                  <td>
+                <tr>
+                  <td style="vertical-align: middle;">
                     <i class="fa fa-check" aria-hidden="True">&nbsp;
-                    <span tal:content="item/title" style="color: #007BC0; font-size: 13px;">
+                    <a tal:attributes="href item/absolute_url;" tal:content="item/title" style="color: #007BC0; font-size: 14px;">
                             Item Title
-                    </span>
+                    </a>
                   </td>
-                  <td style="text-align: center;">
+                  <td style="text-align: center; vertical-align: middle;">
                     <span tal:content="item/agreement">
                         Numero Acord
                     </span>
                   </td>
-                    <td style="text-align:center; min-width: 100px;">
+                    <td style="text-align:center; min-width: 100px; vertical-align: middle;">
                       <span class="estatpunt">
                         <i class="fa fa-circle boletaGran" aria-hidden="true" tal:attributes="style string:color:${item/color};"></i>&nbsp;<span tal:content="item/estatsLlista"></span>
                       </span>
@@ -188,23 +188,22 @@
           <table class="table table-bordered table-condensed table-hover logFont">
             <thead>
               <tr>
-                <th style="text-align: center;">
+                <th style="text-align: center; vertical-align: middle;">
                    <tal:data i18n:translate="">Titol</tal:data>
                  </th>
-                <th style="text-align: center;">
+                <th style="text-align: center; vertical-align: middle;">
                   <tal:data i18n:translate="">Data</tal:data>
                 </th>
               </tr>
             </thead>
             <tbody>
               <tal:documents repeat="item actes">
-                <tr tal:define="data item/data|nothing" class="clickable-row"
-                    tal:attributes="data-href item/absolute_url;">
+                <tr tal:define="data item/data|nothing">
                   <td>
                     <i class="fa fa-file-text-o" aria-hidden="true"></i>&nbsp;
-                    <span tal:content="item/title" style="color: #007BC0; font-size: 13px;">
+                    <a tal:Attributes="href item/absolute_url;" tal:content="item/title" style="color: #007BC0; font-size: 14px;">
                         Item Title
-                    </span>
+                    </a>
                   </td>
                   <td style="text-align: center;">
                     <tal:block tal:condition="data">
@@ -222,12 +221,6 @@
     </div>
   </div>
 
-<script type="text/javascript">
-    $(".clickable-row").click(function() {
-        window.location = $(this).data("href");
-    });
-</script>
-
 </metal:content-core>
 
 </body>
diff --git a/genweb/organs/content/templates/sessio_view.pt b/genweb/organs/content/templates/sessio_view.pt
index fe2f1d75..8704b6fe 100644
--- a/genweb/organs/content/templates/sessio_view.pt
+++ b/genweb/organs/content/templates/sessio_view.pt
@@ -300,20 +300,20 @@
               <tbody>
                 <tal:documents repeat="item acords">
                   <tr>
-                    <td>
+                    <td style="vertical-align: middle;">
                       <i class="fa fa-check" aria-hidden="true"></i>
                       <a href="#"
-                             tal:attributes="href item/absolute_url;"
-                             tal:content="item/title">
+                         tal:attributes="href item/absolute_url;"
+                         tal:content="item/title">
                               Item Title
                       </a>
                     </td>
-                    <td style="text-align:center;">
+                    <td style="text-align:center; vertical-align: middle;">
                       <span tal:content="item/agreement">
                           Numero Acord
                       </span>
                     </td>
-                    <td style="text-align:center; min-width: 100px;">
+                    <td style="text-align:center; min-width: 100px; vertical-align: middle;">
                       <span class="estatpunt">
                         <i class="fa fa-circle boletaGran" aria-hidden="true" tal:attributes="style string:color:${item/color};"></i>&nbsp;<span tal:content="item/estatsLlista"></span>
                       </span>
diff --git a/genweb/organs/portlets/portlet_calendar.pt b/genweb/organs/portlets/portlet_calendar.pt
index edaeb764..8b3958cc 100644
--- a/genweb/organs/portlets/portlet_calendar.pt
+++ b/genweb/organs/portlets/portlet_calendar.pt
@@ -1,50 +1,37 @@
-<div class="portlet portletCalendar">
-  <div class="osomcorner-wrapper"><div class="osomcorner"></div></div>
+<div id="calendari" class="portlet portlet-calendari portletCalendar"  tal:define="year view/year;" i18n:domain="plone">
 
-  <div id="calendari" class="portletCalendar"
-       i18n:domain="plone">
+  <div>
 
-    <div class="portletHeader">
-      <h2 class="align-center">
-        <a href="#" rel="nofollow"
-             class="pull-left calendarPrevious"
-             title="Previous month"
-             tal:define="prev_month view/prev_month;
-                         prev_year view/prev_year"
-             tal:attributes="href view/prev_query;
-                             data-year prev_year;
-                             data-month prev_month;"
-             i18n:attributes="title title_previous_month;">
-            <i class="fa fa-chevron-left"></i></a>
-        <span i18n:translate="" tal:omit-tag="">
-          <span i18n:name="monthname" i18n:translate=""
-                tal:content="view/month_name"
-                tal:omit-tag="">monthname</span>
-          <span i18n:name="year" i18n:translate=""
-                tal:content="view/year"
-                tal:omit-tag="">year</span>
-        </span>
 
-        <a href="#" rel="nofollow"
-           class="pull-right calendarNext"
-           title="Next month"
-           tal:define="next_month view/next_month;
-                       next_year view/next_year"
-           tal:attributes="href view/next_query;
-                           data-year next_year;
-                           data-month next_month;"
-           i18n:attributes="title title_next_month;">
-        <i class="fa fa-chevron-right"></i>
-        </a>
-      </h2>
-    </div>
+           <header class="portlet-header">
+             <a href="#" rel="nofollow" class="calendari-anterior" title="Previous month"
+                tal:define="prev_month view/prev_month; prev_year view/prev_year; "
+                tal:attributes="href view/prev_query; data-year prev_year; data-month prev_month;"
+                i18n:attributes="title title_previous_month;"></a>
+             <h3>
+                <span i18n:translate="" tal:omit-tag="">
+                   <span i18n:name="monthname" i18n:translate="" tal:content="view/month_name" tal:omit-tag="">monthname</span>
+                </span>
+                <span i18n:translate="" tal:omit-tag="">
+                   <span i18n:name="year" i18n:translate="" tal:content="year" tal:omit-tag="">year</span>
+                </span>
+             </h3>
+             <a href="#" rel="nofollow" class="calendari-seguent" title="Next month"
+                tal:define="next_month view/next_month; next_year view/next_year"
+                tal:attributes="href view/next_query; data-year next_year; data-month next_month; "
+                i18n:attributes="title title_next_month;"></a>
+           </header>
+
+    <article class="portlet-content">
     <div class="pad">
-      <table class="ploneCalendar" summary="Calendar"
+      <table class="calendari" summary="Calendar"
           i18n:attributes="summary summary_calendar">
         <thead>
-          <tr class="weekdays"><tal:data repeat="weekday view/weekdays">
-            <th scope="col" i18n:translate="" tal:content="weekday">Su</th>
-          </tal:data></tr>
+          <tr class="weekdays">
+            <tal:data repeat="weekday view/weekdays">
+              <th scope="col" i18n:translate="" tal:content="weekday">Su</th>
+            </tal:data>
+          </tr>
         </thead>
         <tbody>
           <tr tal:repeat="week view/cal_data">
@@ -55,27 +42,100 @@
                             events day/events;
                             classtag python:view.getclasstag_event(day);
                             limit python:len(events) if events is not None else 0"
-                  tal:attributes="class python:u'ulearnevent%s%s%s%s%s' %
+                  tal:attributes="class python:u'%s%s%s%s%s' %
                             ((today and ' today' or ''),
                             (next_month and ' cal_next_month' or ''),
                             (prev_month and ' cal_prev_month' or ''),
                             (events and ' cal_has_events' or ''),
                             (classtag or ''));
-                            style string:background-color:${day/color}">
-                  <a href=""
-                    rel="popover" data-placement="bottom" data-html="True"
-                    tal:omit-tag="not:events"
-                    tal:attributes="href python:view.date_events_url(day['date_string']);
-                                    data-content day/events_string;"
-                    tal:content="day/day">31</a>
-
-              </td>
-            </tal:block>
-          </tr>
+                            style string:background-color:${day/color};
+                            data-year day/year; data-month day/month; data-day day/day;">
+                  <a tal:omit-tag="not:events" tal:content="day/day">31</a>
+                </td>
+              </tal:block>
+            </tr>
         </tbody>
       </table>
     </div>
+  </article>
+    <ul class="icons-ul">
+      <tal:block tal:repeat="events view/getDayEventsGroup">
+        <li tal:attributes="class string:${events/community_type} text">
+          <p tal:repeat="event events/events">
+            <a tal:attributes="href event/getURL">
+              <tal:event content="event/start"> 07/12 </tal:event>
+              <span tal:condition="event/end">
+                <span i18n:translate=""> to </span>
+                <tal:event content="event/end"> 07/12 </tal:event>
+              </span>
+              - <tal:event content="event/Title"> Event Title </tal:event>
+            </a>
+          </p>
+          <div class="clearfix"></div>
+          <span class="text2">
+            <i class="fa fa-thumb-tack"></i>
+            <a tal:attributes="href events/community_url" tal:content="events/community_name"></a>
+          </span>
+        </li>
+      </tal:block>
+    </ul>
 
   </div>
 
 </div>
+
+
+<script type="text/javascript">
+$(document).ready(function () {
+
+    // javascript per al canvi de mes al portlet de calendari
+    rebind_portlet_calendar();
+
+    function load_portlet_calendar(event, elem) {
+        // depends on plone_javascript_variables.js for portal_url
+        event.preventDefault();
+        var pw = elem.closest('.portletWrapper');
+        var elem_data = elem.data();
+        var portlethash = pw.attr('id');
+        portlethash = portlethash.substring(15, portlethash.length);
+        url = portal_url + '/@@render-portlet?portlethash=' + portlethash +
+                '&community=' + elem_data.community +
+                '&year=' + elem_data.year +
+                '&month=' + elem_data.month;
+        if(elem_data.day){
+          url += '&day=' + elem_data.day;
+        }
+        if(elem_data.community_path){
+          url += '&community_path=' + elem_data.community_path;
+        }
+        $.ajax({
+            url: url,
+            success: function (data) {
+                pw.html(data);
+                rebind_portlet_calendar();
+            }
+        });
+    }
+
+    function rebind_portlet_calendar() {
+        // ajaxify each portletCalendar
+        $('.portletCalendar a.calendari-seguent').click(function (event) {
+            load_portlet_calendar(event, $(this));
+        });
+        $('.portletCalendar a.calendari-anterior').click(function (event) {
+            load_portlet_calendar(event, $(this));
+        });
+        $('.portletCalendar .cal_has_events').click(function (event) {
+            load_portlet_calendar(event, $(this));
+        });
+        $('#box_agenda #day').click(function (event) {
+            load_portlet_calendar(event, $(this));
+        });
+        $('.portletCalendar dd a[title]').tooltip({
+            offset: [-10, 0],
+            tipClass: 'pae_calendar_tooltip'
+        });
+    }
+
+}); //ready
+</script>
diff --git a/genweb/organs/portlets/portlet_calendar.py b/genweb/organs/portlets/portlet_calendar.py
index 7e0a4ea8..88092a71 100644
--- a/genweb/organs/portlets/portlet_calendar.py
+++ b/genweb/organs/portlets/portlet_calendar.py
@@ -17,8 +17,14 @@
 from zope.formlib import form
 from zope.i18nmessageid import MessageFactory
 from zope.interface import implements
+from datetime import datetime
+from plone.app.event.base import localized_now
+from plone.event.interfaces import IEvent
+from datetime import timedelta
+
 
 import calendar
+import itertools
 
 
 PLMF = MessageFactory('plonelocales')
@@ -154,6 +160,122 @@ def getclasstag_event(self, day):
                 classtag += ' event-multiple '
         return classtag
 
+    def getDateEvents(self):
+        formatDate = "%Y-%m-%d"
+        if 'day' in self.request.form:
+            date = '{}-{}-{}'.format(self.request.form['year'], self.request.form['month'], self.request.form['day'])
+        else:
+            date = datetime.today().strftime(formatDate)
+        dateEvent = datetime.strptime(date, formatDate)
+        return dateEvent
+
+    def getNextThreeEvents(self):
+        context = aq_inner(self.context)
+        query_kw = {}
+        # if self.search_base:
+        #     portal = getToolByName(context, 'portal_url').getPortalObject()
+        #     query_kw['path'] = {'query': '%s%s' % (
+        #         '/'.join(portal.getPhysicalPath()), self.search_base)}
+
+        # if self.state:
+        #     query_kw['review_state'] = self.state
+
+        events = get_events(context, ret_mode=RET_MODE_OBJECTS, expand=True, **query_kw)
+        events = self.filterNextEvents(events)
+        events = self.filterOccurrenceEvents(events)
+
+        list_events = []
+        for event in events[:3]:
+            list_events.append(self.getEventCalendarDict(event))
+
+        return list_events
+
+    def getEventCalendarDict(self, event):
+        start = event.start.strftime('%d/%m')
+        searchStart = event.start.strftime('%m/%s')
+        end = event.end.strftime('%d/%m')
+        end = None if end == start else end
+        return dict(Title=event.title,
+                    getURL=event.absolute_url(),
+                    start=start,
+                    searchStart=searchStart,
+                    end=end,
+                    community_type='event.community_type',
+                    community_name=event.aq_parent.aq_parent.title,
+                    community_url=event.aq_parent.aq_parent.absolute_url())
+
+    def filterOccurrenceEvents(self, events):
+        filter_events = []
+        for event in events:
+            if not IEvent.providedBy(event):
+                ocurrence = event
+                event = event.aq_parent
+                if event not in filter_events:
+                    event.ocstart = ocurrence.start
+                    event.ocend = ocurrence.end
+                    filter_events.append(event)
+            else:
+                filter_events.append(event)
+
+        return filter_events
+
+    def filterNextEvents(self, events):
+        filter_events = []
+        for event in events:
+            if event.end > localized_now():
+                filter_events.append(event)
+        return filter_events
+
+    def getDayEventsGroup(self):
+        group_events = []
+        if 'day' not in self.request.form and 'month' in self.request.form:
+            return None
+
+        if 'day' not in self.request.form and 'month' not in self.request.form:
+            list_events = self.getNextThreeEvents()
+        else:
+            list_events = self.getDayEvents(self.getDateEvents())
+
+        if len(list_events):
+            list_events = sorted(list_events, key=lambda x: x['community_name'])
+            for key, group in itertools.groupby(list_events, key=lambda x: x['community_name']):
+                events = [event for event in group]
+                events = sorted(events, key=lambda x: (x['searchStart'], x['Title']))
+                group_events.append(dict(Title=key,
+                                         getURL=events[0]['getURL'],
+                                         community_url=events[0]['community_url'],
+                                         community_type=events[0]['community_type'],
+                                         community_name=events[0]['community_name'],
+                                         num_events=len(events),
+                                         events=events))
+            return group_events
+        else:
+            return None
+
+    def getDayEvents(self, date):
+        events = self.getCalendarDict()
+        list_events = []
+        if date.strftime('%Y-%m-%d') in events:
+            events = self.filterOccurrenceEvents(events[date.strftime('%Y-%m-%d')])
+            for event in events:
+                list_events.append(self.getEventCalendarDict(event))
+        return list_events
+
+    def getCalendarDict(self):
+        context = aq_inner(self.context)
+        year, month = self.year_month_display()
+        monthdates = [dat for dat in self.cal.itermonthdates(year, month)]
+
+        query_kw = {}
+        start = monthdates[0]
+        end = monthdates[-1]
+        events = get_events(context,
+                            start=start - timedelta(days=30),
+                            end=end,
+                            ret_mode=RET_MODE_OBJECTS,
+                            expand=True, **query_kw)
+        return construct_calendar(events, start=start, end=end)
+
     @property
     def cal_data(self):
         """Calendar iterator over weeks and days of the month to display.
@@ -212,6 +334,8 @@ def cal_data(self):
             caldata[-1].append(
                 {'date': dat,
                  'day': dat.day,
+                 'month': dat.month,
+                 'year': dat.year,
                  'prev_month': dat.month < month,
                  'next_month': dat.month > month,
                  'color': color,