diff --git a/src/noosfero-spb/noosfero-spb-theme/css/administration-panel.css b/src/noosfero-spb/noosfero-spb-theme/css/administration-panel.css
index 558ffaf..db1d4fc 100644
--- a/src/noosfero-spb/noosfero-spb-theme/css/administration-panel.css
+++ b/src/noosfero-spb/noosfero-spb-theme/css/administration-panel.css
@@ -57,11 +57,13 @@
 }
 
 .action-organizations-index .main-block form#manage-profiles .search-field{
-  margin-bottom: 30px;
+  margin-bottom: 20px;
+  display: block;
+  height: 30px;
 }
 
 .action-organizations-index .main-block form#manage-profiles .search-field .formfield {
-  width: 100%;
+  width: 60%;
   margin-right: 0.5em;
   float: left;
 }
@@ -80,13 +82,14 @@
 
 .action-organizations-index .main-block form#manage-profiles input.button.submit{
   height: 32px;
-  margin-top: 8px;
+  float: left;
+  margin-left: 10px;
   padding: 5px 15px;
   background: #3E67B1 none;
   color: #FFF;
   border-radius: 4px;
   border: 1px solid #3E67B1;
-  line-height: 22px;
+  line-height: 14px;
   font-size: 14px;
   text-transform: uppercase;
 }
@@ -107,6 +110,10 @@
   padding: 2px 8px;
 }
 
+.action-organizations-index .main-block  table#organizations-list td{
+  padding: 8px 8px 0;
+}
+
 /*** Features Settings ***/
 
 .controller-features #content form *{
@@ -135,6 +142,98 @@
   font-size: 15px;
 }
 
+/* Manage Users */
+.action-users-index .main-block #search-users{
+  background-color: transparent;
+}
+
+.action-users-index .main-block #search-users .search-field{
+  margin-bottom: 20px;
+  display: block;
+  height: 30px;
+}
+
+.action-users-index .main-block #search-users .search-field .formfield {
+  width: 70%;
+  margin-right: 0.5em;
+  float: left;
+}
+
+.action-users-index .main-block #search-users .search-field .formfield input {
+  margin-top: 0px;
+  margin-right: 0.5em;
+  padding: 6px;
+  min-width: 97%;
+  height: 19px;
+  max-height: 19px;
+  background: none;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+}
+
+.action-users-index .main-block #search-users input.button.submit{
+  height: 32px;
+  float: left;
+  margin-left: 10px;
+  padding: 5px 15px;
+  background: #3E67B1 none;
+  color: #FFF;
+  border-radius: 4px;
+  border: 1px solid #3E67B1;
+  line-height: 14px;
+  font-size: 14px;
+  text-transform: uppercase;
+}
+
+.action-users-index .main-block #search-users input.button.submit:hover{
+  background: #5E82C6;
+}
+
+.action-users-index .main-block #users-list th{
+  text-align: left;
+  vertical-align: middle;
+  padding: 2px 8px;
+}
+
+.action-users-index .main-block #users-list td{
+  padding: 8px 8px 0;
+}
+
+/* Manage Roles */
+.action-role-index .main-block th{
+  text-align: left;
+  vertical-align: middle;
+  padding: 2px 8px;
+}
+
+.action-role-index .main-block td{
+  padding: 8px 8px 0;
+}
+
+.action-role-edit #content form input.button.with-text{
+  height: 30px;
+  padding: 5px 15px;
+  background: #FFF none;
+  color: #3E67B1;
+  border-radius: 4px;
+  border: 1px solid #3E67B1;
+  font-size: 14px;
+  line-height: 14px;
+}
+
+/* Manage template */
+
+.action-templates-index #content .template-kind th{
+  text-align: left;
+  vertical-align: middle;
+  padding: 2px 8px;
+}
+
+.action-templates-index #content .template-kind td{
+  padding: 8px 8px 0;
+}
+
+
 /*** Community Admin pages ***/
 /* Homepage */
 .action-profile_editor-index #profile-editor-index h1.block-title{
@@ -157,3 +256,74 @@
   border: none;
   background: none;
 }
+
+/* Tasks - tmp adjust */
+.action-profile_editor-index #content .pending-tasks{
+  max-width: 500px;
+  padding: 15px 20px;
+  margin: 20px 0 30px 0;
+  border: 1px dotted #ccc;
+  border-left: 5px solid #FF0366;
+  border-radius: 3px;
+  display: block;
+  background: #fff;
+  line-height: 20px;
+  font-size: 13px;
+}
+
+.action-profile_editor-index #content .pending-tasks .button.icon-todo.with-text{
+  background: #3E67B1;
+  color: #FFF;
+}
+
+.action-profile_editor-index #content .pending-tasks .button.icon-todo.with-text:hover{
+  background: #5E82C6;
+}
+
+/* Edit software page */
+
+.action-profile_editor-edit_software_community #profile-is-template{
+  margin-top: 10px;
+}
+
+.action-profile_editor-edit_software_community .field-privacy-selector{
+  vertical-align: bottom;
+}
+
+/*Edition configuration profile */
+
+.action-profile_editor-edit #delete-profile{
+  margin-top:0px;
+}
+
+/*form Change Password */
+.action-account-change_password #content form input.button.with-text.icon-ok.submit{
+  height: 32px;
+  padding:0px 10px;
+}
+
+.action-account-change_password input{
+padding: 6px;
+color: #585858;
+background: #FFF;
+border: 1px solid #ccc;
+border-radius: 4px;
+font-size: 15px;
+font-family: Arial, helvetica;
+}
+
+/* Members management */
+.action-profile_members-index #members-list td{
+  padding-top: 5px; 
+}
+
+/*recover behavior of noosfero*/
+.action-profile_members-change_role .role-permissions{
+  margin: 12px 0;
+  padding-left: 40px;
+}
+
+/*recover behavior of noosfero*/
+.action-profile_members-change_role .role-permissions li{
+  list-style: square;
+}
diff --git a/src/noosfero-spb/noosfero-spb-theme/css/community-pages.css b/src/noosfero-spb/noosfero-spb-theme/css/community-pages.css
index a866f4b..2bb770b 100644
--- a/src/noosfero-spb/noosfero-spb-theme/css/community-pages.css
+++ b/src/noosfero-spb/noosfero-spb-theme/css/community-pages.css
@@ -171,6 +171,21 @@
   font-weight: 300;
 }
 
+/*tabs painel-admin*/
+.action-admin_panel-site_info .ui-tabs .ui-tabs-nav li{
+  white-space: normal;
+  word-wrap:break-word;
+}
+
+.action-admin_panel-site_info .ui-tabs .ui-tabs-nav .ui-tabs-anchor{
+  text-align: center;
+  width: 11.2em;
+  height: 2.5em;
+  max-height: 2.5em;
+  overflow: hidden;
+  line-height: 16px;
+}
+
 /* Community's area tabs */
 
 #content #discussions-content{
@@ -209,7 +224,7 @@
 }
 
 #discussions-content .quiet{
-  line-height: 21px;
+  margin-bottom: 10px;
 }
 
 #discussions-content div.quiet:last-child{
@@ -256,17 +271,22 @@
 }
 
 #content #discussions-content .subject{
-  font-weight: 800;
+  font-weight: 700;
   font-size: 16px
 }
 
-#repository-feed-tab .event-inline.event-item{
+/*Respository tabs*/
+
+#repository-feed-tab .event-inline.event-item,
+#repository-feed-tab .event-block.event-item{
   border-bottom: 1px solid #ECEDF1;
   margin-top:30px;
-  padding: 0px 0px 80px 0px;
+  padding: 0px 0px 30px 0px;
+  min-height: 50px;
 }
 
-#repository-feed-tab .event-inline.event-item img{
+#repository-feed-tab .event-inline.event-item img,
+#repository-feed-tab .event-block.event-item img{
   display: none;
 }
 
@@ -274,11 +294,12 @@
   border-right: 1px dotted #D3D6DE;
   float:left;
   width: 112px;
-  height: 55px;
+  height: 58px;
   margin-right: 20px;
 }
 #repository-feed-tab .event-item-timestamp .time_ago{
   color:#172738;
+  font-family: arial;
 }
 
 #repository-feed-tab .event-item-timestamp .time_ago:before{
@@ -289,11 +310,12 @@
 }
 
 #repository-feed-tab .event-title{
-  max-height: 55px;
+  /*max-height: 55px;
   overflow: hidden;
   float:left;
-  width: 70%;
+  width: 70%;*/
   font-size: 16px;
+  font-family: arial, Helvetica;
 }
 
 #content #repository-feed-tab .author_name{
@@ -306,6 +328,25 @@
   color:#3E67B1;
 }
 
+#content #repository-feed-tab .project-name{
+  overflow: hidden;
+  height: 55px;
+}
+
+#repository-feed-tab .event-item .event-body .event-note{
+  font-size: 16px;
+  white-space: nowrap;
+  width: 400px;
+  overflow-x:hidden;
+  text-overflow:ellipsis;
+}
+
+#repository-feed-tab .event-item .event_commits,
+#repository-feed-tab .event-item .event-body .event-note .md,
+#repository-feed-tab .event-body img {
+  display: none;
+}
+
 #repository-feed-tab .see-more-repository{
   text-align: right;
   display: block;
@@ -340,6 +381,10 @@
 
 /* Blog tab*/
 
+#content #blog-tab .software-blog-post-empty{
+  margin-top: 30px;
+}
+
 #content #blog-tab .blog-posts{
   margin-top:15px;
 }
@@ -369,6 +414,7 @@
   background: center/cover no-repeat;
   float: left;
 }
+
 #content #blog-tab .blog .blog-post .publishing-info {
   border-top: none;
   color: #172838;
@@ -379,11 +425,13 @@
   display:inline;
   text-align: left;
 }
+
 #content #blog-tab .blog .blog-post .publishing-info .date {
   margin: 0px 0px 5px 0px;
-  display: table-cell;
+  display: block;
   font-size: 11px;
 }
+
 #content #blog-tab .blog .blog-post .author {
   display: none;
 }
@@ -463,7 +511,7 @@ float: left;
 
 /* Software Tab Data - Need to develop solution - Only display on profile page */
 
-.profile-type-is-community #content .software-tab-data-block{
+#content .software-tab-data-block{
   display: none;
 }
 
@@ -475,25 +523,31 @@ float: left;
 /*** Right bar ***/
 
 .template-default.profile-type-is-community .action-profile-index #content .box-3 .link-list-block,
-.template-lefttopright.profile-type-is-community .action-profile-index #content .box-2 .link-list-block
+.template-lefttopright.profile-type-is-community .action-profile-index #content .box-2 .link-list-block{
   display: none;
 }
 
 /*Block with Community information - Need to develop solution - Only display on profile page */
 
-.profile-type-is-community .community-block{
+.profile-type-is-community .block.community-block{
   display: none;
 }
 
-.profile-type-is-community .action-profile_design-index #content .community-block,
-.profile-type-is-community .action-profile-index #content .community-block{
+.profile-type-is-community .action-profile_design-index #content .block.community-block,
+.profile-type-is-community .action-profile-index #content .block.community-block{
   display: block;
+  margin-left: 10px;
   border: 1px solid #ECEDF1;
   border-radius: 4px;
 }
 
 .profile-type-is-community  #content .community-block-logo{
   border-bottom: 3px solid #3E67B1;
+  padding: 10px;
+  height: 100px;
+  width: 165px;
+  display: table-cell;
+  vertical-align: middle;
 }
 
 .profile-type-is-community  #content .community-block-title{
@@ -509,24 +563,20 @@ float: left;
   line-height: 20px;
 }
 
-.profile-type-is-community  #content .community-block-logo{
-  padding: 10px;
-}
-
-.profile-type-is-community  #content .community-block-logo img.logo{
-  height: auto;
-  width: 100px;
-  min-width: 100px;
-  max-width: 170px;
-}
-
 .profile-type-is-community  #content .community-block-logo a{
   display: block;
-  height: 100px;
+  height: auto;
   overflow: hidden;
   text-align: center;
 }
 
+.profile-type-is-community  #content .community-block-logo img.logo{
+  height: auto;
+  width: auto;
+  max-width: 160px;
+  max-height: 100px;
+}
+
 /* Wiki block - Need to develop solution - Only display on profile page */
 .template-default #content .box-3 .wiki-block,
 .template-lefttopright #content .box-2 .wiki-block{
@@ -550,6 +600,7 @@ float: left;
 
 .profile-type-is-community #content .members-block{
   display: none;
+  margin-left: 10px;
   border: 1px solid #D3D6DE;
   border-radius: 4px;
 }
@@ -621,6 +672,7 @@ float: left;
   /*height: 70px;*/
   height: 100px;
   max-height: 100px;
+  margin: 0;
 }
 
 .profile-type-is-community #content .members-block .menu-submenu{
@@ -663,18 +715,20 @@ float: left;
 }
 
 .profile-type-is-community #content  .members-block .common-profile-list-block li{
-  margin: 0px !important;
+  margin: 0px;
 }
 
 .profile-type-is-community #content .members-block .common-profile-list-block .vcard .menu-submenu-trigger{
   display: block;
-  height: 13px;
-  top: 2px;
-  left: 3px;
+  height: 16px;
+  top: 3px;
+  left: 4px;
+  padding-top: 0px;
   padding-bottom: 0px;
+  margin: 0;
   background: #172738;
-  border: 1px solid #fff;
-  opacity: 0.7;
+  border: none;
+  border-radius: 4px;
 }
 
 .profile-type-is-community #content .members-block .common-profile-list-block .vcard .menu-submenu-trigger::before{
@@ -682,7 +736,7 @@ float: left;
   color: #fff;
   font-family: FontAwesome;
   font-size: 8px;
-  line-height: 11px;
+  line-height: 16px;
 }
 
 .profile-type-is-community #content .members-block .common-profile-list-block .fn {
@@ -708,9 +762,13 @@ float: left;
 }
 
 .profile-type-is-community #content .friends-block ul, #content .members-block ul {
-  min-width: 196px;
-  width: 192px;
-  margin: 0px 0px 0px 0px;
+  max-width: 174px;
+  min-width: 170px;
+  margin: 0px;
+  padding: 0px 5px;
+}
+
+.profile-type-is-community #content .members-block .menu-submenu ul{
   padding: 0px;
 }
 
@@ -722,7 +780,7 @@ float: left;
   line-height: 30px;
 }
 
-.profile-type-is-community #content .members-block .menu-submenu-content .menu-submenu-list li a.add-friend{
+.profile-type-is-community #content .members-block .menu-submenu-content .menu-submenu-list li:last-child a{
   border: none;
 }
 
@@ -811,10 +869,14 @@ float: left;
   margin-right: 5px;
 }
 
+
 .action-profile-members #content .page-members-header a.button.with-text:hover{
   border-color: #3E67B1;
 }
 
+.action-profile-members #content .box-1 .common-profile-list-block .page-members-header span{
+  margin-right: auto;
+}
 
 /* Tabs */
 
@@ -880,7 +942,7 @@ float: left;
 }
 
 .action-profile-members #content .profile-members-tabs-container .ui-tabs .ui-tabs-nav li.ui-tabs-active {
-  margin-bottom: -3px;
+  margin-bottom: -3px !important; /*important need in colab*/
   padding-bottom: 1px;
   border-bottom: 3px solid #FF0366;
 }
@@ -948,11 +1010,15 @@ float: left;
 }
 
 .action-profile-members .box-1 .common-profile-list-block span{
-  margin-right: 9px;
+  margin-right: 0px;
   width: 90px;
   height: 86px;
 }
 
+.action-profile-members .box-1 .common-profile-list-block .button-bar span{
+  margin: 0px
+}
+
 .action-profile-members .common-profile-list-block img{
   border-radius: 4px;
   width: 82px;
@@ -1045,9 +1111,9 @@ float: left;
 .action-profile-members .common-profile-list-block .vcard .menu-submenu-trigger{
   display: block;
   background:#172738;
-  top:5px;
-  left:4px;
-  border:1px solid #172738;
+  top: 5px;
+  left: 4px;
+  border: 1px solid #172738;
   padding-bottom: 0px;
   border-radius: 5px;
   -moz-border-radius:5px;
diff --git a/src/noosfero-spb/noosfero-spb-theme/css/edition-pages.css b/src/noosfero-spb/noosfero-spb-theme/css/edition-pages.css
index c5e2dae..49322c8 100644
--- a/src/noosfero-spb/noosfero-spb-theme/css/edition-pages.css
+++ b/src/noosfero-spb/noosfero-spb-theme/css/edition-pages.css
@@ -60,6 +60,7 @@
 }
 
 .controller-cms #content .main-content .formfieldline textarea{
+  max-width: 500px;
   padding: 6px;
   color: #585858;
   background: none;
@@ -140,14 +141,19 @@
   height: 30px;
   padding: 2px 15px;
   margin-right: 10px;
-  color: #FFF;
-  background: #3E67B1;
   font-size: 15px;
+  line-height: 14px;
 }
 
-.controller-cms #content .main-content form .button-bar input:hover{
-  background: #5E82C6;
-  border: none;
+.controller-cms #content .main-content form .button-bar a span{
+  line-height: 32px;
+}
+
+.controller-cms #content .main-content form .button-bar input:hover,
+.controller-cms #content .main-content form .button-bar a.button:hover{
+  background: #3E67B1;
+  border-color: #3E67B1;
+  color: #FFF;
 }
 
 .controller-cms #content .main-content form .button-bar input.button.with-text{
@@ -164,12 +170,6 @@
   text-align: center;
 }
 
-.controller-cms #content .main-content form .button-bar a.button:hover{
-  background: none;
-  color: #3E67B1;
-  border-color: #3E67B1;
-}
-
 .controller-cms #content .main-content form .box-title{
   font-size: 15px;
   font-family: Arial, helvetica;
@@ -220,6 +220,9 @@
 }
 
 /*** Article's edition page ***/
+#content .text-editor-sidebar {
+  width: 400px;
+}
 
 #content .text-editor-sidebar .header{
   padding: 13px 10px;
@@ -250,6 +253,10 @@
   border: 1px solid #D3D6DE;
 }
 
+#content .text-editor-sidebar #published-media .section-title {
+  display: inline-block;
+}
+
 /*New Software form*/
 
 .action-software_communities_plugin_myprofile-new_software #content.current-step h3 {
@@ -303,18 +310,22 @@
   height: 100px;
 }
 
-.action-software_communities_plugin_myprofile-new_software #content #software-hostname {
-  float: left;
+.action-software_communities_plugin_myprofile-new_software #software-name-field span{
   display: inline-block;
-  vertical-align: middle;
-  background: #EEE;
-  border: 1px solid #CFCFCF;
+  min-width: 0;
+  width: auto;
+}
+
+.action-software_communities_plugin_myprofile-new_software #software-name-field span #community-identifier{
+  width: auto;
+}
+
+.action-software_communities_plugin_myprofile-new_software #content #software-hostname {
   line-height: 22px;
-  padding: 0px 7px;
+  padding: 0px;
   color: #4A4A4A;
   font-size: 20px;
   text-transform: lowercase;
-  min-width: 190px;
   border-spacing: 20px;
 }
 
@@ -406,7 +417,7 @@ font-size: 10px;
   font-size: 13px;
 }
 
-/*Contact new form*/
+/* Contact new form*/
 
 .action-contact-new #content .main-block form input[type="text"] {
   display: block;
@@ -474,4 +485,66 @@ font-size: 10px;
   background: #fff;
   line-height: 20px;
   font-size: 13px;
-}
\ No newline at end of file
+}
+
+/* Tasks edition */
+
+.action-tasks-index #content .main-block h1{
+  margin: 0px 0 25px 0;
+  border-bottom: 1px solid #d7d7d7;
+  padding-bottom: 25px;
+}
+
+.action-tasks-index fieldset.filter_fields{
+  border: none;
+}
+
+.action-tasks-index fieldset.filter_fields legend{
+  display: none;
+}
+
+
+.action-tasks-index select{
+  background: none;
+  border: 1px solid #D3D6DE;
+  border-radius: 4px;
+  padding: 4px 15px 4px 4px;
+  margin: 0px 0px 0px 10px;
+  font-size: 14px;
+}
+.action-tasks-index #content .main-block form input[type="text"] {
+  display: block;
+  height: 19px;
+  padding: 6px;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  width: 384px;
+  font-size: 15px;
+  font-family: arial, helvetica;
+  color: #585858;
+}
+
+.action-tasks-index .task_box{
+  margin-bottom: 10px;
+  border-radius: 4px;
+  padding: 20px;
+  background-color: #ECEDF1;
+  color: #172738;
+  border: 1px solid #D3D6DE;
+}
+
+.action-tasks-index .task_date {
+  font-size: 11px;
+}
+
+.action-tasks-index .task_accept_radio,
+.action-tasks-index .task_reject_radio,
+.action-tasks-index .task_skip_radio{
+  margin: 5px 4px 15px 15px;
+  line-height: 20px;
+  position: absolute;
+}
+.action-tasks-index .task_decisions label{
+  margin: 2px 0px 2px 30px;
+  line-height: 22px;
+}
diff --git a/src/noosfero-spb/noosfero-spb-theme/css/home-page.css b/src/noosfero-spb/noosfero-spb-theme/css/home-page.css
index c6829e7..f97e02f 100644
--- a/src/noosfero-spb/noosfero-spb-theme/css/home-page.css
+++ b/src/noosfero-spb/noosfero-spb-theme/css/home-page.css
@@ -18,6 +18,7 @@
 
 /* Read More pattern */
 
+.controller-environment_design .box .block-outer .read-more,
 .action-home-index #content .box .block-outer .read-more{
   border-bottom: none;
   background: #eee;
@@ -26,6 +27,7 @@
   text-align: right;
 }
 
+.controller-environment_design #content .box .block-outer .read-more a,
 .action-home-index #content .box .block-outer .read-more a{
   padding: 8px;
   line-height: 20px;
@@ -33,10 +35,12 @@
   display: block;
 }
 
+.controller-environment_design #content .box .block-outer .read-more a:hover,
 .action-home-index #content .box .block-outer .read-more a:hover{
   background: #dedede;
 }
 
+.controller-environment_design #content .box .block-outer .read-more a::after,
 .action-home-index #content .box .block-outer .read-more a::after{
   margin-left: 7px;
   border-radius: 4px;
@@ -55,12 +59,14 @@
 
 /*** Software catalog search block **/
 
+.controller-environment_design #content #catalogo-software-search,
 .action-home-index #content #catalogo-software-search{
   width: 100%;
   background-color: #1A397D;
   border-radius: 4px;
 }
 
+.controller-environment_design #content #catalogo-software-search h1,
 .action-home-index #content #catalogo-software-search h1{
   margin: 0px 15px 10px 15px;
   border-bottom: none;
@@ -71,6 +77,7 @@
   text-align: left;
 }
 
+.controller-environment_design #content #catalogo-software-search #search-Gadget,
 .action-home-index #content  #catalogo-software-search #search-Gadget{
   margin: 0px 15px 9px 15px;
   border: none;
@@ -79,6 +86,7 @@
   width: 90%;
 }
 
+.controller-environment_design #content  #catalogo-software-search .searchButton-catalog,
 .action-home-index #content  #catalogo-software-search .searchButton-catalog{
   cursor: pointer;
   margin: 0px 0px 15px 15px;
@@ -92,7 +100,8 @@
   text-transform: uppercase;
 }
 
-.action-home-index #content  #catalogo-software-search #search-catalog-footer{
+.controller-environment_design #content #catalogo-software-search #search-catalog-footer,
+.action-home-index #content #catalogo-software-search #search-catalog-footer{
   border-top: 1px solid;
   border-bottom-left-radius: 4px;
   border-bottom-right-radius: 4px;
@@ -100,24 +109,28 @@
   color: #FFFFFF;
 }
 
-.action-home-index #content  #catalogo-software-search #search-catalog-footer p{
+.controller-environment_design #content #catalogo-software-search #search-catalog-footer p,
+.action-home-index #content #catalogo-software-search #search-catalog-footer p{
   margin: 0px;
   font-size: 11px;
   text-align: right;
   text-transform: uppercase;
 }
 
-.action-home-index #content  #catalogo-software-search #search-catalog-footer a{
+.controller-environment_design #content #catalogo-software-search #search-catalog-footer a,
+.action-home-index #content #catalogo-software-search #search-catalog-footer a{
   padding: 7px 0px 12px 0px;
   color: #FFF;
   display: block;
 }
 
+.controller-environment_design #content #catalogo-software-search #search-catalog-footer a:hover,
 .action-home-index #content #catalogo-software-search #search-catalog-footer a:hover{
   background-color: #101A38;
 }
 
-.action-home-index #content  #catalogo-software-search #bt_catalog-search::after{
+.controller-environment_design #content #catalogo-software-search #bt_catalog-search::after,
+.action-home-index #content #catalogo-software-search #bt_catalog-search::after{
   margin: 0px 15px 0 5px;
   border-radius: 4px;
   padding: 0px 4px 0 7px;
@@ -132,11 +145,13 @@
 }
 
 /*** Softwares block **/
+.controller-environment_design #content .softwares-block,
 .action-home-index #content .softwares-block{
   margin: 0px;
   overflow: auto;
 }
 
+.controller-environment_design #content .softwares-block .block-title,
 .action-home-index #content .softwares-block .block-title{
   margin: 0px 0px 25px 0px;
   border-top: 4px solid #2c66ce;
@@ -145,6 +160,7 @@
   font-weight: 300;
 }
 
+.controller-environment_design #content .softwares-block .block-footer-content a,
 .action-home-index #content .softwares-block .block-footer-content a{
   display:none;
 }
@@ -236,6 +252,7 @@
 
 /*** News block - display content block **/
 
+.controller-environment_design #content .display-content-block .block-title,
 .action-home-index #content .display-content-block .block-title{
   margin: 0px;
   border-top: 4px solid #643C67;
@@ -244,21 +261,25 @@
   font-weight: 300;
 }
 
+.controller-environment_design #content .display-content-block li,
 .action-home-index #content .display-content-block li{
   border-top: 1px solid #eee;
   padding: 15px 0px 0px 0px;
   min-height: 150px;
 }
 
+.controller-environment_design #content .display-content-block li:first-child,
 .action-home-index #content .display-content-block li:first-child{
   border-top: 0px solid #eee;
 }
 
+.controller-environment_design #content .display-content-block .published-at,
 .action-home-index #content .display-content-block .published-at{
   padding: 0px 0px 15px 0px;
   color: #643C67;
 }
 
+.controller-environment_design #content .display-content-block .image,
 .action-home-index #content .display-content-block .image{
   padding-right: 25px;
   padding: 0px 25px 0px 0px;
@@ -267,6 +288,7 @@
   display: table-cell;
 }
 
+.controller-environment_design #content .display-content-block .image a,
 .action-home-index #content .display-content-block .image a{
   border-radius: 8px;
   height: 90px;
@@ -274,11 +296,13 @@
   display: block;
 }
 
+.controller-environment_design #content .display-content-block .image img,
 .action-home-index #content .display-content-block .image img{
   border: 0px solid #c0c1c1;
   max-width: 150px;
 }
 
+.controller-environment_design #content .display-content-block .title,
 .action-home-index #content .display-content-block .title{
   margin: 2px 0px 4px 0px;
   padding-right: 0px;
@@ -287,41 +311,51 @@
   overflow: hidden;
 }
 
+.controller-environment_design #content .display-content-block .title a,
 .action-home-index #content .display-content-block .title a{
   padding: 0px;
   color: #172738;
   font: normal normal bold 16px/1.3em arial, helvetica, sans-serif;
 }
 
+.controller-environment_design #content .display-content-block .lead,
 .action-home-index #content .display-content-block .lead{
   max-height: 47px;
   overflow: hidden;
 }
 
+.controller-environment_design #content .display-content-block .lead a,
 .action-home-index #content .display-content-block .lead a{
   color: #000000;
   font: 15px/1.3em arial;
 }
 
+.controller-environment_design #content .display-content-block .lead a:visited,
+.controller-environment_design #content .lead a:visited,
+.controller-environment_design #content .lead dl.portlet a:visited
 .action-home-index #content .display-content-block .lead a:visited,
 .action-home-index #content .lead a:visited,
 .action-home-index #content .lead dl.portlet a:visited{
   color: #172738;
 }
 
+.controller-environment_design #content .display-content-block .notice-info,
 .action-home-index #content .display-content-block .notice-info{
   display: table-cell;
   vertical-align: top;
 }
 
+.controller-environment_design #content .display-content-block .read_more,
 .action-home-index #content .display-content-block .read_more{
   display: none;
 }
 
+.controller-environment_design #content .display-content-block .read-more,
 .action-home-index #content .display-content-block .read-more{
   border-top: 1px solid #643C67;
 }
 
+.controller-environment_design #content .display-content-block .read-more a::after,
 .action-home-index #content .display-content-block .read-more a::after{
   background: #643C67;
 }
@@ -332,6 +366,7 @@
 
 /*** What Is block - Article block **/
 
+.template-default .controller-environment_design #content .box-3 .article-block .block-title,
 .template-default .action-home-index #content .box-3 .article-block .block-title{
   border-top: 4px solid #08A649;
   border-bottom: none;
@@ -343,19 +378,23 @@
   text-transform: none;
 }
 
+.template-default .controller-environment_design #content .box-3 .article-block .read-more,
 .template-default .action-home-index #content .box-3 .article-block .read-more{
   margin-top: 30px;
   border-top: 1px solid #08A649;
 }
 
+.template-default .controller-environment_design #content .box-3 .article-block .read-more a::after,
 .template-default .action-home-index #content .box-3 .article-block .read-more a::after{
   background: #08A649;
 }
 
+.template-default .controller-environment_design #content .box-3 .article-block .short-post,
 .template-default .action-home-index #content .box-3 .article-block .short-post{
   padding-top: 23px;
 }
 
+.template-default .controller-environment_design #content .box-3 .article-block p,
 .template-default .action-home-index #content .box-3 .article-block p{
   margin: 0px 0px 14px 0px;
   padding: 0px;
@@ -364,18 +403,20 @@
   text-transform: none;
 }
 
-/******* See As Well Block - Highlights block *******/
+/******* Software Highlights block *******/
 
+.controller-environment_design #content .highlights-block .block-title,
 .action-home-index #content .highlights-block .block-title{
   display: none;
 }
 
+.controller-environment_design #content .highlights-border,
 .action-home-index #content .highlights-border{
   border: 1px solid #c0c1c1;
   border-radius: 8px;
   width: auto;
-  height: 248px;
-  max-height: 250px;
+  height: 270px;
+  max-height: 270px;
   background-color: #e8e9ec;
   background-image: linear-gradient(
     0deg,
@@ -384,38 +425,44 @@
   background-size: 100% 100%;
 }
 
-.action-home-index #content .highlights-container{
-  border-radius: 8px;
+.controller-environment_design #content .highlights-container,
+.action-home-index #content .highlights-container {
+  border-radius: 8px 8px 0px 0px;
   border-width: 0px 0px 1px 0px;
   border-bottom: none;
   padding: 0;
   width: 100% !important;
-  max-height: 230px;
-  background: transparent;
+  max-height: 240px;
+  background: #FFF;
   position: relative;
   top: 0;
 }
 
-.action-home-index #content .highlights-image-link{
-  padding: 18px 0px 0px 0px;
+.controller-environment_design #content .highlights-image-link,
+.action-home-index #content .highlights-image-link {
+  display: block;
+  padding: 0px;
   border-radius: 0px 0px 8px 8px;
-  width: 220px;
-  max-height: 217px;
+  height: 250px !important;
   background-color: #fff;
+  opacity: 1.0 !important;
 }
 
-.action-home-index #content .highlights-image-link img{
-  height: 100px;
-  max-width: 200px;
+.controller-environment_design #content .highlights-image-link img,
+.action-home-index #content .highlights-image-link img {
+  height: 80px;
+  max-width: 160px;
+  padding: 30px;
+  background: #FFF;
 }
 
-.action-home-index #content .highlights-label{
+.controller-environment_design #content .highlights-label,
+.action-home-index #content .highlights-label {
   border-top: 4px solid #3b61a7;
-  padding: 23px 20px 46px 20px;
-  max-height: 60px;
+  padding: 20px;
+  height: 100px;
   width: 190px;
   position: relative;
-  bottom: -18px;
   background: #e8e9ec;
   color: #172638;
   text-align: center;
@@ -423,13 +470,16 @@
   vertical-align: middle;
 }
 
-.action-home-index #content .highlights-block-pager{
+.controller-environment_design #content .highlights-block-pager,
+.action-home-index #content .highlights-block-pager {
   float: none;
   display: block;
   text-align: center;
+  padding: 10px 0px;
 }
 
-.action-home-index #content .highlights-block-pager a{
+.controller-environment_design #content .highlights-block-pager a,
+.action-home-index #content .highlights-block-pager a {
   margin: 0 4px;
   border-color: transparent;
   border-radius: 50%;
@@ -443,32 +493,41 @@
   display: inline-block;
 }
 
-.action-home-index #content .highlights-block-pager a.activeSlide{
+.controller-environment_design #content .highlights-block-pager a.activeSlide,
+.action-home-index #content .highlights-block-pager a.activeSlide {
   border-color: transparent;
   background: #3e67b1;
   color: transparent;
 }
 
-/*** software highlights block ***/
-
+.controller-environment_design #content a.toggle-popover,
+.controller-environment_design #content a.toggle-popover:hover,
 .action-home-index #content a.toggle-popover,
 .action-home-index #content a.toggle-popover:hover{
   margin: 0 0 0 55px;
   color: #3867b7;
   cursor: pointer;
+  font-family: Arial, helvetica, sans-serif;
 }
 
-.action-home-index #content span.popover-span{
-  padding: 1px 6px;
-  border-radius: 50%;
+.controller-environment_design #content span.popover-span,
+.action-home-index #content span.popover-span {
+  padding-top: 2px;
   background-color: #3867b7;
   color: #ffffff;
   font-weight: bold;
   cursor: pointer;
+  height: 15px;
+  font-family: arial;
+  width: 17px;
+  display: inline-block;
+  text-align: center;
+  border-radius: 50%;
 }
 
 /*** mais software block **/
-.action-home-index #content #mais-software-block{
+.controller-environment_design #content #mais-software-block,
+.action-home-index #content #mais-software-block {
   margin: 11px 0px;
   border: 1px solid #c0c1c1;
   border-radius: 8px;
@@ -478,6 +537,7 @@
   font: 14px arial;
 }
 
+.controller-environment_design #content #mais-software-block #sbp-information-softwares h2,
 .action-home-index #content #mais-software-block #sbp-information-softwares h2{
   margin: 10px 0px 0px 0px;
   padding: 0px 0px 17px 15px;
@@ -488,28 +548,34 @@
   text-transform: uppercase;
 }
 
+.controller-environment_design #content #mais-software-block #list-categories,
 .action-home-index #content #mais-software-block #list-categories{
   margin: 14px 14px 14px 14px;
 }
 
+.controller-environment_design #content #mais-software-block #list-categories p,
 .action-home-index #content #mais-software-block #list-categories p{
   margin: 0 0 16px 0;
   color: #464A55;
 }
 
+.controller-environment_design #content #mais-software-block #list-categories ul li,
 .action-home-index #content #mais-software-block #list-categories ul li{
   margin: 18px 5px 5px 5px;
 }
 
+.controller-environment_design #content #mais-software-block #list-categories li a,
 .action-home-index #content #mais-software-block #list-categories li a{
   color: #335277;
   font-weight: bold;
 }
 
+.controller-environment_design #content #mais-software-block #list-categories a:hover,
 .action-home-index #content #mais-software-block #list-categories a:hover{
   text-decoration: none;
 }
 
+.controller-environment_design #content #mais-software-block #footer-mais-software,
 .action-home-index #content #mais-software-block #footer-mais-software{
   margin: 0px;
   border-top: 1px solid #c0c1c1;
@@ -519,6 +585,7 @@
   text-transform: uppercase;
 }
 
+.controller-environment_design #content #mais-software-block #footer-mais-software a,
 .action-home-index #content #mais-software-block #footer-mais-software a{
   color: #464A55;
 }
diff --git a/src/noosfero-spb/noosfero-spb-theme/css/main-content.css b/src/noosfero-spb/noosfero-spb-theme/css/main-content.css
index 56307fb..6b70ae5 100644
--- a/src/noosfero-spb/noosfero-spb-theme/css/main-content.css
+++ b/src/noosfero-spb/noosfero-spb-theme/css/main-content.css
@@ -42,7 +42,7 @@
 #content .pagination a,
 #content .pagination em,
 #content .pagination span{
-  padding: 5px 9px;
+  padding: 5px 0;
   margin-right: 4px;
   color: #172738;
   border: 1px solid #D3D6DE;
@@ -51,7 +51,13 @@
   font-size: 12px;
   font-weight: 700;
   text-decoration: none;
-  display: inline-table;
+  display: inline-block;
+  width: 30px;
+}
+
+#content .pagination .previous-arrow,
+#content .pagination .next-arrow{
+  display: none;
 }
 
 #content .pagination .current {
@@ -59,14 +65,42 @@
   font-style: normal;
 }
 
+#content #article .pagination .previous_page,
+#content #article .pagination .next_page,
+#content .pagination .previous_page,
+#content .pagination .next_page{
+  position: relative;
+  padding:5px 9px;
+}
+
+#content #article .pagination .previous_page,
 #content .pagination .previous_page{
   float: left;
 }
 
+#content #article .pagination .next_page,
 #content .pagination .next_page{
   float: right;
 }
 
+#content .pagination .next_page:after,
+#content .pagination .previous_page:before{
+  font-family:"FontAwesome";
+  font-size: 15px;
+  font-weight: bold;
+  line-height: 10px;
+}
+
+#content .pagination .previous_page:before{
+  content:"\f104"; 
+  margin:0 10px 0 0;
+}
+
+#content .pagination .next_page:after{
+  content:"\f105";
+  margin:0 0 0 10px;
+}
+
 #content .pagination .previous_page,
 #content .pagination .next_page{
   width: auto;
@@ -95,9 +129,9 @@
   border: 1px solid #3E67B1;
   font-size: 14px;
   line-height: 32px;
-  text-transform: uppercase;
 }
 
+#content .button-bar a.button.with-text,
 #content #article-actions a.button.with-text{
   display: inline-block;
   height: 18px;
@@ -112,6 +146,18 @@
   text-transform: none;
 }
 
+#content .button-bar .button.with-text.icon-save.submit{
+  height: 30px;
+  padding: 5px 15px;
+  background: #FFF none;
+  color: #3E67B1;
+  border-radius: 4px;
+  border: 1px solid #3E67B1;
+  font-size: 14px;
+  line-height: 14px;
+}
+
+#content .button-bar a.button.with-text span,
 #content #article-actions a.button.with-text span{
   padding: 0;
 }
@@ -126,6 +172,7 @@
 .action-profile-members #content .page-profile-header a.button.with-text{
   border:none;
 }
+
 .action-profile-members #content .button-bar a.button.with-text:hover{
   border-color: #3E67B1;
 }
@@ -140,9 +187,10 @@
   border: 1px solid #3E67B1;
   font-size: 14px;
   line-height: 32px;
-  text-transform: uppercase;
 }
 
+#content .button-bar .button.with-text.icon-save.submit:hover,
+#content .button-bar a.button.with-text:hover,
 #content a.button:hover,
 #content #article-actions a.button.with-text:hover,
 #content input.button.with-text:hover{
diff --git a/src/noosfero-spb/noosfero-spb-theme/css/notifications.css b/src/noosfero-spb/noosfero-spb-theme/css/notifications.css
new file mode 100644
index 0000000..2a98cf5
--- /dev/null
+++ b/src/noosfero-spb/noosfero-spb-theme/css/notifications.css
@@ -0,0 +1,145 @@
+.environment-notification-plugin-notification-bar{
+	display: block;
+}
+
+#environment-notification-plugin-notification-manager{
+  overflow: auto;
+}
+
+.environment-notification-plugin-notification-bar .notification .notification-close,
+.environment-notification-plugin-notification-notification-modal .notification .notification-close{
+  background: url(public/images/close.png) no-repeat;
+  background-position: center;
+  width: 20px;
+  height: 20px;
+}
+
+.environment-notification-plugin-notification-bar .warningnotification,
+.environment-notification-plugin-notification-bar .informationnotification,
+.environment-notification-plugin-notification-bar .successnotification,
+.environment-notification-plugin-notification-bar .dangernotification,
+.environment-notification-plugin-notification-bar .adminnotification,
+.environment-notification-plugin-notification-notification-modal .warningnotification,
+.environment-notification-plugin-notification-notification-modal .informationnotification,
+.environment-notification-plugin-notification-notification-modal .successnotification,
+.environment-notification-plugin-notification-notification-modal .dangernotification{
+  margin-bottom: 38px;
+  padding: 15px;
+  border-radius: 4px;
+  border: 1px solid blue;
+  font-size: 14px;
+  color: #FFFFFF;
+  overflow: auto;
+}
+
+.environment-notification-plugin-notification-bar .warningnotification p,
+.environment-notification-plugin-notification-bar .informationnotification p,
+.environment-notification-plugin-notification-bar .successnotification p,
+.environment-notification-plugin-notification-bar .dangernotification p,
+.environment-notification-plugin-notification-bar .adminnotification p,
+.environment-notification-plugin-notification-notification-modal .warningnotification p,
+.environment-notification-plugin-notification-notification-modal .informationnotification p,
+.environment-notification-plugin-notification-notification-modal .successnotification p,
+.environment-notification-plugin-notification-notification-modal .dangernotification p{
+  margin: 0px;
+}
+
+.environment-notification-plugin-notification-bar .warningnotification,
+.environment-notification-plugin-notification-notification-modal .warningnotification{
+  background: #fcf8e3;
+  border: 1px solid #faebcc;
+  color: #8a6d3b;
+}
+
+.environment-notification-plugin-notification-bar .warningnotification p a,
+.environment-notification-plugin-notification-notification-modal .warningnotification p a{
+  font-weight: bold;
+  color: #8a6d3b;
+}
+
+
+.environment-notification-plugin-notification-bar .informationnotification,
+.environment-notification-plugin-notification-notification-modal .informationnotification{
+  background: #d9edf7;
+  border: 1px solid #bce8f1;
+  color: #31708f;
+}
+
+.environment-notification-plugin-notification-bar .informationnotification p a,
+.environment-notification-plugin-notification-notification-modal .informationnotification p a{
+  font-weight: bold;
+  color: #31708f;
+}
+
+.environment-notification-plugin-notification-bar .successnotification,
+.environment-notification-plugin-notification-notification-modal .successnotification{
+  background: #dff0d8;
+  border: 1px solid #d6e9c6;
+  color: #3c763d;
+}
+
+.environment-notification-plugin-notification-bar .successnotification p a
+.environment-notification-plugin-notification-notification-modal .successnotification p a{
+  font-weight: bold;
+  color: #3c763d;
+}
+
+.environment-notification-plugin-notification-bar .dangernotification,
+.environment-notification-plugin-notification-notification-modal .dangernotification{
+  background: #f2dede;
+  border: 1px solid #ebccd1;
+  color: #a94442;
+}
+
+.environment-notification-plugin-notification-bar .dangernotification  p a,
+.environment-notification-plugin-notification-notification-modal .dangernotification  p a{
+  font-weight: bold;
+  color: #a94442;
+}
+
+.environment-notification-plugin-notification-bar .adminnotification,
+.environment-notification-plugin-notification-notification-modal .adminnotification{
+  background: #9a959a;
+  border: 1px solid #9a959a;
+}
+
+.environment-notification-plugin-notification-bar .adminnotification p a,
+.environment-notification-plugin-notification-notification-modal .adminnotification p a{
+  font-weight: bold;
+  color: white;
+}
+
+.environment-notification-plugin-notification-bar .notification .notification-message,
+.environment-notification-plugin-notification-notification-modal .notification .notification-message{
+  width: 90%;
+  float: left;
+}
+
+.environment-notification-plugin-notification-bar .notification .notification-close{
+  background: url(../images/redclose.png) no-repeat;
+  background-position: center;
+  width: 20px;
+  height: 20px;
+  float: right;
+  cursor: pointer;
+}
+
+.environment-notification-plugin-notification-bar .notification .notification-hide{
+  background: url(../images/greenhide.png) no-repeat;
+  background-position: center;
+  width: 20px;
+  height: 20px;
+  float: right;
+  cursor: pointer;
+}
+
+.environment-notification-plugin-notification-notification-modal{
+  display: block;
+  min-width: 400px;
+  max-width: 700px;
+}
+
+.environment-notification-plugin-form .notification-variables-options{
+  font-style: italic;
+  color: red;
+}
diff --git a/src/noosfero-spb/noosfero-spb-theme/css/overwriting-base-theme.css b/src/noosfero-spb/noosfero-spb-theme/css/overwriting-base-theme.css
index 8b3903a..9bb3ef6 100644
--- a/src/noosfero-spb/noosfero-spb-theme/css/overwriting-base-theme.css
+++ b/src/noosfero-spb/noosfero-spb-theme/css/overwriting-base-theme.css
@@ -20,19 +20,19 @@
 }
 
 #wrapper {
-    margin: 0 auto;
-    font-size: 1.2em;
-    width: 100%;
+  margin: 0 auto;
+  font-size: 1.2em;
+  width: 100%;
 }
 
 .main-content {
-    border-style: none;
-    box-shadow: none;
-    padding: 10px 20px;
+  border-style: none;
+  box-shadow: none;
+  padding: 10px 20px;
 }
 
 .profile-image-block .admin-link {
-    font-size: 100%;
+  font-size: 100%;
 }
 
 /* ==> blocks.css <== */
diff --git a/src/noosfero-spb/noosfero-spb-theme/css/popover.css b/src/noosfero-spb/noosfero-spb-theme/css/popover.css
index 905383b..39351d5 100644
--- a/src/noosfero-spb/noosfero-spb-theme/css/popover.css
+++ b/src/noosfero-spb/noosfero-spb-theme/css/popover.css
@@ -151,7 +151,7 @@
   font-size: 14px;
   line-height: 20px;
 }
-    
+
 .highlights-popover span {
   font-weight: bold;
   border-bottom: 1px dotted #FFFFFF;
@@ -163,17 +163,33 @@
 #content .highlights-popover a:link {
   font-weight: bold;
   color: #FFFFFF;
-  display: block;
+}
+
+#content .highlights-popover .inner-content a,
+#content .highlights-popover .inner-content a:visited,
+#content .highlights-popover .inner-content a:hover,
+#content .highlights-popover .inner-content a:link{
+  font-weight: bold;
+  color: #FFFFFF;
+  border-bottom: dotted 1px;
+}
+
+#content .highlights-popover .see-all a,
+#content .highlights-popover .see-all a:visited,
+#content .highlights-popover .see-all a:hover,
+#content .highlights-popover .see-all a:link {
   padding: 8px 15px;
   border-top: 1px dotted rgba(255,255,255,0.1);
+  display: block;
 }
 
-.highlights-popover a:before {
+.highlights-popover .see-all a:before {
   font-family: "FontAwesome";
   content: "\f067";
   vertical-align: middle;
   color: #ff0066;
   padding: 0 5px 0 0;
+  font-size: 10px;
 }
 
 .highlights-popover.top > .arrow,
diff --git a/src/noosfero-spb/noosfero-spb-theme/css/search-pages.css b/src/noosfero-spb/noosfero-spb-theme/css/search-pages.css
index fb05e26..04f9b9b 100644
--- a/src/noosfero-spb/noosfero-spb-theme/css/search-pages.css
+++ b/src/noosfero-spb/noosfero-spb-theme/css/search-pages.css
@@ -2,14 +2,22 @@
 
 .action-search-index #content form #search-header,
 .action-search-people #content form #search-header,
-.action-search-communities #content form #search-header{
-  margin-top: 5px;
+.action-search-communities #content form #search-header {
   float: right;
   border: none;
 }
 
+.action-search-index #content form #search-header {
+  margin-top: 5px;
+}
+
+.action-search-people #content form #search-header,
+.action-search-communities #content form #search-header {
+  margin: 0 0 15px 0 ;
+}
+
 .action-search-people #content form #search-header #search-filters .sod_select,
-.action-search-communities #content form #search-header #search-filters .sod_select{
+.action-search-communities #content form #search-header #search-filters .sod_select {
   color: #3E67B1;
   border: 1px solid #3E67B1;
   border-radius: 4px;
@@ -20,7 +28,7 @@
 }
 
 .action-search-people #content form #search-header #search-filters .sod_select .sod_list,
-.action-search-communities #content form #search-header #search-filters .sod_select .sod_list{
+.action-search-communities #content form #search-header #search-filters .sod_select .sod_list {
   margin: -2px 0 0 -1px;
   color: #3E67B1;
   border: 1px solid #3E67B1;
@@ -32,17 +40,17 @@
 }
 
 .action-search-people #content form #search-header #search-filters .sod_select .sod_list .active,
-.action-search-communities #content form #search-header #search-filters .sod_select .sod_list .active{
+.action-search-communities #content form #search-header #search-filters .sod_select .sod_list .active {
   border-radius: 0px 0px 4px 4px;
 }
 
 .action-search-people #content form #search-header #search-filters .sod_select .sod_list .selected,
-.action-search-communities #content form #search-header #search-filters .sod_select .sod_list .selected{
+.action-search-communities #content form #search-header #search-filters .sod_select .sod_list .selected {
   padding-right: 21px;
 }
 
 .action-search-people #content form #search-subheader .sod_select,
-.action-search-communities #content form #search-subheader .sod_select{
+.action-search-communities #content form #search-subheader .sod_select {
   line-height: 15px;
 }
 
@@ -55,51 +63,49 @@
 .action-search-index #content form .search-field .formfield,
 .action-search-people #content form .search-field .formfield,
 .action-search-communities #content form .search-field .formfield{
-  float: left;
   width: 99%;
 }
 .action-search-index #content form .search-field .formfield input,
 .action-search-people #content form .search-field .formfield input,
-.action-search-communities #content form .search-field .formfield input{
+.action-search-communities #content form .search-field .formfield input {
   margin-top: 0px;
   padding: 6px;
   height: 19px;
   max-height: 19px;
-  max-width: 98%;
   background: none;
   border: 1px solid #ccc;
   border-radius: 4px;
+  margin-bottom: 15px;
+  font-size: 14px;
 }
 
 .action-search-index #content form input.button.submit,
 .action-search-people #content form input.button.submit,
-.action-search-communities #content form input.button.submit{
-  height: 32px;
-  margin-top: 8px;
-  padding: 5px 15px;
-  background: #3E67B1 none;
+.action-search-communities #content form input.button.submit {
+  background: #3E67B1;
   color: #FFF;
   border-radius: 4px;
-  border: 1px solid #3E67B1;
-  font-size: 14px;
+  width: 108px;
   line-height: 14px;
+  font-size: 14px;
+  font-family: "open_sansbold", Arial, sans-serif;
   text-transform: uppercase;
 }
 
 .action-search-index #content form input.button.submit:hover,
 .action-search-people #content form input.button.submit:hover,
-.action-search-communities #content form input.button.submit:hover{
+.action-search-communities #content form input.button.submit:hover {
   background: #5E82C6;
 }
 
 .action-search-people #search-results .search-results-type-people,
-.action-search-communities #search-results .search-results-type-community{
+.action-search-communities #search-results .search-results-type-community {
   background: none;
   border: 1px solid #ccc;
   border-radius: 10px;
 }
 
-.action-search-index #search-results h3{
+.action-search-index #search-results h3 {
   margin: 20px 0 10px 0;
   color: #172738;
   font-size:18px;
@@ -109,7 +115,7 @@
   font-variant: normal;
 }
 
-.action-search-index #search-results .search-results-innerbox{
+.action-search-index #search-results .search-results-innerbox {
   background: none;
   border: 1px solid #ccc;
 }
diff --git a/src/noosfero-spb/noosfero-spb-theme/css/software-catalog-page.css b/src/noosfero-spb/noosfero-spb-theme/css/software-catalog-page.css
index 2b32cd0..0d08527 100644
--- a/src/noosfero-spb/noosfero-spb-theme/css/software-catalog-page.css
+++ b/src/noosfero-spb/noosfero-spb-theme/css/software-catalog-page.css
@@ -74,16 +74,19 @@
 }
 
 .action-search-software_infos #software-search-container .search-form .doubts-catalog-software{
-  border:1px solid #3E67B1;
-  border-radius:50%;
-  padding:0px 3px;
-  font-size: 14px;
-  font-weight: 900;
-  background:#3E67B1;
-  color:#fff;
-  font-family: Arial;
+  padding-top: 2px;
+  background-color: #3867b7;
+  color: #ffffff;
+  font-weight: bold;
   cursor: pointer;
+  height: 15px;
+  font-family: arial;
+  width: 17px;
+  display: inline-block;
+  text-align: center;
+  border-radius: 50%;
 }
+
 /******/
 
 .action-search-software_infos #content .search-form .search-field .formfield {
@@ -93,7 +96,7 @@
 }
 
 .action-search-software_infos #content .search-form .search-field #search-input {
-  width: 96%;
+  width: 95%;
   margin: 13px 0px 4px 13px;
   padding: 7px;
   background: #FFF;
@@ -283,6 +286,7 @@
 /*** Search Results ***/
 .action-search-software_infos #search-results {
   border-top: 1px solid #d7d7d7;
+  margin-top: 66px;
 }
 
 .action-search-software_infos #search-results.only-one-result-box .search-software-item {
@@ -292,7 +296,7 @@
 }
 
 .action-search-software_infos #search-results #search-results-empty{
-  padding: 15px 0px;
+  padding: 30px 0 15px 0;
   color: #172738;
   font-size: 16px;
   text-align: left;
@@ -359,7 +363,7 @@
   padding-right: 20px;
   top: 0px;
   position: absolute;
-  color: #2C4B6B;
+  color: #172738;
   font-size: 13px;
   font-family: Arial;
   text-align: left;
@@ -368,8 +372,7 @@
 
 .action-search-software_infos #search-results .search-software-item-column-left .extra_info::before{
   content: url("../images/ic-calendar.png");
-  margin-right: 10px;
-  margin-top: 6px;
+  margin: 6px 10px 20px 0;
   float: left;
 }
 
@@ -411,7 +414,7 @@
   float: left;
 }
 
-.action-search-software_infos #search-results .search-software-content-block #categories-list li{
+.action-search-software_infos #search-results .search-software-content-block #categories-list li {
   width: auto !important; /* force overwritting from base */
   margin-left: 7px !important; /* force overwritting from base */
   float: left;
@@ -421,6 +424,18 @@
   text-decoration: underline;
 }
 
-.action-search-software_infos #search-results .search-software-content-block #categories-list li a{
+.action-search-software_infos #search-results .search-software-content-block #categories-list li a {
   color: #3E67B1;
 }
+
+.action-search-software_infos #search-results #individually-category br {
+  display: none;
+}
+
+.action-search-software_infos #search-results #individually-category a {
+  margin-right: 10px;
+  float: left;
+  color: #3E67B1;
+  font-size: 13px;
+  text-decoration: underline;
+}
diff --git a/src/noosfero-spb/noosfero-spb-theme/css/software-pages.css b/src/noosfero-spb/noosfero-spb-theme/css/software-pages.css
index dd914a7..91dd1c2 100644
--- a/src/noosfero-spb/noosfero-spb-theme/css/software-pages.css
+++ b/src/noosfero-spb/noosfero-spb-theme/css/software-pages.css
@@ -65,7 +65,7 @@
 }
 
 #content .download-block .download-list li {
-  padding: 30px 10px 25px 10px;
+  padding: 30px 10px 25px 20px;
   border-top: 1px solid #D3D6DE;
   clear: both;
 }
@@ -156,10 +156,16 @@
   display: none;
 }
 
-.profile-homepage #article .article-body h1 {
-  border-top: 1px solid #ECEDF1;
+.profile-type-is-community .profile-homepage .main-block #article .article-body h1,
+.profile-type-is-community .profile-homepage .main-block #article .article-body h2,
+.profile-type-is-community .profile-homepage .main-block #article .article-body h3,
+.profile-type-is-community .profile-homepage .main-block #article .article-body h4,
+.profile-type-is-community .profile-homepage .main-block #article .article-body h5,
+.profile-type-is-community .profile-homepage .main-block #article .article-body h6 {
+  /* border-top: 1px solid #ECEDF1;
   border-bottom: none;
-  padding-top: 25px;
+  padding-top: 25px; */
+  font-size: 18px;
 }
 
 .profile-homepage #article .article-body p {
@@ -169,10 +175,6 @@
   font-size: 15px;
 }
 
-.profile-homepage #article .article-body hr {
-  display: none;
-}
-
 .profile-homepage #article .article-body ul {
   background-repeat: no-repeat;
   list-style-position: inside;
@@ -301,7 +303,7 @@
   padding: 12px 10px;
   background: #EAEBEE;
   color: #2C66CE;
-  font: normal normal bold 12px 'open_sansbold', arial, helvetica, sans-serif;
+  font: normal normal normal 12px 'open_sansbold', arial, helvetica, sans-serif;
   text-transform: uppercase;
   display: block;
   position: relative;
@@ -312,8 +314,8 @@
   color:#172738;
 }
 
-.template-default .box-3 #bt_wiki:after,
-.template-default .box-3 #bt_repositorio:after{
+.template-default .box-3 #bt_wiki::after,
+.template-default .box-3 #bt_repositorio::after{
   margin-top: -2px;
   padding: 4px 0px 4px 2px;
   border-radius: 4px;
@@ -426,16 +428,16 @@
 
 .template-lefttopright .box-2 #bt_wiki::after,
 .template-lefttopright .box-2 #bt_repositorio::after{
+  width: 18px;
+  position: absolute;
+  right: 10px;
   margin-top: -2px;
   padding: 4px 0px 4px 2px;
   border-radius: 4px;
-  width: 18px;
-  right: 10px;
-  line-height: 20px;
-  position: absolute;
   background: #2C66CE;
   color: #FFF;
   font-size: 16px;
+  line-height: 12px;
   text-align: center;
   content: url('../images/right-arrow.png');
 }
@@ -461,23 +463,31 @@
 
 .software-metrics-block .metrics-list li {
   display: table;
-  margin-bottom: 10px;
+  margin-bottom: 8px;
 }
 
-.software-metrics-block .metrics-list li span,
-.software-metrics-block .metrics-list li a {
+.software-metrics-block .metrics-list li span {
+  color: #2C66CE;
   display: table-cell;
   vertical-align: top;
 }
 
-#content .software-metrics-block .metrics-list li a:link {
-  color: #2c66ce;
+.software-metrics-block .metrics-list li span#visit-count {
+  padding-left: 1px;
 }
 
-.software-metrics-block span.arrow-globe-icon {
+.software-metrics-block .metrics-list li span#visit-count,
+.software-metrics-block .metrics-list li span#downloads-count,
+.software-metrics-block .metrics-list li span#benefited-people,
+.software-metrics-block .metrics-list li span#saved-resources {
+  padding-top: 4px;
+}
+
+.software-metrics-block li span.arrow-globe-icon {
   background: url('../images/arrow-globe-icon.png') no-repeat center center;
   width: 25px;
   height: 18px;
+  padding-left: 9px !important;
 }
 
 .software-metrics-block span.downloads-icon {
@@ -498,9 +508,9 @@
   height: 20px;
 }
 
-.software-metrics-block .metrics-list li a {
+.software-metrics-block .metrics-list li span {
   letter-spacing: -0.1px;
-  line-height: 20px;
+  line-height: 15px;
   padding-left: 5px;
 }
 
@@ -537,9 +547,9 @@
 #content .main-block .article-body ul.etapas-publicacao li strong {
   margin-right: 6px;
   border-radius: 50%;
-  padding: 1px;
+  padding: 1px 0 0 0;
   background: #333;
-  height: 24px;
+  height: 23px;
   width: 24px;
   color: #fff;
   text-align: center;
diff --git a/src/noosfero-spb/noosfero-spb-theme/css/use-report.css b/src/noosfero-spb/noosfero-spb-theme/css/use-report.css
index 9186e84..cd1fe8b 100644
--- a/src/noosfero-spb/noosfero-spb-theme/css/use-report.css
+++ b/src/noosfero-spb/noosfero-spb-theme/css/use-report.css
@@ -19,13 +19,13 @@
 
 .profile-homepage #content .organization-average-rating-container .rate-this-organization {
   font-size: 14px;
-  text-decoration: underline;
   margin: 4px 0px 0px 6px;
   padding: 0px 0px 0px 15px;
 }
 
 .profile-homepage #content .organization-average-rating-container .rate-this-organization a {
   color: #2c66ce;
+  text-decoration: underline;
 }
 
 .profile-homepage #content .organization-average-rating-container .star-container .medium-star-negative,
@@ -144,7 +144,7 @@
 }
 
 #content .main-content .star-rate-data .star-rate-form {
-  padding: 0 37px;
+  padding: 0 0 0 37px;
   letter-spacing: 0.1px;
   width: 100%;
 }
@@ -155,17 +155,22 @@
 }
 
 #content .main-content .star-rate-data .star-profile-information {
-  padding-left: 15px;
   width: 79px;
 }
 
 #content .main-content .star-rate-data .star-profile-information .star-profile-image {
-  padding-top: 1px;
+  height: 60px;
+  width: 60px;
+  overflow: hidden;
+  border-radius: 4px;
 }
 
 #content .main-content .star-rate-data .star-profile-information .star-profile-image img {
-  border-radius: 4px;
-  height: 60px;
+  height: auto;
+  width: 60px;
+}
+
+#content .main-content .star-rate-data .star-profile-information .star-profile-name{
   width: 60px;
 }
 
@@ -210,7 +215,7 @@
   font-weight: 700;
   text-transform: uppercase;
   color: #FFF;
-  padding: 5px;
+  padding: 5px 10px;
   height: 31px;
   line-height: 20px;
   font-family: Arial;
@@ -221,6 +226,7 @@
 }
 
 #content .main-content .star-rate-data .star-rate-form .star-comment-container .button-bar {
+  margin-top: 20px;
   padding-bottom: 50px;
 }
 
@@ -287,29 +293,31 @@
 }
 
 #content .star-rate-form .star-comment-container .comments-display-fields:hover span,
-#content .star-rate-form .star-comment-container .comments-display-fields:hover span:after {
+#content .star-rate-form .star-comment-container .comments-display-fields:hover span::after {
   opacity: 0.6;
 }
 
 #content .star-rate-form .star-comment-container .comments-display-fields span#comments-additional-information {
-  color: #172738;
-  display: block;
   float: left;
+  padding-bottom: 4px;
+  color: #172738;
   font-size: 14px;
   font-weight: 700;
-  padding-bottom: 4px;
+}
+
+#content .star-rate-form .star-comment-container .comments-display-fields span.comments-arrow-down,
+#content .star-rate-form .star-comment-container .comments-display-fields span.comments-arrow-up{
+  float: right;
 }
 
 .action-organization_ratings_plugin_profile-new_rating #content .star-rate-form .star-comment-container .comments-display-fields .comments-arrow-up::after {
   content: url('../images/top-arrow-black.png');
-  float: right;
   padding-top: 7px;
   padding-right: 6px;
 }
 
 .action-organization_ratings_plugin_profile-new_rating #content .star-rate-form .star-comment-container .comments-display-fields .comments-arrow-down::after {
   content: url('../images/bottom-arrow-black.png');
-  float: right;
   padding-top: 7px;
   padding-right: 6px;
 }
@@ -365,12 +373,20 @@
 
 .ratings-list .user-rating-block .star-profile-information .star-profile-name {
   line-height: 16px;
-  width: 70px;
+  width: 60px;
 }
 
-.ratings-list .star-profile-information .star-profile-image img {
-  border-radius: 4px;
+.ratings-list .star-profile-information .star-profile-image {
   height: 60px;
+  width: 60px;
+  overflow: hidden;
+  border-radius: 4px;
+  margin: auto;
+}
+
+.ratings-list .star-profile-information .star-profile-image img {
+  height: auto;
+  width: 60px;
 }
 
 .ratings-list .user-rating-block .user-testimony-container {
@@ -447,7 +463,7 @@
 
 .make-report-block .star-profile-information .star-profile-name {
   margin-top: 8px;
-  width: 70px;
+  width: 60px;
 }
 
 .ratings-list .make-report-block .make-report-container {
@@ -460,39 +476,38 @@
   font-size: 18px;
 }
 
-.ratings-list .make-report-block .make-report-container .button-bar {
+#content .ratings-list .make-report-block .make-report-container .button-bar {
   padding-top: 6px;
 }
 
-.ratings-list .make-report-block .make-report-container .alert {
+#content .ratings-list .make-report-block .make-report-container .alert {
   margin-top: 37px;
   padding-left: 1px;
 }
 
-.ratings-list .make-report-block .make-report-container .button-bar a,
-.star-rate-data .rating-cooldown .button-bar a,
-.star-rate-data .rating-vote-once .button-bar a {
+#content .ratings-list .make-report-block .make-report-container .button-bar a,
+#content .star-rate-data .rating-cooldown .button-bar a,
+#content .star-rate-data .rating-vote-once .button-bar a {
   background-color: #3E67B1;
   background-image: none;
   color: #fff;
   font-weight: 700;
   font-size: 14px;
   font-style: normal;
-  height: 31px;
-  padding: 0px 7px 0px 7px;
+  padding: 8px 12px 8px 8px;
   text-transform: uppercase;
 }
 
-.star-rate-data .rating-cooldown,
-.star-rate-data .rating-vote-once {
+#content .star-rate-data .rating-cooldown,
+#content .star-rate-data .rating-vote-once {
   font-family: Arial;
   font-size: 18px;
   font-style: italic;
   word-break: break-word;
 }
 
-.star-rate-data .rating-cooldown .button-bar a.disabled-button,
-.star-rate-data .rating-vote-once .button-bar a.disabled-button {
+#content .star-rate-data .rating-cooldown .button-bar a.disabled-button,
+#content .star-rate-data .rating-vote-once .button-bar a.disabled-button {
   cursor: not-allowed;
   opacity: 0.4;
 }
diff --git a/src/noosfero-spb/noosfero-spb-theme/images/close.png b/src/noosfero-spb/noosfero-spb-theme/images/close.png
new file mode 100644
index 0000000..e51bbb9
Binary files /dev/null and b/src/noosfero-spb/noosfero-spb-theme/images/close.png differ
diff --git a/src/noosfero-spb/noosfero-spb-theme/images/greenhide.png b/src/noosfero-spb/noosfero-spb-theme/images/greenhide.png
new file mode 100644
index 0000000..c69cd9d
Binary files /dev/null and b/src/noosfero-spb/noosfero-spb-theme/images/greenhide.png differ
diff --git a/src/noosfero-spb/noosfero-spb-theme/images/hide.png b/src/noosfero-spb/noosfero-spb-theme/images/hide.png
new file mode 100644
index 0000000..5804c92
Binary files /dev/null and b/src/noosfero-spb/noosfero-spb-theme/images/hide.png differ
diff --git a/src/noosfero-spb/noosfero-spb-theme/images/redclose.png b/src/noosfero-spb/noosfero-spb-theme/images/redclose.png
new file mode 100644
index 0000000..d65e786
Binary files /dev/null and b/src/noosfero-spb/noosfero-spb-theme/images/redclose.png differ
diff --git a/src/noosfero-spb/noosfero-spb-theme/images/show.png b/src/noosfero-spb/noosfero-spb-theme/images/show.png
new file mode 100644
index 0000000..477815e
Binary files /dev/null and b/src/noosfero-spb/noosfero-spb-theme/images/show.png differ
diff --git a/src/noosfero-spb/noosfero-spb-theme/style.css b/src/noosfero-spb/noosfero-spb-theme/style.css
index df03cbc..1f00af6 100644
--- a/src/noosfero-spb/noosfero-spb-theme/style.css
+++ b/src/noosfero-spb/noosfero-spb-theme/style.css
@@ -25,6 +25,7 @@
 @import url(css/software-catalog-page.css);
 @import url(css/tooltip.css);
 @import url(css/popover.css);
+@import url(css/notifications.css);
 
 @font-face{
   font-weight: normal;
diff --git a/src/noosfero-spb/noosfero-spb-theme/theme.js b/src/noosfero-spb/noosfero-spb-theme/theme.js
index 3ef8426..0b58260 100644
--- a/src/noosfero-spb/noosfero-spb-theme/theme.js
+++ b/src/noosfero-spb/noosfero-spb-theme/theme.js
@@ -225,11 +225,13 @@ $('#link-buscar').click(function(e) {
   }
 
   function set_use_report_content() {
-    $('.make-report-block .make-report-container .button-bar a span').html('avaliar o software');
+    $('.profile-homepage .organization-average-rating-container .rate-this-organization a').html('Avalie este software');
+    $('.make-report-block .make-report-container .button-bar a span').html('Avalie este software');
+    $('.star-rate-data .star-rate-form.rating-cooldown .button-bar a span').html('Avalie este software');
     $('.make-report-block .make-report-container .make-report-message').html('Relate sua experiência ou do órgão/empresa com relação ao software.');
     $('.ratings-list .see-more a.icon-arrow-right-p').html('veja todos os relatos');
-    $('.main-content .star-rate-data .star-rate-form .star-comment-container .button-bar input').attr('value', 'enviar relato');
-    $('.main-content .star-rate-data .star-rate-form .star-rate-text').html('Avalie o software');
+    $('.main-content .star-rate-data .star-rate-form .star-comment-container .button-bar input').attr('value', 'Enviar');
+    $('.main-content .star-rate-data .star-rate-form .star-rate-text').html('Avalie este software');
     $('.main-content .star-rate-data .star-rate-form .star-comment-container .formlabel').html('Depoimento sobre o software');
     $('.star-rate-form .star-comment-container .comments-display-fields span#comments-additional-information').html('Dados adicionais (órgãos e empresas)');
     $('.star-rate-form .star-comment-container .comments-software-extra-fields #input_institution_comments label').html('Nome do órgão ou empresa');
--
libgit2 0.21.2