diff --git a/.gitignore b/.gitignore
old mode 100644
new mode 100755
index 84e06be..c10be87
--- a/.gitignore
+++ b/.gitignore
@@ -18,4 +18,7 @@ novo.css
 novo.html
 sass/novo.scss
 sass/novo
-.bundle
\ No newline at end of file
+.bundle
+proposal_detail/
+slick-theme.css
+slick.css
\ No newline at end of file
diff --git a/Gemfile b/Gemfile
old mode 100644
new mode 100755
index f3566ef..290ae90
--- a/Gemfile
+++ b/Gemfile
@@ -1,2 +1,2 @@
 source 'https://rubygems.org'
-gem 'sass', '~> 3.4.9'
\ No newline at end of file
+gem 'sass', '~> 3.4.9'
diff --git a/Gemfile.lock b/Gemfile.lock
old mode 100644
new mode 100755
index 73f64bb..3d71325
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,10 +1,10 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    sass (3.4.9)
+    sass (3.4.13)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  sass (~> 3.4.9)
+  sass (~> 3.4.13)
diff --git a/css/bootstrap-alert.min.css b/css/bootstrap-alert.min.css
new file mode 100755
index 0000000..dec33be
--- /dev/null
+++ b/css/bootstrap-alert.min.css
@@ -0,0 +1,6 @@
+/*!
+ * Bootstrap v3.3.4 (http://getbootstrap.com)
+ * Copyright 2011-2015 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ */
+ .alert{padding:15px;margin-bottom:20px;border:1px solid transparent;border-radius:4px}.alert h4{margin-top:0;color:inherit}.alert .alert-link{font-weight:700}.alert>p,.alert>ul{margin-bottom:0}.alert>p+p{margin-top:5px}.alert-dismissable,.alert-dismissible{padding-right:35px}.alert-dismissable .close,.alert-dismissible .close{position:relative;top:-2px;right:-21px;color:inherit}.alert-success{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.alert-success hr{border-top-color:#c9e2b3}.alert-success .alert-link{color:#2b542c}.alert-info{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.alert-info hr{border-top-color:#a6e1ec}.alert-info .alert-link{color:#245269}.alert-warning{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.alert-warning hr{border-top-color:#f7e1b5}.alert-warning .alert-link{color:#66512c}.alert-danger{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.alert-danger hr{border-top-color:#e4b9c0}.alert-danger .alert-link{color:#843534}
diff --git a/images/icons/icon-facebook-contrast.png b/images/icons/icon-facebook-contrast.png
new file mode 100755
index 0000000..f3ce6fc
Binary files /dev/null and b/images/icons/icon-facebook-contrast.png differ
diff --git a/images/icons/icon-facebook-disabled.png b/images/icons/icon-facebook-disabled.png
new file mode 100755
index 0000000..1c2aa40
Binary files /dev/null and b/images/icons/icon-facebook-disabled.png differ
diff --git a/images/icons/icon-facebook.png b/images/icons/icon-facebook.png
new file mode 100755
index 0000000..08bb715
Binary files /dev/null and b/images/icons/icon-facebook.png differ
diff --git a/images/icons/icon-gplus-contrast.png b/images/icons/icon-gplus-contrast.png
new file mode 100755
index 0000000..513ffeb
Binary files /dev/null and b/images/icons/icon-gplus-contrast.png differ
diff --git a/images/icons/icon-gplus-disabled.png b/images/icons/icon-gplus-disabled.png
new file mode 100755
index 0000000..781661d
Binary files /dev/null and b/images/icons/icon-gplus-disabled.png differ
diff --git a/images/icons/icon-gplus.png b/images/icons/icon-gplus.png
new file mode 100755
index 0000000..5bb7b88
Binary files /dev/null and b/images/icons/icon-gplus.png differ
diff --git a/images/icons/icon-twitter-contrast.png b/images/icons/icon-twitter-contrast.png
new file mode 100755
index 0000000..d0c9734
Binary files /dev/null and b/images/icons/icon-twitter-contrast.png differ
diff --git a/images/icons/icon-twitter-disabled.png b/images/icons/icon-twitter-disabled.png
new file mode 100755
index 0000000..471a1bd
Binary files /dev/null and b/images/icons/icon-twitter-disabled.png differ
diff --git a/images/icons/icon-twitter.png b/images/icons/icon-twitter.png
new file mode 100755
index 0000000..7c4144c
Binary files /dev/null and b/images/icons/icon-twitter.png differ
diff --git a/images/icons/icon-whatsapp-contrast.png b/images/icons/icon-whatsapp-contrast.png
new file mode 100755
index 0000000..c384a8b
Binary files /dev/null and b/images/icons/icon-whatsapp-contrast.png differ
diff --git a/images/icons/icon-whatsapp-disabled.png b/images/icons/icon-whatsapp-disabled.png
new file mode 100755
index 0000000..bf4a785
Binary files /dev/null and b/images/icons/icon-whatsapp-disabled.png differ
diff --git a/images/icons/icon-whatsapp.png b/images/icons/icon-whatsapp.png
new file mode 100755
index 0000000..a7a04d1
Binary files /dev/null and b/images/icons/icon-whatsapp.png differ
diff --git a/index.html b/index.html
index 06c2a5c..34b0856 100644
--- a/index.html
+++ b/index.html
@@ -43,6 +43,7 @@
       function loadCSSFiles(){
         var css_files = [
           'css/bootstrap.min.css',
+          'css/bootstrap-alert.min.css',
           'css/hover.custom.css',
           'http://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css',
           'http://fonts.googleapis.com/css?family=Open+Sans:400,300,700',
@@ -88,15 +89,15 @@
 
 
     <div class="container">
-      <div id="proposal-result" class="row"></div>
+      <div id="proposal-result"></div>
     </div>
 
     <script id="proposal-template" type="text/x-handlebars-template">
       <header>
         <h1><a href="#">{{article.title}}</a></h1>
         <a id="display-contrast" href="#">Alto Contraste</a>
-        <div class="social">
-          <a href="#" class="fb-share" data-description="Aqui suas ideias viram propostas e você ajuda a melhorar as ações do governo">Compartilhar</a>
+        <div class="social top">
+          {{#social_share "Dialoga Brasil" "Aqui suas ideias viram propostas e você ajuda a melhorar as ações do governo" "#"}}{{/social_share}}
         </div>
       </header>
 
@@ -104,7 +105,7 @@
         {{{article.abstract}}}
       </div>
 
-      <nav role="tabpanel">
+      <nav class="tab" role="tabpanel">
         <ul role="tablist">
           <li id="nav-proposal-categories" role="presentation">
             <a href="#/temas" class="active" role="tab" aria-controls="proposal-categories">Por Temas</a>
@@ -118,10 +119,10 @@
       <article id="proposal-categories">
         <div id="proposal-categories-container">
           <nav>
-            <ul>
+            <ul class="themes">
             {{#each article.categories}}
               <li id="proposal-category-{{slug}}" class="proposal-category" data-category="{{slug}}">
-                <a href="#/temas/{{slug}}/{{id}}" class="proposal-link hvr-float-shadow" data-target="proposal-item-{{id}}">{{name}}</a>
+                <a href="#/temas/{{slug}}/{{id}}" class="proposal-link hvr-float-shadow " data-target="proposal-item-{{id}}">{{name}}</a>
                 <div class="arrow-box" style="display: none"></div>
               </li>
             {{/each}}
@@ -162,27 +163,24 @@
               <header class="select">
                 {{#each categories}}
                   <div class="category proposal-category" data-category="{{slug}}">
-                    <a href="#/temas/{{slug}}/{{id}}" class="proposal-link" data-target="proposal-item-{{id}}">{{name}}</a>
-                    <button class="go-back btn btn-default pull-right">
-                      VOLTAR
+                    <button class="go-back btn btn-default">
                       <span class="fa fa-reply"></span>
+                      Voltar
                     </button>
+                    <a href="#/temas/{{slug}}/{{id}}" class="proposal-link" data-target="proposal-item-{{id}}">{{name}}</a>
                     {{#select_proposal ../../article.children slug ../id}}{{/select_proposal}}
                   </div>
                 {{/each}}
               </header>
 
-              <div class="social">
-                <a href="#" class="fb-share" data-caption="{{title}}" data-description="{{stripTags abstract}}">Compartilhar</a>
-              </div>
               <div class="proposal-header">
                 <div class="abstract">
                   <img src="{{../host}}{{image.url}}" alt="Imagem de apresentação do programa."/>
                 </div>
                 <div class="title">{{title}}</div>
                 <div class="abstract">{{{abstract}}}</div>
-                <div class="show_body">
-                  <a href="#/programas/{{id}}/sobre-o-programa"><span>Conheça o Programa</span></a>
+                <div class="show_body row">
+                  <a class="col-sm-6 col-sm-offset-3" href="#/programas/{{id}}/sobre-o-programa"><span>Conheça o programa</span></a>
                 </div>
               </div>
 
@@ -192,12 +190,20 @@
                 </div>
 
                 <div class="container">
-                  <div class="col-sm-4 col-sm-offset-4">
-                    <div class="go-to-proposal-button">
-                      <a href="#/programas/{{id}}" data-target="proposal-item-{{id}}" class="button button-participe">
-                        <span class="fa fa-reply"></span>
-                        Participe
-                      </a>
+                  <div class="row">
+                    <div class="col-sm-4">
+                      <div class="go-to-proposal-button">
+                        <a href="#/programas/{{id}}" data-target="proposal-item-{{id}}" class="button button-participe">
+                          <span class="fa fa-reply"></span>
+                          Participe
+                        </a>
+                      </div>
+                    </div>
+                    <div class="col-sm-4 col-sm-offset-4">
+                      <div class="social right">
+                        <span>COMPARTILHE<br>ESTE PROGRAMA</span>
+                        {{#social_share title abstract '#'}}{{/social_share}}
+                      </div>
                     </div>
                   </div>
                 </div>
@@ -208,10 +214,10 @@
                   <section class="make-proposal box box-propostas">
                     <div class="container-title box-title">Faça Uma Proposta</div>
                     <div class="subtitle box-subtitle">Qual a sua sugestão para melhorar este programa?</div>
-                    <div class="info">Esta consulta termina em julho de 2015. Até lá, todas as propostas serão lidas e as cinco mais pontuadas em cada programa receberão resposta oficial do governo.</div>
-                    <div class="send-proposal-button send-button box-footer"><a href="#" class="button button-send"><span>Envie Sua Proposta</span></a></div>
+                    <div class="info box-info">Esta consulta termina em julho de 2015. Até lá, todas as propostas serão lidas e as cinco mais pontuadas em cada programa receberão resposta oficial do governo.</div>
+                    <div class="send-proposal-button send-button box-footer"><a href="#" class="button button-send"><span>Envie sua proposta</span></a></div>
                     <div class="login-container hide">Login</div>
-                    <form class="make-proposal-form save-article-form hide" id="make-proposal-form-{{id}}" action="{{proposal_action ../article . }}" method="post">
+                    <form class="make-proposal-form save-article-form require-login hide" id="make-proposal-form-{{id}}" action="{{proposal_action ../article . }}" method="post">
                       <div class="message hide"></div>
                       <div>
                         <div><label for="article_abstract">Descrição</label></div>
@@ -230,15 +236,22 @@
                 </div>
                 <div class="support-proposal-container col-sm-6">
                   <section class="support-proposal box box-propostas box-center">
-                    <div class="container-title box-title"> Apoie outras propostas</div>
-                    <div class="random-proposal"></div>
-                    <div class="loading">Carregando...</div>
-                    <div class="no-proposals">Ainda não existe nenhuma proposta para este programa.</div>
+                    <div class="container-title box-title">Apoie outras propostas</div>
+                    <div class="alert alert-warning hide" role="alert">
+                      <i class="fa fa-warning"></i><strong>Proposta não encontrada</strong>
+                    </div>
+                    <div class="support-proposal-content require-login">
+                      <div class="random-proposal"></div>
+                      <div class="loading">Carregando...</div>
+                      <div class="no-proposals">Ainda não existe nenhuma proposta para este programa.</div>
+                    </div>
+                    <div class="login-container hide">Login</div>
+                    <div class="send-button"><a href="#"><span>Login</span></a></div>
                   </section>
                 </div>
               </div>
 
-              <div class="results-container hide boxbox-propostas "></div>
+              <div class="results-container hide box box-propostas "></div>
 
               <div class="row">
                 <section class="talk-proposal-container col-sm-12">
@@ -288,7 +301,8 @@
         <a href="#" class="vote-result box-bottom">Resultados</a>
       </div>
       <div class="social">
-        <a href="#/programas/{{parent.id}}/propostas/{{id}}" class="fb-share" data-caption="{{parent.title}}" data-description="{{stripTags abstract}}">Compartilhar</a>
+        <span>Compartilhe esta proposta</span>
+        {{{social_share parent.title abstract (proposal_url parent.id id)}}}
       </div>
     </script>
 
@@ -329,6 +343,12 @@
       <div class="loading">Carregando...</div>
       <form id="login-form" class="login">
         <div class="message hide"></div>
+        <div class="row">
+          <div class="col-sm-4">
+            <a href="#" class="new-user button">Cadastre-se</a>
+          </div>
+        </div>
+        <p>Ou acesse:</p>
         <div class="username">
           <label for="user_name" class="label">Nome de Usuário / E-mail:</label>
           <input id="user_name" name="login" type="text" placeholder="Nome do usuário / E-mail">
@@ -337,15 +357,16 @@
           <label for="user_password" class="label">Senha:</label>
           <input id="user_password" name="password" type="password" placeholder="Senha">
         </div>
-        <div class="actions">
-          <input type="submit" class="login-action" value="Acessar"/>
-          <a href="http://www.participa.br/account/forgot_password" target="_blank" class="forgot-password">Esqueci minha senha</a>
-        </div>
-        <div class="oauth">
-          <div class="label">Acessar com:</div>
-          <a href="http://www.participa.br/plugin/oauth_client/facebook?oauth_client_popup=true&id=1" target="_blank" class="facebook oauth-login">Facebook</a>
-          <a href="http://www.participa.br/plugin/oauth_client/google_oauth2?oauth_client_popup=true&id=2" target="_blank" class="google oauth-login">Google +</a>
-          <a href="#" class="new-user">Cadastrar</a>
+        <div class="row">
+          <div class="actions col-sm-4">
+            <input type="submit" class="login-action button col-sm-12" value="Acessar"/>
+            <a href="http://www.participa.br/account/forgot_password" target="_blank" class="forgot-password">Esqueci minha senha</a>
+          </div>
+          <div class="oauth col-sm-8">
+            <span class="label">Ou acesse usando <i>&raquo;</i></span>
+            <a href="http://www.participa.br/plugin/oauth_client/facebook?oauth_client_popup=true&id=1" target="_blank" class="facebook oauth-login icon icon-facebook">Facebook</a>
+            <a href="http://www.participa.br/plugin/oauth_client/google_oauth2?oauth_client_popup=true&id=2" target="_blank" class="google oauth-login icon icon-gplus">Google +</a>
+          </div>
         </div>
       </form>
       <form id="signup-form" class="signup hide" autocomplete="off">
@@ -373,6 +394,14 @@
       </form>
     </script>
 
+    <script id="social-share" type="text/x-handlebars-template">
+      <ul>
+        <li><a href="{{url}}" class="fb-share icon icon-facebook" data-caption="{{title}}" data-description="{{stripTags description}}">Compartilhar no Facebook</a></li>
+        <li><a href="https://twitter.com/intent/tweet?url={{encodeURI url}}&text={{stripTags description}}" class="tw-share icon icon-twitter popup">Compartilhar no Twitter</a></li>
+        <li><a href="https://plus.google.com/share?url={{encodeURI url}}" class="gp-share icon icon-gplus popup">Compartilhar no Google Plus</a></li>
+        <li><a href="whatsapp://send?text={{stripTags description}}" class="ws-share icon icon-whatsapp">Compartilhar no WhatsApp</a></li>
+      </ul>
+    </script>
 
     <script type='text/javascript'	>
       loadRequireJS();
diff --git a/js/handlebars-helpers.js b/js/handlebars-helpers.js
index 754265e..4bdd314 100644
--- a/js/handlebars-helpers.js
+++ b/js/handlebars-helpers.js
@@ -94,6 +94,23 @@ define(['handlebars'], function(Handlebars){
     return +(Math.round(num + "e+2")  + "e-2");
   });
 
+  Handlebars.registerHelper('social_share', function(title, description, url) {
+    var template = Handlebars.compile($('#social-share').html());
+    if(url==='#') {
+      url = '';
+    }
+    url = 'http:'+Url.addBaseUrl(url);
+    return template({title: title, description: description, url: url});
+  });
+
+  Handlebars.registerHelper('proposal_url', function(parent_id, id) {
+    return "#/programas/"+parent_id+"/propostas/"+id;
+  });
+
+  Handlebars.registerHelper('encodeURI', function(uri) {
+    return encodeURIComponent(uri);
+  });
+
   function proposal_has_category(proposal, category_slug) {
     for(var i=0; i<proposal.categories.length; i++) {
       if(proposal.categories[i].slug == category_slug)
diff --git a/js/main.js b/js/main.js
index 5f108f0..eec9288 100644
--- a/js/main.js
+++ b/js/main.js
@@ -20,14 +20,10 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F
   var participa = true;
   if(participa){
     var host = 'http://www.participa.br';
-    var private_token = '375bee7e17d0021af7160ce664874618';  //participa
     var proposal_discussion = '92856'; //participa
   }else{
     var host = 'http://noosfero.com:3000';
-    //var private_token = 'bd8996155f5ea4354e42fee50b4b6891'; //casa
-    var private_token = 'aae32bf5031e895b00a20a529d763b31'; //local serpro
     var proposal_discussion = '632'; //local serpro
-    //var proposal_discussion = '401'; //casa
   }
 
   var BARRA_ADDED = false;
@@ -36,7 +32,22 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F
   Main = (function(){
 
     return {
-      loadRandomProposal: function (topic_id, private_token) {
+      private_token: '375bee7e17d0021af7160ce664874618',
+      getProposalId: function() {
+        var regexProposals = /\d.*\/propostas\/*.*/;
+        var proposalId = 0;
+
+        var hasProposal = regexProposals.test(location.hash);
+        if( hasProposal ){
+          var regexExtractProposal = /propostas\/*.*/;
+          proposalId = regexExtractProposal.exec(location.hash)[0].split('/')[1];
+
+        }
+
+        return proposalId;
+      },
+      loadRandomProposal: function (topic_id) {
+          var private_token = Main.private_token;
           var $noProposals = $('.no-proposals');
           var $loading = $('.loading');
           var $randomProposal = $('.random-proposal');
@@ -48,10 +59,19 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F
           $loading.show();
           $randomProposal.html('');
 
-          var url = host + '/api/v1/articles/' + topic_id + '/children' + '?private_token=' + private_token + '&limit=1&order=random()&_='+new Date().getTime()+'&fields=id,name,abstract,created_by&content_type=ProposalsDiscussionPlugin::Proposal';
+          var url = host + '/api/v1/articles/' + topic_id + '/children';
+          var childId = this.getProposalId();
+
+          if(childId != 0){
+            url += '/'+childId;
+          }
+          url += '?private_token=' + Main.private_token + '&limit=1&order=random()&_='+new Date().getTime()+'&fields=id,name,abstract,created_by&content_type=ProposalsDiscussionPlugin::Proposal';
+
           $.getJSON(url).done(function( data ) {
             $loading.hide();
+            $('.support-proposal .alert').hide();
 
+            data.articles = data.articles || [data.article];
             if(data.articles.length === 0) {
               $noProposals.show();
               return;
@@ -63,7 +83,7 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F
             $randomProposal.html(supportProposalTemplate(article));
             $body.off('click', '.vote-actions .skip');
             $body.on('click', '.vote-actions .skip', function(e) {
-              contextMain.loadRandomProposal(topic_id, private_token);
+              contextMain.loadRandomProposal(topic_id);
               e.preventDefault();
             });
             $body.off('click', '.vote-actions .like');
@@ -71,20 +91,27 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F
               //Helps to prevent more than one vote per proposal
               if(ProposalApp.hasProposalbeenVoted(article.id)){
                 console.log("Proposta " + article.id + " já havia sido votada");
-                contextMain.loadRandomProposal(topic_id, private_token);
+                contextMain.loadRandomProposal(topic_id);
                 e.preventDefault();
                 return;
               }
+
+              if(!logged_in) {
+                $(this).closest('.support-proposal').find('.send-button a').click();
+                e.preventDefault();
+                return;
+              }
+
               $.ajax({
                 type: 'post',
                 url: host + '/api/v1/articles/' + article.id + '/vote',
                 data: {
                   value: $(this).data('vote-value'),
-                  private_token: private_token
+                  private_token: Main.private_token
                 }
               }).done(function( /*data*/ ) {
                 ProposalApp.addVotedProposal(article.id);
-                contextMain.loadRandomProposal(topic_id, private_token);
+                contextMain.loadRandomProposal(topic_id);
               });
               e.preventDefault();
             });
@@ -104,6 +131,9 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F
               }
               e.preventDefault();
             });
+          }).fail(function(){
+            $loading.hide();
+            $('.support-proposal .alert').show();
           });
         },
 
@@ -112,7 +142,7 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F
           $resultsContainer.find('.results-content').hide();
 
           var per_page = 10;
-          var url = host + '/api/v1/proposals_discussion_plugin/' + topic_id + '/ranking' + '?private_token=' + private_token + '&per_page='+per_page+'&page='+page;
+          var url = host + '/api/v1/proposals_discussion_plugin/' + topic_id + '/ranking' + '?private_token=' + Main.private_token + '&per_page='+per_page+'&page='+page;
           $.getJSON(url).done(function( data, stats, xhr ) {
             data.pagination = {
               total: parseInt(xhr.getResponseHeader('Total')),
@@ -156,14 +186,14 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F
 
           if(logged_in) {
             if(token){
-              private_token = token;
+              Main.private_token = token;
             }
-            loginButton.siblings('.save-article-form').show();
-            loginButton.siblings('.save-article-form .message').show();
+            loginButton.siblings('.require-login').show();
+            loginButton.siblings('.require-login .message').show();
             loginButton.siblings('.login-container').hide();
-            $.cookie('_dialoga_session', private_token);
+            $.cookie('_dialoga_session', Main.private_token);
           } else {
-            loginButton.siblings('.save-article-form').hide();
+            loginButton.siblings('.require-login').hide();
             loginButton.siblings('.login-container').show();
           }
         },
@@ -218,7 +248,7 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F
           $proposal.find('.calendar').slick();
 
           var topic_id = proposal_id.split('-').pop();
-          this.loadRandomProposal(topic_id, private_token);
+          this.loadRandomProposal(topic_id);
         },
         display_proposal_detail: function(proposal_id){
           $('#proposal-categories').hide();
@@ -236,7 +266,7 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F
           $proposal.find('.body').show();
           $proposal.show();
 
-          var url = host + '/api/v1/articles/' + proposal_id + '?private_token=' + private_token + '&fields=id,body&content_type=ProposalsDiscussionPlugin::Topic';
+          var url = host + '/api/v1/articles/' + proposal_id + '?private_token=' + Main.private_token + '&fields=id,body&content_type=ProposalsDiscussionPlugin::Topic';
           $.getJSON(url).done(function( data ) {
             $('#proposal-item-' + proposal_id + ' .body-content').replaceWith(data.article.body);
           })
@@ -389,7 +419,7 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F
             // show the 'index' -> category tab
             this.display_category_tab();
 
-            
+
             // if(navOffset){
             //   scrollTop = navOffset.top;
             // }
@@ -435,12 +465,12 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F
   })();
 
   // Load data from localhost when it is dev env.
-  var noosferoAPI = host + '/api/v1/articles/' + proposal_discussion + '?private_token=' + private_token + '&fields=id,children,categories,abstract,title,image,url,setting,position';
+  var noosferoAPI = host + '/api/v1/articles/' + proposal_discussion + '?private_token=' + Main.private_token + '&fields=id,children,categories,abstract,title,image,url,setting,position';
 
   $.getJSON(noosferoAPI)
     .done(function( data ) {
       data.host = host;
-      data.private_token = private_token;
+      data.private_token = Main.private_token;
       resultsPlaceholder.innerHTML = template(data);
       $('.login-container').html(loginTemplate());
       $('.countdown').maxlength({text: '%left caracteres restantes'});
@@ -583,7 +613,7 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F
         $.ajax({
           type: 'post',
           url: host + $form.attr('action'),
-          data: $('#'+this.id).serialize() + '&private_token=' + private_token + '&fields=id&article[name]=article_' + Main.guid()
+          data: $('#'+this.id).serialize() + '&private_token=' + Main.private_token + '&fields=id&article[name]=article_' + Main.guid()
         })
         .done(function( /*data*/ ) {
           form.reset();
@@ -612,14 +642,14 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F
 
 
   $(document).ready(function($) {
-    
+
     FastClick.attach(document.body);
 
     if($.cookie('_dialoga_session')) {
       var url = host + '/api/v1/users/me?private_token=' + $.cookie('_dialoga_session');
       $.getJSON(url).done(function( /*data*/ ) {
         logged_in = true;
-        private_token = $.cookie('_dialoga_session');
+        Main.private_token = $.cookie('_dialoga_session');
       });
     }
 
@@ -645,11 +675,6 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F
 
     $(document).on('click', '.social .fb-share', function(e) {
       var link = $(this).attr('href');
-      if(link==='#' || link ==='') {
-        link = window.location.href;
-      } else {
-        link = 'http:'+Url.addBaseUrl(link);
-      }
       FB.ui({
           method: 'feed',
           link: link,
@@ -700,6 +725,30 @@ define(['handlebars', 'fastclick', 'handlebars_helpers'], function(Handlebars, F
       });
       e.preventDefault();
     });
+
+    var popupCenter = function(url, title, w, h) {
+      var dualScreenLeft = window.screenLeft !== undefined ? window.screenLeft : screen.left;
+      var dualScreenTop = window.screenTop !== undefined ? window.screenTop : screen.top;
+
+      var width = window.innerWidth ? window.innerWidth : document.documentElement.clientWidth ? document.documentElement.clientWidth : screen.width;
+      var height = window.innerHeight ? window.innerHeight : document.documentElement.clientHeight ? document.documentElement.clientHeight : screen.height;
+
+      var left = ((width / 2) - (w / 2)) + dualScreenLeft;
+      var top = ((height / 3) - (h / 3)) + dualScreenTop;
+
+      var newWindow = window.open(url, title, 'scrollbars=yes, width=' + w + ', height=' + h + ', top=' + top + ', left=' + left);
+
+      // Puts focus on the newWindow
+      if (window.focus) {
+        newWindow.focus();
+      }
+    };
+
+    $(document).on('click', '.social a.popup', {}, function popUp(e) {
+      var self = $(this);
+      popupCenter(self.attr('href'), self.find('.rrssb-text').html(), 580, 470);
+      e.preventDefault();
+    });
   });
 
   window.addEventListener("message", function(ev) {
diff --git a/novo.css b/novo.css
index 998bc9a..01884c6 100644
--- a/novo.css
+++ b/novo.css
@@ -5,10 +5,16 @@ body {
   font-weight: 300; }
 
 h1 {
+  border-bottom: 1px solid #000;
+  bottom: 0;
   font-family: asap, sans;
   font-size: 28px;
   font-weight: 500;
-  text-transform: uppercase; }
+  margin: 0;
+  padding: 20px 0;
+  position: absolute;
+  text-transform: uppercase;
+  width: 100%; }
 
 h2 {
   border-bottom: 1px solid;
@@ -31,12 +37,24 @@ h4 {
   font-size: 34px;
   font-weight: 500; }
 
+header {
+  position: relative;
+  height: 100px; }
+
 .container, .row {
   margin-bottom: 20px; }
 
+#content p {
+  font-family: asap, sans;
+  margin-bottom: 60px;
+  margin-left: 20px;
+  margin-right: 20px;
+  margin-top: 20px; }
+
 .button {
   background-color: #000;
-  border-radius: 5px;
+  border: 0;
+  border-radius: 6px;
   color: #fff;
   cursor: pointer;
   display: block;
@@ -45,7 +63,7 @@ h4 {
   padding: 20px 0;
   text-align: center;
   text-transform: uppercase;
-  transition: all 200ms; }
+  transition: all 400ms; }
   .button:hover {
     background-color: #333333;
     text-decoration: none; }
@@ -60,26 +78,140 @@ h4 {
     margin-right: 10px; }
 
 .btn {
-  background-color: #fff;
-  border-radius: 0;
-  border: 1px solid #ccc;
-  color: #000;
-  line-height: 3.1;
+  background-color: transparent;
+  border: 0;
+  color: #fff;
   font-size: 14px;
-  padding: 6px 12px; }
+  padding-bottom: 0;
+  padding-left: 10px;
+  padding-right: 10px;
+  padding-top: 0;
+  vertical-align: middle; }
+
+.icon {
+  background-color: transparent !important;
+  background-repeat: no-repeat;
+  background-position: 50% !important;
+  background-size: auto !important;
+  border: 0 !important;
+  display: inline-block;
+  height: 36px;
+  min-width: 0 !important;
+  padding: 0 !important;
+  text-align: left;
+  text-indent: -999999px;
+  width: 36px; }
+  .icon-facebook {
+    background-image: url(images/icons/icon-facebook.png) !important; }
+    .icon-facebook.disabled {
+      background-image: url(images/icons/icon-facebook-disabled.png) !important; }
+  .icon-twitter {
+    background-image: url(images/icons/icon-twitter.png) !important; }
+    .icon-twitter.disabled {
+      background-image: url(images/icons/icon-twitter-disabled.png) !important; }
+  .icon-gplus {
+    background-image: url(images/icons/icon-gplus.png) !important; }
+    .icon-gplus.disabled {
+      background-image: url(images/icons/icon-gplus-disabled.png) !important; }
+  .icon-whatsapp {
+    background-image: url(images/icons/icon-whatsapp.png) !important; }
+    .icon-whatsapp.disabled {
+      background-image: url(images/icons/icon-whatsapp-disabled.png) !important; }
+
+.social {
+  position: relative;
+  z-index: 1; }
+  .social.top {
+    margin-top: 45px;
+    float: right; }
+  .social.right {
+    padding-top: 10px; }
+    .social.right span {
+      display: inline-block;
+      font-size: 12px;
+      font-weight: 300;
+      padding-right: 10px;
+      text-align: right;
+      vertical-align: middle; }
+    .social.right ul {
+      display: inline-block;
+      vertical-align: middle; }
+  .social span {
+    display: block;
+    margin-bottom: 10px; }
+  .social ul {
+    list-style: none;
+    padding-left: 0; }
+  .social li {
+    display: inline-block;
+    padding: 0 2px !important; }
+
+.tab {
+  margin-top: 20px; }
+  .tab ul {
+    font-size: 0;
+    list-style: none;
+    margin-bottom: 0;
+    padding-left: 0; }
+  .tab li {
+    display: inline-block;
+    font-size: 16px;
+    width: 50%; }
+  .tab a {
+    background-color: #efefef;
+    border-bottom: 1px solid #000;
+    color: #000;
+    display: block;
+    font-weight: 700;
+    padding-bottom: 20px;
+    padding-left: 5px;
+    padding-right: 5px;
+    padding-top: 20px;
+    text-align: center;
+    text-transform: uppercase; }
+  .tab .active {
+    background-color: #fff;
+    border-bottom: 1px solid #fff;
+    border-left: 1px solid #000;
+    border-right: 1px solid #000;
+    border-top: 1px solid #000; }
+
+.themes {
+  font-size: 0;
+  text-align: center; }
+  .themes li {
+    display: inline-block;
+    font-size: 16px;
+    width: 140px;
+    margin: 10px; }
+  .themes a {
+    background-color: #000;
+    border-radius: 6px;
+    color: #fff;
+    display: block;
+    font-family: asap, sans;
+    font-size: 14px;
+    font-weight: 700;
+    padding-bottom: 5px;
+    padding-top: 110px; }
+    .themes a:hover {
+      text-decoration: none; }
 
 #proposal-categories, #proposal-group {
   border-bottom: 1px solid #000;
   border-left: 1px solid #000;
   border-right: 1px solid #000;
-  padding: 20px 20px 0; }
+  padding-bottom: 0;
+  padding-left: 20px;
+  padding-right: 20px;
+  padding-top: 10px; }
   #proposal-categories ul, #proposal-group ul {
     list-style: none;
     padding-left: 0; }
 
 .proposal-container {
   background-color: #ccc;
-  border-radius: 5px;
+  border-radius: 6px;
   padding-bottom: 10px;
   padding-left: 20px;
   padding-right: 20px;
@@ -101,13 +233,14 @@ h4 {
 .box {
   background-color: #fff;
   border: 1px solid gray;
-  border-radius: 5px;
+  border-radius: 6px;
   color: #000;
   display: block;
   height: 200px;
   margin-top: 30px;
+  overflow: auto;
   padding: 20px;
-  transition: all 200ms; }
+  transition: all 400ms; }
   .box:hover {
     background-color: #e6e6e6;
     color: #000;
@@ -122,8 +255,14 @@ h4 {
     height: 500px;
     border: 1px solid;
     margin-bottom: 10px;
+    margin-top: 0;
     padding: 20px;
     position: relative; }
+    .box-propostas:hover {
+      background-color: #fff; }
+    .box-propostas p {
+      border-bottom: 0;
+      padding-bottom: inherit; }
   .box-header {
     font-family: asap, sans;
     font-size: 24px;
@@ -145,22 +284,27 @@ h4 {
     font-size: 38px;
     font-weight: 400;
     margin-bottom: 20px; }
-  .box-subtitle {
+  .box-subtitle, .box-propostas p {
     font-size: 24px;
     font-weight: 700;
     line-height: 1.2;
     margin-bottom: 20px; }
+  .box-info {
+    margin-bottom: 20px; }
   .box-footer, .box-bottom {
-    position: absolute;
-    bottom: 40px;
-    margin-left: -30%;
-    left: 50%;
-    width: 60%; }
+    margin-bottom: 5px;
+    margin-left: auto;
+    margin-right: auto;
+    margin-top: 20px;
+    width: 40%; }
   .box-bottom {
     bottom: 10px;
     color: #000;
+    display: inline-block;
     font-size: 14px;
     font-weight: 700;
+    margin-bottom: 15px;
+    margin-top: 0;
     text-align: center; }
     .box-bottom:hover, .box-bottom:focus {
       color: #000; }
@@ -169,23 +313,26 @@ h4 {
 
 .select {
   background-color: #000;
-  margin-bottom: 10px; }
+  margin-bottom: 10px;
+  padding: 5px; }
   .select .proposal-link {
     color: #fff;
     display: inline-block;
-    font-size: 19px;
+    font-size: 24px;
     font-weight: 700;
-    padding-bottom: 15px;
-    padding-left: 50px;
-    padding-right: 15px;
-    padding-top: 15px;
-    text-transform: uppercase; }
+    padding-bottom: 0;
+    padding-left: 45px;
+    padding-right: 0;
+    padding-top: 0;
+    vertical-align: middle; }
   .select .proposal-selection {
     background-color: #fff;
     border: 0;
+    border-radius: 3px;
     float: right;
-    height: 57px;
-    width: 60%; }
+    margin: 4px;
+    width: 60%;
+    vertical-align: middle; }
 
 .proposal-header {
   position: relative; }
@@ -207,43 +354,23 @@ h4 {
     width: 50%;
     vertical-align: middle; }
   .proposal-header .show_body {
-    background-color: #000;
-    border-radius: 5px;
-    cursor: pointer;
-    margin-bottom: 10px;
-    margin-left: auto;
-    margin-right: auto;
-    margin-top: 10px;
-    padding-bottom: 30px;
-    padding-left: 0;
-    padding-right: 0;
-    padding-top: 30px;
-    text-align: center;
-    transition: all 200ms;
-    width: 100%; }
-    .proposal-header .show_body:hover {
-      background-color: #333333;
-      text-decoration: none; }
-    .proposal-header .show_body:hover span {
-      background-color: #333333; }
+    margin-bottom: 20px;
+    margin-top: 20px; }
     .proposal-header .show_body a {
-      background: url(images/white-line.png) left center repeat-x;
+      background-color: #000;
+      border-radius: 6px;
       color: #fff;
-      display: inline-block;
       font-size: 38px;
       font-weight: 700;
-      margin: 0 auto;
-      text-transform: uppercase;
-      width: 70%; }
+      padding-bottom: 10px;
+      padding-left: 0;
+      padding-right: 0;
+      padding-top: 10px;
+      text-align: center;
+      transition: all 400ms; }
       .proposal-header .show_body a:hover {
+        background-color: #333333;
         text-decoration: none; }
-    .proposal-header .show_body span {
-      background-color: #000;
-      padding-bottom: 5px;
-      padding-left: 15px;
-      padding-right: 15px;
-      padding-top: 5px;
-      transition: all 200ms; }
   .proposal-header img {
     width: 100%; }
   .proposal-header p {
@@ -253,6 +380,28 @@ h4 {
     padding-top: 5px;
     text-transform: none; }
 
+.login {
+  text-align: left; }
+  .login input {
+    display: block;
+    margin-bottom: 20px;
+    width: 100%; }
+    .login input.button {
+      margin-bottom: 5px; }
+  .login .label {
+    vertical-align: middle; }
+  .login .icon {
+    vertical-align: middle; }
+  .login .oauth {
+    margin-top: 10px;
+    text-align: right; }
+  .login .forgot-password {
+    display: block;
+    font-size: 14px;
+    text-align: center; }
+  .login i {
+    font-style: normal; }
+
 .vote-actions .like {
   background: url(images/like.png) no-repeat;
   display: inline-block;
@@ -311,9 +460,9 @@ h4 {
   .paging .current {
     background-color: #333333; }
   .paging .next {
-    border-radius: 0 5px 5px 0; }
+    border-radius: 0 6px 6px 0; }
   .paging .prev {
-    border-radius: 5px 0 0 5px; }
+    border-radius: 6px 0 0 6px; }
 
 .slick-slider {
   list-style: none;
diff --git a/sass/_proposal_detail.scss b/sass/_proposal_detail.scss
old mode 100644
new mode 100755
index 08c8b26..3947680
--- a/sass/_proposal_detail.scss
+++ b/sass/_proposal_detail.scss
@@ -7,17 +7,18 @@
   li {
     a {
       text-decoration: none;
-      text-transform: uppercase;
-      padding: 15px 15px 15px 50px;
+      // text-transform: uppercase;
+      padding: 0 0 0 45px;
       margin: 0;
       width: 30%;
       min-width: 210px;
       display: inline-block;
+      vertical-align: middle;
       span {
         padding-left: 40px;
       }
       font: {
-        size: larger;
+        size: 24px;
         weight: bold;
       }
       background-size: 32px;
@@ -27,13 +28,16 @@
 
   .categories {
     select {
-      height: 57px;
+      // height: 57px;
       width: 60%;
       margin: 0;
       text-transform: uppercase;
       border: 0;
-      background: #EEEFF1;
+      background: #fff;
       float: right;
+      vertical-align: middle;
+      margin: 4px;
+      border-radius: 3px;
     }
 
     .proposal-header {
@@ -65,30 +69,27 @@
       }
 
       .show_body {
-        width: 100%;
-        padding: 30px 0;
+        // width: 100%;
+        // padding: 30px 0;
         margin: 10px auto;
         text-align: center;
         cursor: pointer;
-        -webkit-border-radius: 6px;
-        -moz-border-radius: 6px;
-        border-radius: 6px;
 
 
         a {
-          display: inline-block;
-          width: 70%;
+          // display: inline-block;
+          // width: 70%;
           text-decoration: none;
           color: #fff;
           font-size: 38px;
-          font-weight: bold;
-          text-transform: uppercase;
-          margin: 0 auto;
+          font-weight: 500;
+          // text-transform: uppercase;
+          // margin: 0 auto;
           text-align: center;
         }
 
         span {
-          padding: 5px 15px;
+          // padding: 5px 15px;
         }
       }
     }
@@ -103,7 +104,7 @@
         li {
           background: $color;
           list-style: none;
-          padding: 0;
+          padding: 5px;
           a {
             min-width: 0;
             width: auto;
@@ -249,31 +250,17 @@
           background: darken($color, 15%);
         }
         .show_body {
-          background: $color;
-          // background: $color url(images/black-alpha.png);
-          // border-top: 5px solid $color;
-          transition: background-color .2s;
-
-          &:hover,
-          &:focus {
-            background-color: saturate( lighten($color, 5%), 10% );
-            // -webkit-box-shadow: 0 2px 5px rgba(0,0,0,.5);
-            // -moz-box-shadow: 0 2px 5px rgba(0,0,0,.5);
-            // box-shadow: 0 2px 5px rgba(0,0,0,.5);
-
-            span {
-              background-color: saturate( lighten($color, 5%), 10% );
-            }
-          }
-
           a {
-            background: transparent url(images/white-line.png) left center repeat-x;
-          }
-
-          span {
             background: $color;
-            // background: $color url(images/black-alpha.png);
             transition: background-color .2s;
+            -webkit-border-radius: 6px;
+            -moz-border-radius: 6px;
+            border-radius: 6px;
+            border-bottom: 5px solid darken($color, 15%);
+            padding: 15px 0;
+            &:hover,&:focus {
+              background-color: darken($color, 15%);
+            }
           }
         }
       }
@@ -333,13 +320,13 @@
       .container-button a,
       input[type=submit],
       .success-proposal-sent a {
-        font-weight: bolder;
-        font-size: 14px;
-        text-transform: uppercase;
+        font-weight: 500;
+        font-size: 16px;
+        // text-transform: uppercase;
         background-color: $color;
+        border-bottom: 3px solid darken($color, 15%);
         color: white;
-        width: 60%;
-        border: none;
+        width: 50%;
         margin: 10px auto;
         -webkit-border-radius: 6px;
         -moz-border-radius: 6px;
@@ -353,7 +340,7 @@
 
         &:hover,
         &:focus {
-          background-color: saturate( lighten($color, 5%), 10% );
+          background-color: darken($color, 15%);
         }
         span {
           padding-left: 20px;
@@ -401,9 +388,9 @@
           @extend .container-button;
           a {
             position: absolute;
-            left: 50%;
+            left: 40%;
             margin: 0;
-            margin-left: -30%;
+            margin-left: -20%;
             bottom: 40px;
             padding: 20px 0;
           }
@@ -433,6 +420,14 @@
           min-height: $container-height;
           position: relative;
           margin: 0 0 20px 10px;
+          overflow: auto;
+          .alert{
+            width: 95%;
+            margin: 0 auto;
+            strong{
+              margin-left: 5px;
+            }
+          }
         }
         .subtitle {
           color: #000;
@@ -450,14 +445,14 @@
             background-image: url(./images/dislike.png);
           }
           .skip {
-            font-weight: bolder;
-            font-size: 14px;
-            text-transform: uppercase;
+            font-weight: 500;
+            font-size: 16px;
+            // text-transform: uppercase;
             background-color: $color;
             color: white;
-            width: 60%;
-            border: none;
-            margin: 0;
+            width: 40%;
+            border-bottom: 3px solid darken($color, 15%);
+            margin: 20px auto 0;
             -webkit-border-radius: 6px;
             -moz-border-radius: 6px;
             border-radius: 6px;
@@ -465,16 +460,16 @@
             text-decoration: none;
             padding: 20px 0;
             display: block;
-            position: absolute;
-            bottom: 40px;
-            left: 50%;
-            margin-left: -30%;
+            // position: absolute;
+            // bottom: 40px;
+            // left: 50%;
+            // margin-left: -30%;
 
             transition: background-color .2s;
 
             &:hover,
             &:focus {
-              background-color: saturate( lighten($color, 5%), 10% );
+              background-color: darken($color, 15%);
             }
           }
           .vote-result {
@@ -483,14 +478,14 @@
             color: #000;
             font-weight: bold;
             text-decoration: none;
-            margin: 0;
+            margin: 15px 0;
             display: block;
             width: 100%;
             text-align: center;
-            position: absolute;
-            bottom: 10px;
+            // position: absolute;
+            // bottom: 10px;
             left: 0;
-            text-decoration: none;
+            text-decoration: underline;
             color: $color;
 
             &:hover,
@@ -499,6 +494,12 @@
             }
           }
         }
+        .social {
+          span {
+            color: $color;
+            font-weight: 700;
+          }
+        }
       }
       .experience-proposal-container{
         float: left;
@@ -590,9 +591,10 @@
           background-image: url(./images/icons/#{$category}.png);
           background: {
             color: $color;
-            position: 10px 50%;
+            position: 5px 50%;
             repeat: no-repeat;
           }
+          border-left: 1px solid lighten($color, 10%)
         }
       }
     /*------------------ formulario ---------------- */
@@ -710,6 +712,9 @@
       font-size: 20px;
     }
   }
+  .support-proposal .send-button {
+    display: none !important;
+  }
 }
 
 @media only screen and (max-width: 992px) {
@@ -759,7 +764,6 @@
       }
     }
     .show_body {
-      padding: 20px 0 !important;
       span {
         text-align: center !important;
         margin: 0 10px !important;
diff --git a/sass/_share.scss b/sass/_share.scss
new file mode 100755
index 0000000..d2d9698
--- /dev/null
+++ b/sass/_share.scss
@@ -0,0 +1,71 @@
+.social {
+	position: relative;
+	z-index: 1;
+	&.top {
+		margin-top: 45px;
+	}
+	&.right {
+		padding-top: 10px;
+		span {
+			display: inline-block;
+			font-size: 12px;
+			font-weight: 300;
+			padding-right: 10px;
+			text-align: right;
+			vertical-align: middle;
+		}
+		ul {
+			display: inline-block;
+			vertical-align: middle
+		}
+	}
+	span {
+		display: block;
+		margin-bottom: 10px;
+	}
+	ul {
+		list-style: none;
+		padding-left: 0;
+	}
+	li {
+		display: inline-block;
+		padding: 0 2px !important;
+	}
+	.icon {
+		background-color: transparent !important;
+		background-repeat: no-repeat;
+		background-position: 50% !important;
+		background-size: auto !important;
+		border: 0 !important;
+		display: inline-block;
+		height: 36px;
+		min-width: 0 !important;
+		padding: 0 !important;
+		text-indent: -999999px;
+		width: 36px;
+		&-facebook {
+			background-image: url(images/icons/icon-facebook.png) !important;
+			&.disabled {
+				background-image: url(images/icons/icon-facebook-disabled.png) !important;
+			}
+		}
+		&-twitter {
+			background-image: url(images/icons/icon-twitter.png) !important;
+			&.disabled {
+				background-image: url(images/icons/icon-twitter-disabled.png) !important;
+			}
+		}
+		&-gplus {
+			background-image: url(images/icons/icon-gplus.png) !important;
+			&.disabled {
+				background-image: url(images/icons/icon-gplus-disabled.png) !important;
+			}
+		}
+		&-whatsapp {
+			background-image: url(images/icons/icon-whatsapp.png) !important;
+			&.disabled {
+				background-image: url(images/icons/icon-whatsapp-disabled.png) !important;
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/sass/novo.sass b/sass/novo.sass
index 8af126a..0ec2787 100644
--- a/sass/novo.sass
+++ b/sass/novo.sass
@@ -6,7 +6,7 @@
 $gutter: 20px
 
 // arredondamento
-$radius: 5px
+$radius: 6px
 
 // tamanhos de fontes
 $font-size-base: 16px
@@ -16,7 +16,6 @@ $font-size-h1: 28px
 $font-size-h2: 38px
 $font-size-h3: 28px
 $font-size-h4: 34px
-$theme-size-title: 19px
 $theme-size-header: 24px
 $proposal-title: 32px
 
@@ -32,6 +31,7 @@ $categories-descriptions: (saude: "Saúde é direito de todos e dever do Estado.
 
 // hover
 =hover($color, $amount)
+  transition: all 400ms
   &:hover
     background-color: lighten($color, $amount)
     text-decoration: none
@@ -46,10 +46,16 @@ body
   font-size: $font-size-base
   font-weight: 300
 h1
+  border-bottom: 1px solid #000
+  bottom: 0
   font-family: asap, sans
   font-size: $font-size-h1
   font-weight: 500
+  margin: 0
+  padding: $gutter 0
+  position: absolute
   text-transform: uppercase
+  width: 100%
 h2
   border-bottom: 1px solid
   font-size: $font-size-h2
@@ -68,6 +74,9 @@ h3
 h4
   font-size: $font-size-h4
   font-weight: 500
+header
+  position: relative
+  height: 100px
 
 
 // ------------------------------------
@@ -82,9 +91,19 @@ h4
 // elementos
 // ------------------------------------
 
+// conteudo
+#content
+  p
+    font-family: asap, sans
+    margin-bottom: $gutter * 3
+    margin-left: $gutter
+    margin-right: $gutter
+    margin-top: $gutter
+
 // botao padrao
 .button
   background-color: #000
+  border: 0
   border-radius: $radius
   color: #fff
   cursor: pointer
@@ -94,7 +113,6 @@ h4
   padding: $gutter 0
   text-align: center
   text-transform: uppercase
-  transition: all 200ms
   +hover(#000, 20%)
   &:hover, &:focus
     color: #fff
@@ -110,26 +128,144 @@ h4
 
 // botao voltar
 .btn
-  background-color: #fff
-  border-radius: 0
-  border: 1px solid #ccc
-  color: #000
-  line-height: 3.1
+  background-color: transparent
+  border: 0
+  color: #fff
   font-size: $font-size-small
-  padding: 6px 12px
+  padding-bottom: 0
+  padding-left: $gutter * 0.5
+  padding-right: $gutter * 0.5
+  padding-top: 0
+  vertical-align: middle
+
+// icones
+.icon
+  background-color: transparent !important
+  background-repeat: no-repeat
+  background-position: 50% !important
+  background-size: auto !important
+  border: 0 !important
+  display: inline-block
+  height: 36px
+  min-width: 0 !important
+  padding: 0 !important
+  text-align: left
+  text-indent: -999999px
+  width: 36px
+  &-facebook
+    background-image: url(images/icons/icon-facebook.png) !important
+    &.disabled
+      background-image: url(images/icons/icon-facebook-disabled.png) !important
+  &-twitter
+    background-image: url(images/icons/icon-twitter.png) !important
+    &.disabled
+      background-image: url(images/icons/icon-twitter-disabled.png) !important
+  &-gplus
+    background-image: url(images/icons/icon-gplus.png) !important
+    &.disabled
+      background-image: url(images/icons/icon-gplus-disabled.png) !important
+  &-whatsapp
+    background-image: url(images/icons/icon-whatsapp.png) !important
+    &.disabled
+      background-image: url(images/icons/icon-whatsapp-disabled.png) !important
 
 
 // ------------------------------------
 // blocos
 // ------------------------------------
 
+// compartilhar
+.social
+  position: relative
+  z-index: 1
+  &.top
+    margin-top: 45px
+    float: right
+  &.right
+    padding-top: 10px
+    span
+      display: inline-block
+      font-size: 12px
+      font-weight: 300
+      padding-right: 10px
+      text-align: right
+      vertical-align: middle
+    ul
+      display: inline-block
+      vertical-align: middle
+  span
+    display: block
+    margin-bottom: 10px
+  ul
+    list-style: none
+    padding-left: 0
+  li
+    display: inline-block
+    padding: 0 2px !important
+
+// tabs de temas e programas
+.tab
+  margin-top: $gutter
+  ul
+    font-size: 0
+    list-style: none
+    margin-bottom: 0
+    padding-left: 0
+  li
+    display: inline-block
+    font-size: $font-size-base
+    width: 50%
+  a
+    background-color: #efefef
+    border-bottom: 1px solid #000
+    color: #000
+    display: block
+    font-weight: 700
+    padding-bottom: $gutter
+    padding-left: $gutter * 0.25
+    padding-right: $gutter * 0.25
+    padding-top: $gutter
+    text-align: center
+    text-transform: uppercase
+  .active
+    background-color: #fff
+    border-bottom: 1px solid #fff
+    border-left: 1px solid #000
+    border-right: 1px solid #000
+    border-top: 1px solid #000
+
+// blocos dos temas
+.themes
+  font-size: 0
+  text-align: center
+  li
+    display: inline-block
+    font-size: $font-size-base
+    width: 140px
+    margin: $gutter * 0.5
+  a
+    background-color: #000
+    border-radius: $radius
+    color: #fff
+    display: block
+    font-family: asap, sans
+    font-size: $font-size-small
+    font-weight: 700
+    padding-bottom: $gutter * 0.25
+    padding-top: $gutter * 5.5
+    &:hover
+      text-decoration: none
+
 // listagem
 #proposal
   &-categories
     border-bottom: 1px solid #000
     border-left: 1px solid #000
     border-right: 1px solid #000
-    padding: $gutter $gutter 0
+    padding-bottom: 0
+    padding-left: $gutter
+    padding-right: $gutter
+    padding-top: $gutter * 0.5
     ul
       list-style: none
       padding-left: 0
@@ -160,7 +296,7 @@ h4
       list-style: none
       padding-left: 0
 
-// blocos dos programas
+// box dos programas
 .box
   background-color: #fff
   border: 1px solid gray
@@ -169,8 +305,9 @@ h4
   display: block
   height: 200px
   margin-top: $gutter * 1.5
+  overflow: auto
   padding: $gutter
-  transition: all 200ms
+  transition: all 400ms
   &:hover
     background-color: darken(#fff, 10%)
     color: #000
@@ -185,8 +322,15 @@ h4
     height: 500px
     border: 1px solid
     margin-bottom: $gutter * 0.5
+    margin-top: 0
     padding: $gutter
     position: relative
+    &:hover
+      background-color: #fff
+    p
+      @extend .box-subtitle
+      border-bottom: 0
+      padding-bottom: inherit
   &-header
     font-family: asap, sans
     font-size: $theme-size-header
@@ -213,18 +357,23 @@ h4
     font-weight: 700
     line-height: 1.2
     margin-bottom: $gutter
+  &-info
+    margin-bottom: $gutter
   &-footer
-    position: absolute
-    bottom: 40px
-    margin-left: -30%
-    left: 50%
-    width: 60%
+    margin-bottom: $gutter * 0.25
+    margin-left: auto
+    margin-right: auto
+    margin-top: $gutter
+    width: 40%
   &-bottom
     @extend .box-footer
     bottom: 10px
     color: #000
+    display: inline-block
     font-size: $font-size-small
     font-weight: 700
+    margin-bottom: $gutter * 0.75
+    margin-top: 0
     text-align: center
     &:hover, &:focus
       color: #000
@@ -235,23 +384,26 @@ h4
 .select
   background-color: #000
   margin-bottom: $gutter * 0.5
+  padding: $gutter * 0.25
   .proposal
     &-link
       color: #fff
       display: inline-block
-      font-size: $theme-size-title
+      font-size: $theme-size-header
       font-weight: 700
-      padding-bottom: $gutter * 0.75
-      padding-left: $gutter * 2.5
-      padding-right: $gutter * 0.75
-      padding-top: $gutter * 0.75
-      text-transform: uppercase
+      padding-bottom: 0
+      padding-left: $gutter * 2.25
+      padding-right: 0
+      padding-top: 0
+      vertical-align: middle
     &-selection
       background-color: #fff
       border: 0
+      border-radius: 3px
       float: right
-      height: 57px
+      margin: 4px
       width: 60%
+      vertical-align: middle
 
 // imagem destaque do programa, titulo, descricao e botao de acesso
 .proposal-header
@@ -274,42 +426,20 @@ h4
     width: 50%
     vertical-align: middle
   .show_body
-    background-color: #000
-    border-radius: $radius
-    cursor: pointer
-    margin-bottom: $gutter * 0.5
-    margin-left: auto
-    margin-right: auto
-    margin-top: $gutter * 0.5
-    padding-bottom: $gutter * 1.5
-    padding-left: 0
-    padding-right: 0
-    padding-top: $gutter * 1.5
-    text-align: center
-    transition: all 200ms
-    width: 100%
-    +hover(#000, 20%)
-    &:hover
-      span
-        background-color: lighten(#000, 20%)
+    margin-bottom: $gutter
+    margin-top: $gutter
     a
-      background: url(images/white-line.png) left center repeat-x
+      background-color: #000
+      border-radius: $radius
       color: #fff
-      display: inline-block
       font-size: $font-size-h2
       font-weight: 700
-      margin: 0 auto
-      text-transform: uppercase
-      width: 70%
-      &:hover
-        text-decoration: none
-    span
-      background-color: #000
-      padding-bottom: $gutter * 0.25
-      padding-left: $gutter * 0.75
-      padding-right: $gutter * 0.75
-      padding-top: $gutter * 0.25
-      transition: all 200ms
+      padding-bottom: $gutter * 0.5
+      padding-left: 0
+      padding-right: 0
+      padding-top: $gutter * 0.5
+      text-align: center
+      +hover(#000, 20%)
   img
     width: 100%
   p
@@ -320,6 +450,29 @@ h4
     padding-top: $gutter * 0.25
     text-transform: none
 
+// login form
+.login
+  text-align: left
+  input
+    display: block
+    margin-bottom: $gutter
+    width: 100%
+    &.button
+      margin-bottom: $gutter * 0.25
+  .label
+    vertical-align: middle
+  .icon
+    vertical-align: middle
+  .oauth
+    margin-top: $gutter * 0.5
+    text-align: right
+  .forgot-password
+    display: block
+    font-size: $font-size-small
+    text-align: center
+  i
+    font-style: normal
+
 // votacao
 .vote-actions
   .like
diff --git a/sass/proposal_detail/_proposal-detail-base.scss b/sass/proposal_detail/_proposal-detail-base.scss
old mode 100644
new mode 100755
index 1b5735d..db10a12
--- a/sass/proposal_detail/_proposal-detail-base.scss
+++ b/sass/proposal_detail/_proposal-detail-base.scss
@@ -107,12 +107,14 @@
       -webkit-border-radius: 6px;
       -moz-border-radius: 6px;
       border-radius: 6px;
+      border-bottom: 3px solid darken($color, 18%);
       color: #fff;
       display: block;
       padding: 1em;
       text-align: center;
+      font-weight: 500;
       text-decoration: none;
-      text-transform: uppercase;
+      // text-transform: uppercase;
       .fa-reply {
         margin-right: .7em;
       }
@@ -120,7 +122,7 @@
       transition: background-color .2s;
       &:hover,
       &:focus {
-        background-color: saturate( lighten($color, 5%), 10% );
+        background-color: darken($color, 18%);
       }
     }
     .row {
diff --git a/sass/style.scss b/sass/style.scss
index 781820f..32c78c8 100755
--- a/sass/style.scss
+++ b/sass/style.scss
@@ -10,6 +10,7 @@
 @import 'accessibility';
 @import 'slick';
 @import 'slick-theme';
+@import 'share';
 
 @import 'proposal_detail/proposal-detail-base';
 @import 'proposal_detail/urgencia-e-emergencia';
@@ -114,11 +115,11 @@ form {
 // TO_REFACT:
 .btn {
   display: inline-block;
-  padding: 6px 12px;
+  padding: 0 12px;
   margin-bottom: 0;
   font-size: 14px;
   font-weight: 400;
-  line-height: 3.1;
+  // line-height: 3.1;
   text-align: center;
   white-space: nowrap;
   vertical-align: middle;
@@ -130,13 +131,14 @@ form {
   -ms-user-select: none;
   user-select: none;
   background-image: none;
-  border: 1px solid transparent;
+  border: 0;
+  vertical-align: middle;
   /* border-radius: 4px; */
 }
 
 .btn-default {
-  color: #000;
-  background-color: #fff;
+  color: #fff;
+  background-color: transparent;
   border-color: #ccc;
 }
 
--
libgit2 0.21.2