diff --git a/app/assets/stylesheets/_consul_settings.scss b/app/assets/stylesheets/_consul_settings.scss
index 707f1e83..b3e08be0 100644
--- a/app/assets/stylesheets/_consul_settings.scss
+++ b/app/assets/stylesheets/_consul_settings.scss
@@ -22,20 +22,44 @@ $global-width: rem-calc(1200) !default;
 
 $header-styles: (
   small: (
-    "h1": ("font-size": 34),
-    "h2": ("font-size": 24),
-    "h3": ("font-size": 20),
-    "h4": ("font-size": 18),
-    "h5": ("font-size": 16),
-    "h6": ("font-size": 14),
+    "h1": (
+      "font-size": 34,
+    ),
+    "h2": (
+      "font-size": 24,
+    ),
+    "h3": (
+      "font-size": 20,
+    ),
+    "h4": (
+      "font-size": 18,
+    ),
+    "h5": (
+      "font-size": 16,
+    ),
+    "h6": (
+      "font-size": 14,
+    ),
   ),
   medium: (
-    "h1": ("font-size": 44),
-    "h2": ("font-size": 34),
-    "h3": ("font-size": 24),
-    "h4": ("font-size": 19),
-    "h5": ("font-size": 16),
-    "h6": ("font-size": 13),
+    "h1": (
+      "font-size": 44,
+    ),
+    "h2": (
+      "font-size": 34,
+    ),
+    "h3": (
+      "font-size": 24,
+    ),
+    "h4": (
+      "font-size": 19,
+    ),
+    "h5": (
+      "font-size": 16,
+    ),
+    "h6": (
+      "font-size": 13,
+    ),
   ),
 ) !default;
 
@@ -57,69 +81,69 @@ $full-width-margin: unquote("#{$global-width / 2} - 50vw") !default;
 // Scale up to offset Pracharath's font size.
 // Its base font size is smaller than Source Sans Pro
 // used by CONSUL.
-$base-font-size:      rem-calc(18) !default;
-$base-line:           rem-calc(26) !default;
-$line-height:         rem-calc(24) !default;
-$tiny-font-size:      rem-calc(12) !default;
+$base-font-size: rem-calc(18) !default;
+$base-line: rem-calc(26) !default;
+$line-height: rem-calc(24) !default;
+$tiny-font-size: rem-calc(12) !default;
 
 $font-family-serif: Georgia, "Times New Roman", Times, serif !default;
 
-$brand:             #e67e44 !default;
-$brand-secondary:   darken($brand, 10%) !default;
-$dark:              $brand-secondary !default;
+$brand: #e67e44 !default;
+$brand-secondary: darken($brand, 10%) !default;
+$dark: $brand-secondary !default;
 
-$text:              $black !default;
-$text-medium:       #515151 !default;
-$text-light:        #bfbfbf !default;
+$text: $black !default;
+$text-medium: #515151 !default;
+$text-light: #bfbfbf !default;
 
-$border:            #dee0e3 !default;
+$border: #dee0e3 !default;
 
-$link:              $brand !default;
-$link-hover:        darken($link, 20%) !default;
+$link: $brand !default;
+$link-hover: darken($link, 20%) !default;
 
-$debates:           $brand !default;
+$debates: $brand !default;
 
-$like:              #7bd2a8 !default;
-$unlike:            #ef8585 !default;
+$like: #7bd2a8 !default;
+$unlike: #ef8585 !default;
 
-$delete:            #f04124 !default;
-$check:             #46db91 !default;
+$delete: #f04124 !default;
+$check: #46db91 !default;
 
-$proposals:         #ffa42d !default;
-$proposals-dark:    #794500 !default;
+$proposals: #ffa42d !default;
+$proposals-dark: #794500 !default;
 
-$budget:            #7e328a !default;
-$budget-hover:      #7571bf !default;
+$budget: #7e328a !default;
+$budget-hover: #7571bf !default;
 
-$highlight:         #e7f2fc !default;
-$highlight-soft:    #f3f8fd !default;
-$light:             #f5f7fa !default;
-$featured:          #ffdc5c !default;
+$highlight: #e7f2fc !default;
+$highlight-soft: #f3f8fd !default;
+$light: #f5f7fa !default;
+$featured: #ffdc5c !default;
 
-$footer-border:     #bfc1c3 !default;
+$footer-border: #bfc1c3 !default;
 
-$success-bg:        #dff0d8 !default;
-$success-border:    #d6e9c6 !default;
-$color-success:     #3c763d !default;
+$success-bg: #dff0d8 !default;
+$success-border: #d6e9c6 !default;
+$color-success: #3c763d !default;
 
-$info-bg:           #d9edf7 !default;
-$info-border:       #bce8f1 !default;
-$color-info:        #31708f !default;
+$info-bg: #d9edf7 !default;
+$info-border: #bce8f1 !default;
+$color-info: #31708f !default;
 
-$warning-bg:        #fcf8e3 !default;
-$warning-border:    #faebcc !default;
-$color-warning:     #8a6d3b !default;
+$warning-bg: #fcf8e3 !default;
+$warning-border: #faebcc !default;
+$color-warning: #8a6d3b !default;
 
-$alert-bg:          #f2dede !default;
-$alert-border:      #ebccd1 !default;
-$color-alert:       #a94442 !default;
+$alert-bg: #f2dede !default;
+$alert-border: #ebccd1 !default;
+$color-alert: #a94442 !default;
 
-$pdf-primary:       #0300ff !default;
-$pdf-secondary:     #ff9e00 !default;
+$pdf-primary: #0300ff !default;
+$pdf-secondary: #ff9e00 !default;
 
-$outline-focus:     3px solid #ffbf47 !default;
+$outline-focus: 3px solid #ffbf47 !default;
 
-$input-height:      $line-height * 2 !default;
+$input-height: $line-height * 2 !default;
 
 $font-icon-margin: rem-calc(4) !default;
 $icon-width: $line-height * 2 !default;
@@ -145,7 +169,7 @@ $sdg-colors: (
   14: #0a97d9,
   15: #56c02b,
   16: #00689d,
-  17: #19486a
+  17: #19486a,
 ) !default;
 
 // 3. Foundation overrides depending on CONSUL variables
@@ -154,7 +178,7 @@ $sdg-colors: (
 $tab-background-active: $white !default;
 
 $tab-item-font-size: $base-font-size !default;
-$tab-item-padding: $line-height / 2  0 !default;
+$tab-item-padding: $line-height / 2 0 !default;
 $tab-content-border: $border !default;
 
 $closebutton-color: $text !default;
diff --git a/app/assets/stylesheets/_settings.scss b/app/assets/stylesheets/_settings.scss
index f6ab4e74..d18a037c 100644
--- a/app/assets/stylesheets/_settings.scss
+++ b/app/assets/stylesheets/_settings.scss
@@ -311,10 +311,12 @@ $button-padding: 0.85em 1em !default;
 $button-margin: 0 0 $global-margin 0 !default;
 $button-fill: solid !default;
 $button-background: $primary-color !default;
-$button-background-hover: scale-color(
-  $button-background,
-  $lightness: -15%
-) !default;
+// Override button button background hover for MFP-NEXT.
+// $button-background-hover: scale-color(
+//   $button-background,
+//   $lightness: -15%
+// ) !default;
+$button-background-hover: #f57832 !default;
 $button-color: $white !default;
 $button-color-alt: $black !default;
 // Override button border radius for MFP-NEXT.
diff --git a/app/assets/stylesheets/custom/custom_debates.scss b/app/assets/stylesheets/custom/custom_debates.scss
index 6e4fae74..40784768 100644
--- a/app/assets/stylesheets/custom/custom_debates.scss
+++ b/app/assets/stylesheets/custom/custom_debates.scss
@@ -18,6 +18,47 @@
 }
 
 .debates-list {
+  .advanced-search-form {
+    .date-filters {
+      width: 100%;
+      display: flex;
+      align-items: flex-end;
+      flex-direction: column;
+
+      @include breakpoint(medium) {
+        flex-direction: row;
+      }
+
+      .filter {
+        width: 100%;
+
+        @include breakpoint(medium) {
+          width: 33.33%;
+        }
+      }
+
+      .custom-date-filters {
+        width: 100%;
+        display: flex;
+        flex-direction: column;
+
+        @include breakpoint(medium) {
+          flex-direction: row;
+          width: 66.66%;
+          align-items: flex-end;
+        }
+
+        .filter {
+          width: 100%;
+
+          @include breakpoint(medium) {
+            width: 50%;
+          }
+        }
+      }
+    }
+  }
+
   .debate {
     .panel {
       .row {
@@ -58,3 +99,15 @@
     }
   }
 }
+
+.trending-tag {
+  .tag-cloud {
+    a {
+      width: 100%;
+      text-align: center;
+      border-radius: 22px;
+      padding: 12px;
+      border: $input-border;
+    }
+  }
+}
diff --git a/app/assets/stylesheets/custom/custom_pageee.scss b/app/assets/stylesheets/custom/custom_pageee.scss
index 1b79e8f2..c0e7f026 100644
--- a/app/assets/stylesheets/custom/custom_pageee.scss
+++ b/app/assets/stylesheets/custom/custom_pageee.scss
@@ -1,24 +1,35 @@
 .page-login {
-  .wrapper {
+  .wrapper_devise {
+    display: grid;
+    grid-template-columns: 33% 67%;
     .right_right {
-      background-color: rgb(244, 244, 244);
-
-      .column {
-        background: rgb(244, 244, 244);
-      }
+      background-color: #FCFCFC;
+      display: flex;
+      flex-direction: row;
+      flex-wrap: wrap;
+      justify-content: space-around;
+      align-items: stretch;
+      align-content: stretch;
       .auth-form {
         .title-login-page {
-          @include breakpoint(medium) {
-            padding-top: $line-height * 4;
-            text-align: center;
-          }
+          text-align: center;
         }
-        .row {
-          .auth-divider-login {
-            span {
-              font-size: 22px;
-              font-family: "Anakotmai";
-            }
+        .button-facebook{
+          text-align: left;
+        }
+        .button-google{
+          text-align: left;
+        }
+        .button-twitter{
+          text-align: left;
+        }
+        .auth-divider-login {
+          text-align: center;
+          margin-top: 10px;
+          margin-bottom: 10px;
+          span {
+            font-size: 22px;
+            font-family: "Anakotmai";
           }
         }
         .column {
@@ -49,32 +60,60 @@
             font-family: "Pracharath";
           }
         }
-        .register-organization-page {
-          .title_organizations {
-            @include breakpoint(medium) {
-              padding-top: $line-height * 4;
-              text-align: center;
-              margin-bottom: 30px;
-              width: 100%;
-            }
+        .register-page{
+          h2{
+            text-align: center;
+          }
+          .register_organisation{
+            background-color: rgb(255, 255, 255);
+            text-align: center;
+            font-family: "Anakotmai";
+            font-size: 18px;
+            border-radius: 28px;
+            padding: 28px 28px 28px 28px;
+            margin-bottom: 15px;
+            margin-top: 20px;
+
           }
-          .register_bottom {
+          .register_bottom{
             display: flex;
-            align-items: center;
+            flex-direction: column;
+            flex-wrap: wrap;
             justify-content: center;
-            position: relative;
-            margin-bottom: 15px;
-            .checkbox-label {
-              .checkbox {
+            align-items: center;
+            align-content: center;
+            label{
+              border-radius: 28px;
+              padding: 28px 28px 28px 28px;
+              font-size: 16px;
+              font-family: "Pracharath";
+
+            }
+          }
+        }
+        .register-organization-page {
+
+            .title_organizations {
+              @include breakpoint(medium) {
+                text-align: center;
+                margin-bottom: 30px;
+              }
+            }
+            .register_bottom{
+              display: flex;
+              flex-direction: column;
+              flex-wrap: wrap;
+              justify-content: center;
+              align-items: center;
+              align-content: center;
+              label{
                 font-size: 16px;
                 font-family: "Pracharath";
+  
               }
             }
           }
-        }
         .forget_password_page {
-          padding-top: 12rem;
-          padding-bottom: 20rem;
           .new_user {
             .row {
               .column {
@@ -93,18 +132,16 @@
       }
     }
     .left_left {
-      .column {
-        background: rgb(255, 255, 255);
-      }
+      display: flex;
+      flex-direction: column;
+      flex-wrap: wrap;
+      justify-content: space-between;
+      align-items: stretch;
+      align-content: center;
+      background-color: #ffffff;
       .img_login {
-        display: grid;
-        grid-template-rows: 500px 300px;
-        color: $black;
-        margin-left: 50px;
-        background: rgb(255, 255, 255);
+
         .top {
-          display: grid;
-          align-content: space-between;
           .back {
             clear: both;
             color: black;
@@ -116,6 +153,7 @@
             margin-top: 70px;
             font-family: "Anakotmai";
             font-weight: normal;
+            padding-bottom: 33%;
             .icon-angle-left {
               padding-right: $line-height;
               font-size: 2rem;
@@ -126,29 +164,20 @@
           }
           img {
             width: 476px;
-            height: 136px;
-            margin-bottom: 30px;
+            padding-bottom: 33%;
           }
         }
-        .bottom {
-          display: flex;
-          flex-direction: column;
-          flex-wrap: nowrap;
-          justify-content: flex-end;
-          align-items: flex-start;
-          align-content: flex-end;
-          color: rgb(0, 0, 0);
-          h3 {
-            font-size: 22px;
-            font-weight: normal;
-            font-family: "Anakotmai";
-            padding-bottom: 5px;
-          }
-          h5 {
-            font-size: 18px;
-            font-family: "Pracharath";
-            font-weight: lighter;
-          }
+        .title_login_header{
+          padding-top: 33%;
+          padding-bottom: 10px;
+          font-size: 22px;
+          color: #2A3D4F;
+          font-family: "Anakotmai";
+        }
+        .title_login{
+          font-size: 18px;
+          color:#000;
+          font-family: "Pracharath";
         }
       }
     }
@@ -161,6 +190,7 @@
       margin-top: 35px;
       margin-bottom: 18px;
       font-size: 17.5px;
+
     }
     .confirmations {
       display: block;
@@ -230,25 +260,98 @@
   align-items: flex-end;
 }
 
-@media only screen and(max-width:1600px) {
-  .page-login {
-    .wrapper {
-      .right_right {
-        background-color: rgb(244, 244, 244);
 
-        .column {
-          background: rgb(244, 244, 244);
+
+.auth-divider {
+  border-top: 1px solid $border;
+  margin-top: $line-height * 1.5;
+  text-align: center;
+
+  span {
+    background: $body-background;
+    box-decoration-break: clone;
+    font-weight: bold;
+    padding: 0 $line-height / 2;
+    position: relative;
+    top: -$line-height / 2;
+  }
+}
+.public {
+  .wrapper {
+    .account {
+      .title_header {
+        margin-left: 50px;
+        margin-bottom: 20px;
+        img {
+          margin-right: 35px;
         }
+      }
+      .edit_account {
+        .personal_details {
+          h2 {
+            font-size: 26px;
+            font-family: "Anakotmai";
+            color: rgb(0, 0, 0);
+          }
+          display: flex;
+          flex-direction: column;
+          flex-wrap: nowrap;
+          justify-content: flex-start;
+          align-items: baseline;
+          align-content: stretch;
+          padding-top: 30px;
+          padding-left: 50px;
+          padding-bottom: 30px;
+          .checkbox-label {
+            span {
+              color: rgb(0, 0, 0);
+              font-size: 24px;
+              font-family: "Pracharath";
+              margin-top: 5px;
+            }
+          }
+          input[type="submit"] {
+            width: 369px;
+            height: 72.97px;
+            font-size: 28px;
+          }
+        }
+      }
+    }
+  }
+}
+@media only screen and(max-width:500px){
+  .page-login {
+    .wrapper_devise {
+      display: block;
+      .right_right {
+        background-color: #FCFCFC;
+        display: flex;
+        flex-direction: row;
+        flex-wrap: wrap;
+        justify-content: space-around;
+        align-items: stretch;
+        align-content: stretch;
         .auth-form {
           .title-login-page {
             text-align: center;
           }
-          .row {
-            .auth-divider-login {
-              span {
-                font-size: 22px;
-                font-family: "Anakotmai";
-              }
+          .button-facebook{
+            text-align: left;
+          }
+          .button-google{
+            text-align: left;
+          }
+          .button-twitter{
+            text-align: left;
+          }
+          .auth-divider-login {
+            text-align: center;
+            margin-top: 10px;
+            margin-bottom: 10px;
+            span {
+              font-size: 18px;
+              font-family: "Anakotmai";
             }
           }
           .column {
@@ -279,29 +382,65 @@
               font-family: "Pracharath";
             }
           }
-          .register-organization-page {
-            .title_organizations {
+          .register-page{
+            h2{
               text-align: center;
-              margin-bottom: 30px;
-              width: 100%;
             }
-            .register_bottom {
+            .register_organisation{
+              background-color: rgb(255, 255, 255);
+              text-align: center;
+              font-family: "Anakotmai";
+              font-size: 18px;
+              border-radius: 15px;
+              padding: 15px 15px 15px 15px;
+              margin-bottom: 15px;
+              margin-top: 20px;
+  
+            }
+            .register_bottom{
               display: flex;
-              align-items: center;
+              flex-direction: column;
+              flex-wrap: wrap;
               justify-content: center;
-              position: relative;
-              margin-bottom: 15px;
-              .checkbox-label {
-                .checkbox {
+              align-items: center;
+              align-content: center;
+              label{
+
+                font-size: 16px;
+                font-family: "Pracharath";
+                a{
+                  display: block;
+                  text-align: center;
+                }
+              }
+            }
+          }
+          .register-organization-page {
+  
+              .title_organizations {
+                @include breakpoint(medium) {
+                  text-align: center;
+                  margin-bottom: 30px;
+                }
+              }
+              .register_bottom{
+                display: flex;
+                flex-direction: column;
+                flex-wrap: wrap;
+                justify-content: center;
+                align-items: center;
+                align-content: center;
+                label{
                   font-size: 16px;
                   font-family: "Pracharath";
+                  a{
+                    display: block;
+                    text-align: center;
+                  }
                 }
               }
             }
-          }
           .forget_password_page {
-            padding-top: 12rem;
-            padding-bottom: 20rem;
             .new_user {
               .row {
                 .column {
@@ -313,181 +452,89 @@
               }
             }
           }
+          .small-centered{
+            font-size: 16px;
+          }
         }
         .account {
           font-size: 18px;
           font-family: "Pracharath";
         }
       }
-    }
-  }
-}
-@media only screen and(max-width:1450px) {
-  .page-login {
-    .wrapper {
-      .left_left {
-        .column {
-          .img_login {
-            margin-left: 3px;
-          }
-        }
-      }
-    }
-  }
-}
-@media only screen and(max-width:1027px) {
-  .page-login {
-    .wrapper {
       .left_left {
+        display: flex;
+        flex-direction: column;
+        flex-wrap: wrap;
+        justify-content: space-between;
+        align-items: stretch;
+        align-content: center;
+        background-color: #ffffff;
+        margin-left: 20px;
+
         .img_login {
+  
           .top {
+            .back {
+              clear: both;
+              color: black;
+              display: flex;
+              align-items: center;
+              justify-content: left;
+              text-decoration: none;
+              font-size: 22px;
+              margin-top: 5px;
+              font-family: "Anakotmai";
+              font-weight: normal;
+              padding-bottom: 15%;
+              .icon-angle-left {
+                padding-right: $line-height;
+                font-size: 2rem;
+              }
+            }
+            .back:not([class^="icon-"]) {
+              text-decoration: none;
+            }
             img {
-              width: 300px;
-              height: 85px;
-              margin-bottom: 130px;
+              width: 476px;
+              padding-bottom: 5%;
             }
           }
-          .bottom {
-            margin-top: 50px;
+          .title_login_header{
+            padding-top: 8%;
+            font-size: 22px;
+            color: #2A3D4F;
+            font-family: "Anakotmai";
+          }
+          .title_login{
+            font-size: 18px;
+            color:#000;
+            font-family: "Pracharath";
           }
         }
       }
-    }
-  }
-}
-.auth-form {
-  .register-page {
-    @include breakpoint(medium) {
-      padding-top: $line-height * 4;
-    }
-    h2 {
-      font-size: 42px;
-      text-align: center;
-      width: 100%;
-    }
-
-    .title_all {
-      text-align: left;
-    }
-    .account {
-      font-size: 18px;
-    }
-    .register_bottom {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      position: relative;
-      margin-bottom: 30px;
-      .checkbox-label {
-        .checkbox {
-          font-size: 16px;
-          font-family: "Pracharath";
-        }
-      }
-    }
-    .register_organisation {
-      background: rgb(255, 255, 255);
-      padding: 10px 10px;
-      margin-bottom: 10px;
-      border-radius: 25px;
-      text-align: center;
-      a {
-        color: rgb(0, 0, 0);
-        font-family: "Anakotmai";
-        font-weight: normal;
+      .forget_password {
+        margin-top: 10px;
+        margin-bottom: 18px;
+        font-size: 17.5px;
       }
-    }
-  }
-  .text_footer {
-    font-size: 16.2px;
-    color: #000;
-  }
-  .auth-divider-login {
-    margin-top: $line-height * 1.5;
-    text-align: center;
-    font-size: 22px;
-    margin-bottom: 10px;
-    color: rgb(4, 17, 49);
-    font-family: "Anakotmai";
-    span {
-      box-decoration-break: clone;
-      font-weight: normal;
-      padding: 0 $line-height / 2;
-      position: relative;
-      top: -$line-height / 2;
-      color: #2a3d4f;
-    }
-  }
-  .account {
-    margin-top: 30px;
-    text-align: center;
-    font-size: 20px;
-    .title_header {
-      padding-left: 46px;
-      display: flex;
-      padding-bottom: 30px;
-      .inline-block {
-        padding-left: 30px;
+      .forget_password_login {
+        margin-top: 35px;
+        margin-bottom: 18px;
+        font-size: 17.5px;
+  
       }
-    }
-  }
-}
-
-.auth-divider {
-  border-top: 1px solid $border;
-  margin-top: $line-height * 1.5;
-  text-align: center;
-
-  span {
-    background: $body-background;
-    box-decoration-break: clone;
-    font-weight: bold;
-    padding: 0 $line-height / 2;
-    position: relative;
-    top: -$line-height / 2;
-  }
-}
-.public {
-  .wrapper {
-    .account {
-      .title_header {
-        margin-left: 50px;
-        margin-bottom: 20px;
-        img {
-          margin-right: 35px;
-        }
+      .confirmations {
+        display: block;
+        text-align: center;
+        color: black;
       }
-      .edit_account {
-        .personal_details {
-          h2 {
-            font-size: 26px;
-            font-family: "Anakotmai";
-            color: rgb(0, 0, 0);
-          }
-          display: flex;
-          flex-direction: column;
-          flex-wrap: nowrap;
-          justify-content: flex-start;
-          align-items: baseline;
-          align-content: stretch;
-          padding-top: 30px;
-          padding-left: 50px;
-          padding-bottom: 30px;
-          .checkbox-label {
-            span {
-              color: rgb(0, 0, 0);
-              font-size: 24px;
-              font-family: "Pracharath";
-              margin-top: 5px;
-            }
-          }
-          input[type="submit"] {
-            width: 369px;
-            height: 72.97px;
-            font-size: 28px;
-          }
-        }
+      .edit_user {
+        text-align: left;
       }
     }
+    .height_password {
+      background-color: red;
+      height: 100vh;
+    }
   }
 }
diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss
index 8292ef5f..6788489c 100644
--- a/app/assets/stylesheets/layout.scss
+++ b/app/assets/stylesheets/layout.scss
@@ -1166,42 +1166,14 @@ footer {
 // --------------
 
 .auth-page {
-  .wrapper {
-    .right_right {
-      height: 100vh;
-      background: rgb(244, 244, 244);
-      .column {
-        background: rgb(244, 244, 244);
-      }
-    }
-    .left_left {
-      .column {
-        background: rgb(255, 255, 255);
-      }
-    }
-    .forget_password {
-      margin-top: 10px;
-      margin-bottom: 18px;
-      font-size: 17.5px;
-    }
-    .forget_password_login {
-      margin-top: 35px;
-      margin-bottom: 18px;
-      font-size: 21px;
-    }
-    .confirmations {
-      display: block;
-      text-align: center;
-      color: black;
-    }
-    .edit_user {
-      text-align: left;
-    }
-  }
-
-  .footer {
-    margin-top: 0;
-  }
+  background: rgb(2, 0, 36);
+  background: linear-gradient(
+    90deg,
+    rgba(2, 0, 36, 1) 0%,
+    rgba(255, 255, 255, 1) 0%,
+    rgba(255, 255, 255, 1) 33%,
+    rgba(252, 252, 252, 1) 33%
+  );
 }
 
 .login_button {
@@ -1211,288 +1183,6 @@ footer {
   opacity: 1;
 }
 
-.right {
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-  align-content: center;
-  height: 100vh;
-  background: rgb(244, 244, 244);
-}
-
-.footer_forget_password {
-  text-align: center;
-}
-
-.title_forget_password {
-  display: flex;
-  flex-direction: row;
-  align-items: flex-end;
-}
-
-.img_login {
-  display: grid;
-  grid-template-rows: 500px 300px;
-  color: $black;
-  margin-left: 50px;
-
-  .top {
-    display: grid;
-    align-content: space-between;
-
-    img {
-      width: 476px;
-      height: 136px;
-      margin-bottom: 30px;
-    }
-  }
-
-  .bottom {
-    display: flex;
-    flex-direction: column;
-    flex-wrap: nowrap;
-    justify-content: flex-end;
-    align-items: flex-start;
-    align-content: flex-end;
-    color: rgb(0, 0, 0);
-
-    h3 {
-      font-size: 22px;
-      font-weight: normal;
-      font-family: "Anakotmai";
-      padding-bottom: 5px;
-    }
-
-    h5 {
-      font-size: 18px;
-      font-family: "Pracharath";
-      font-weight: lighter;
-    }
-  }
-}
-
-@media only screen and(max-width:1940px) {
-  .img_login {
-    display: grid;
-    grid-auto-rows: minmax(350px, 2fr) minmax(max-content, 2fr)
-      minmax(20%, 60vmax);
-
-    .top {
-      img {
-        width: 400px;
-      }
-    }
-  }
-
-  .wrapper {
-    .right_right {
-      .column {
-        background: rgb(244, 244, 244);
-      }
-    }
-
-    .left_left {
-      .column {
-        height: 100vh;
-        background: rgb(255, 255, 255);
-      }
-    }
-  }
-}
-
-@media only screen and(max-width:1700px) {
-  .img_login {
-    display: grid;
-    grid-auto-rows: minmax(350px, 2fr) minmax(max-content, 2fr)
-      minmax(20%, 60vmax);
-
-    .top {
-      img {
-        width: 400px;
-      }
-    }
-  }
-
-  .wrapper {
-    .right_right {
-      .column {
-        background: rgb(244, 244, 244);
-      }
-    }
-
-    .left_left {
-      .column {
-        height: 100vh;
-        background: rgb(255, 255, 255);
-      }
-    }
-  }
-}
-
-@media only screen and(max-width:1523px) {
-  .img_login {
-    display: grid;
-    grid-auto-rows: minmax(300px, 2fr) minmax(max-content, 2fr)
-      minmax(20%, 60vmax);
-  }
-}
-
-.register_organisation {
-  background: rgb(255, 255, 255);
-  padding: 10px 10px;
-  margin-bottom: 10px;
-  border-radius: 25px;
-  text-align: center;
-
-  a {
-    color: rgb(0, 0, 0);
-    font-family: "Anakotmai";
-    font-weight: normal;
-  }
-}
-
-@media only screen and(max-width:1027px) {
-  .wrapper {
-    .left_left {
-      .img_login {
-        display: grid;
-        grid-template-rows: 400px 400px;
-
-        .top {
-          img {
-            width: 300px;
-            height: 85px;
-            margin-bottom: 30px;
-          }
-        }
-
-        .bottom {
-          margin-top: 50px;
-        }
-      }
-    }
-  }
-}
-
-.register_bottom {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  position: relative;
-  margin-bottom: 30px;
-
-  .checkbox-label {
-    .checkbox {
-      font-size: 16px;
-      font-family: "Pracharath";
-    }
-  }
-}
-
-.small-centered {
-  input[type="submit"] {
-    font-size: 21px;
-    border-radius: 10px;
-    margin-bottom: 30px;
-  }
-}
-
-.auth-image {
-  background: $brand image-url("auth_bg.jpg");
-  background-repeat: no-repeat;
-  background-size: cover;
-  color: $white;
-
-  @include breakpoint(medium) {
-    min-height: $line-height * 42;
-  }
-
-  h1 {
-    margin-top: $line-height;
-
-    a {
-      color: inherit;
-      display: block;
-      text-align: center;
-
-      @include breakpoint(medium) {
-        display: inline-block;
-        text-align: left;
-      }
-    }
-  }
-}
-
-.title_organizations {
-  text-align: center;
-  margin-bottom: 30px;
-  width: 100%;
-}
-
-.auth-form {
-  @include breakpoint(medium) {
-    padding-top: $line-height * 4;
-  }
-
-  .forget_password_page {
-    padding-top: 7rem;
-    height: 60vh;
-  }
-
-  h2 {
-    font-size: 42px;
-    text-align: center;
-    width: 100%;
-  }
-
-  .title_all {
-    text-align: left;
-  }
-
-  .line_remember_login {
-    display: flex;
-    justify-content: space-between;
-    margin-bottom: 20px;
-
-    a {
-      line-height: 2.5rem;
-    }
-  }
-
-  .account {
-    font-size: 18px;
-  }
-
-  p,
-  .checkbox {
-    font-size: 18px;
-  }
-}
-
-.text_footer {
-  font-size: 16.2px;
-  color: #000;
-}
-
-.auth-divider-login {
-  margin-top: $line-height * 1.5;
-  text-align: center;
-  font-size: 22px;
-  margin-bottom: 10px;
-  color: rgb(4, 17, 49);
-  font-family: "Anakotmai";
-
-  span {
-    box-decoration-break: clone;
-    font-weight: bold;
-    padding: 0 $line-height / 2;
-    position: relative;
-    top: -$line-height / 2;
-    color: #2a3d4f;
-  }
-}
-
 .account {
   margin-top: 30px;
   text-align: center;
@@ -1514,7 +1204,6 @@ footer {
       justify-content: flex-start;
       align-items: baseline;
       align-content: stretch;
-      background-color: #ffffff;
       padding-top: 30px;
       padding-left: 50px;
       padding-bottom: 30px;
diff --git a/app/components/debates/form_component.html.erb b/app/components/debates/form_component.html.erb
index 7d8d35b0..b10b6b3a 100644
--- a/app/components/debates/form_component.html.erb
+++ b/app/components/debates/form_component.html.erb
@@ -35,29 +35,29 @@
               class: "tag-autocomplete" %> -->
 
               <label for="select_mul"><%= t("activerecord.attributes.debate.category") %></label>
-              <div class="multiSelect">
+              <div id="category" class="multiSelect">
                 <select id="select_mul" multiple class="multiSelect_field">
-                  <option value="ผู้แทนฯ ที่คุณอยากเห็น
-                  กระบวนการคัดเลือกว่าที่ผู้สมัคร/การอบรมและพัฒนา/ส.ส.เขต/ส.ส.บัญชีรายชื่อ">ผู้แทนฯ ที่คุณอยากเห็น
-                  กระบวนการคัดเลือกว่าที่ผู้สมัคร/การอบรมและพัฒนา/ส.ส.เขต/ส.ส.บัญชีรายชื่อ</option>
-                  <option value="อของพรรค
-                  ช่องทางการสื่อสารต่างๆ ทั้ง Online Offline On Air/ Social Media พรรคและคนก้าวไกล /คอนเทนท์/ภาพ/วิดีโอ/ สื่อหาเสียง">อของพรรค
-                  ช่องทางการสื่อสารต่างๆ ทั้ง Online Offline On Air/ Social Media พรรคและคนก้าวไกล /คอนเทนท์/ภาพ/วิดีโอ/ สื่อหาเสียง</option>
-                  <option value="การรณรงค์สื่อสารนโยบาย 
-                  การจัดทำนโยบาย/ช่องทางการเสนอนโยบาย/กลุ่มเป้าหมาย/การสื่อสารนโยบาย/การผลักดันนโยบาย">การรณรงค์สื่อสารนโยบาย 
-                  การจัดทำนโยบาย/ช่องทางการเสนอนโยบาย/กลุ่มเป้าหมาย/การสื่อสารนโยบาย/การผลักดันนโยบาย</option>
-                  <option value="งานสภา
-                  ร่างกฎหมาย/การอภิปราย/กรรมาธิการ/ การทำงานกับพรรคร่วมฝ่ายค้าน">งานสภา
-                  ร่างกฎหมาย/การอภิปราย/กรรมาธิการ/ การทำงานกับพรรคร่วมฝ่ายค้าน</option>
-                  <option value="การทำงานพื้นที่ 
-                  การเข้าถึงประชาชน/การแก้ปัญหาในพื้นที่/การทำงานกับหน่วยราชการและผู้นำชุมชน">การทำงานพื้นที่ 
-                  การเข้าถึงประชาชน/การแก้ปัญหาในพื้นที่/การทำงานกับหน่วยราชการและผู้นำชุมชน</option>
-                  <option value="การสร้างเครือข่ายและกิจกรรมสมาชิก
-                  การแจ้งข่าวสาร/การมีส่วนร่วมของสมาชิกพรรค/การขยายฐานสมาชิก/แคมเปญการรับสมัครสมาชิก/วิธีการรับสมัครสมาชิก">การสร้างเครือข่ายและกิจกรรมสมาชิก
-                  การแจ้งข่าวสาร/การมีส่วนร่วมของสมาชิกพรรค/การขยายฐานสมาชิก/แคมเปญการรับสมัครสมาชิก/วิธีการรับสมัครสมาชิก</option>
-                  <option value="ระดมทุน 
-                  ช่องทางรับบริจาค/วิธีการระดมทุน/แคมเปญการระดมทุน">ระดมทุน 
-                  ช่องทางรับบริจาค/วิธีการระดมทุน/แคมเปญการระดมทุน</option>
+                  <option value="ผู้แทนฯ ที่คุณอยากเห็น">
+                    ผู้แทนฯ ที่คุณอยากเห็น
+                  </option>
+                  <option value="สื่อของพรรค">
+                    สื่อของพรรค
+                  </option>
+                  <option value="การรณรงค์สื่อสารนโยบาย">
+                    การรณรงค์สื่อสารนโยบาย
+                  </option>
+                  <option value="งานสภา">
+                    งานสภา
+                  </option>
+                  <option value="การทำงานพื้นที่">
+                    การทำงานพื้นที่
+                  </option>
+                  <option value="การสร้างเครือข่ายและกิจกรรมสมาชิก">
+                    การสร้างเครือข่ายและกิจกรรมสมาชิก
+                  </option>
+                  <option value="ระดมทุน">
+                    ระดมทุน
+                  </option>
                 </select>
               </div>
               <svg xmlns="http://www.w3.org/2000/svg" style="display: none;">
@@ -70,13 +70,15 @@
               </svg>
 
 
-      <%= f.text_field :tag_list, value: debate.tag_list.to_s,
-        placeholder: t("debates.form.tags_placeholder"),
-        data: { js_url: suggest_tags_path },
-        class: "tag-autocomplete" %>
+      <div style="display: none;">
+        <%= f.text_field :tag_list, value: debate.tag_list.to_s,
+          placeholder: t("debates.form.tags_placeholder"),
+          data: { js_url: suggest_tags_path },
+          class: "tag-autocomplete" %>
+      </div>
     </div>
 
-    <%= render SDG::RelatedListSelectorComponent.new(f) %>
+      <%= render SDG::RelatedListSelectorComponent.new(f) %>
   </fieldset>
 
   <div class="actions">
@@ -85,24 +87,23 @@
         <%= f.check_box :terms_of_service,
           title: t("form.accept_terms_title"),
           label: t("form.accept_terms",
-                   policy: link_to(t("form.policy"), "/privacy", target: "blank"),
-                   conditions: link_to(t("form.conditions"), "/conditions", target: "blank")
+                   policy: link_to(t("form.policy"), "https://www.moveforwardparty.org/privacy-policy/", target: "blank"),
+                   conditions: link_to(t("form.conditions"), "https://www.moveforwardparty.org/privacy-policy/", target: "blank")
                   ) %>
       </div>
     <% end %>
 
-    <%= f.submit(class: "button", value: t("debates.#{action_name}.form.submit_button")) %>
+    <%= f.submit(class: "button send-debates", value: t("debates.#{action_name}.form.submit_button")) %>
   </div>
 <% end %>
 
 <script>
 $(document).ready(function () {
-  $(function selectMult() {
-    $(".multiSelect").each(function (e) {
-      var self = $(this);
-      var field = self.find(".multiSelect_field");
-      var fieldOption = field.find("option");
-      var placeholder = field.attr("data-placeholder");
+    $(".multiSelect").each((e) => {
+      const self = $(this);
+      const field = self.find(".multiSelect_field");
+      const fieldOption = field.find("option");
+      const placeholder = field.attr("data-placeholder");
 
       field.hide().after(`<div class="multiSelect_dropdown"></div>
                                 <ul class="multiSelect_list"></ul>
@@ -110,10 +111,9 @@ $(document).ready(function () {
 
       fieldOption.each(function (e) {
         $(".multiSelect_list").append(
-          `<li id="${$(this)
-            .text()
-            .toLowerCase()}" class="multiSelect_option" data-value="` +
-            $(this).val() +
+          `<li id="${($(this).text().trim()
+          .toLowerCase()).replace(/\s/g, '')}" class="multiSelect_option" data-value="` +
+            $(this).val().trim() +
             `">
                   <a class="multiSelect_text">` +
             $(this).text() +
@@ -122,32 +122,30 @@ $(document).ready(function () {
         );
       });
 
-      var dropdown = self.find(".multiSelect_dropdown");
-      var list = self.find(".multiSelect_list");
-      var option = self.find(".multiSelect_option");
-      var optionText = self.find(".multiSelect_text");
+      const dropdown = self.find(".multiSelect_dropdown");
+      const list = self.find(".multiSelect_list");
+      const option = self.find(".multiSelect_option");
+      const optionText = self.find(".multiSelect_text");
 
       dropdown.attr("data-multiple", "true");
       list.css("top", dropdown.height() + 5);
 
       option.click(function (e) {
-        var self = $(this);
+        const self = $(this);
         e.stopPropagation();
         self.addClass("-selected");
         field
           .find("option:contains(" + self.children().text() + ")")
           .prop("selected", true);
-        xxxx = dropdown;
-        if (dropdown.children()) {
-        }
+        
         dropdown
           .append(function (e) {
             return $(
-              '<span class="multiSelect_choice">' +
+              '<span class="multiSelect_choice"'+'data-value="'+self.children().text().replace(/\s/g, '')+'">' +
                 self.children().text() +
                 '<svg class="multiSelect_deselect -iconX"><use href="#iconX"></use></svg></span>'
             ).click(function (e) {
-              var self = $(this);
+              const self = $(this);
               e.stopPropagation();
               self.remove();
               list
@@ -163,6 +161,11 @@ $(document).ready(function () {
               if (dropdown.children(":visible").length === 0) {
                 dropdown.removeClass("-hasValue");
               }
+              if($('#category span.multiSelect_choice').length < 1) {
+                $('.send-debates').attr('disabled', true)
+              } else {
+                $('.send-debates').attr('disabled', false)
+              }
             });
           })
           .addClass("-hasValue");
@@ -172,6 +175,11 @@ $(document).ready(function () {
             '<h5 class="multiSelect_noselections">ไม่มีการเลือก</h5>'
           );
         }
+        if($('#category span.multiSelect_choice').length < 1) {
+          $('.send-debates').attr('disabled', true)
+        } else {
+          $('.send-debates').attr('disabled', false)
+        }
       });
 
       dropdown.click(function (e) {
@@ -191,10 +199,72 @@ $(document).ready(function () {
         }
       });
     });
-  });
 
-  //function setData() {
-  //  var contents = $('#debate_tag_list').value += ;
-  //}
+    $('.send-debates').on('click', (e) => {
+      let categories = [];
+      $('#category span.multiSelect_choice').map((index, elem) => { 
+        categories.push($(elem).attr('data-value').trim())
+      })
+      $('#debate_tag_list').val(categories)
+    });
+
+    if($('#debate_tag_list').val()){
+      $('.send-debates').attr('disabled', false)
+      $(".multiSelect").each(function (e) {
+        const self = $(this);
+        const field = self.find(".multiSelect_field");
+        const fieldOption = field.find("option");
+        const placeholder = field.attr("data-placeholder");
+
+        const dropdown = self.find(".multiSelect_dropdown");
+        const list = self.find(".multiSelect_list");
+        const option = self.find(".multiSelect_option");
+        const optionText = self.find(".multiSelect_text");
+
+        $('#debate_tag_list').val().split(',').map((elem) => {
+          dropdown.attr("data-multiple", "true");
+          const self = $('.multiSelect_list li#'+elem.trim().replace(/\s/g, ''));
+          if(self.length){
+            self.addClass("-selected");
+            field
+            .find("option:contains(" + self.children().text() + ")")
+            .prop("selected", true);
+          dropdown
+          .append(function (e) {
+            return $(
+              '<span class="multiSelect_choice"'+'data-value="'+self.children().text()+'">' +
+                self.children().text() +
+                '<svg class="multiSelect_deselect -iconX"><use href="#iconX"></use></svg></span>'
+            )        .click(function (e) {
+              const self = $(this);
+              e.stopPropagation();
+              self.remove();
+              list
+                .find(".multiSelect_option:contains(" + self.text() + ")")
+                .removeClass("-selected");
+              list
+                .css("top", dropdown.height() + 5)
+                .find(".multiSelect_noselections")
+                .remove();
+              field
+                .find("option:contains(" + self.text() + ")")
+                .prop("selected", false);
+              if (dropdown.children(":visible").length === 0) {
+                dropdown.removeClass("-hasValue");
+              }
+              if($('#category span.multiSelect_choice').length < 1) {
+                $('.send-debates').attr('disabled', true)
+              } else {
+                $('.send-debates').attr('disabled', false)
+              }
+            });
+          })
+          .addClass("-hasValue");
+          }
+        })
+      });
+    } else {
+      $('.send-debates').attr('disabled', true)
+    }
 });
 </script>
\ No newline at end of file
diff --git a/app/views/debates/index.html.erb b/app/views/debates/index.html.erb
index f6f0e0ff..ba00dee3 100644
--- a/app/views/debates/index.html.erb
+++ b/app/views/debates/index.html.erb
@@ -9,7 +9,7 @@
 <% end %>
 
 <main>
-  <!-- <% if @search_terms || @advanced_search_terms %>
+  <% if @search_terms || @advanced_search_terms %>
     <%= render Shared::SearchResultsSummaryComponent.new(
       results: @debates,
       search_terms: @search_terms,
@@ -17,9 +17,7 @@
     ) %>
   <% else %>
     <%= render "shared/section_header", i18n_namespace: "debates.index.section_header", image: "debates" %>
-  <% end %> -->
-
-  <%= render "shared/section_header", i18n_namespace: "debates.index.section_header", image: "debates" %>
+  <% end %>
 
   <% if feature?("user.recommendations") && @recommended_debates.present? %>
     <%= render "shared/recommended_index", recommended: @recommended_debates,
@@ -77,11 +75,25 @@
       <% end %> -->
     </div>
 
-    <div class="small-12 medium-3 column">
+    <div class="small-12 medium-3 column trending-tag">
 
       <aside class="margin-bottom">
         <%= link_to t("debates.index.start_debate"), new_debate_path, class: "button expanded" %>
-        <%= render "shared/tag_cloud", taggable: "Debate" %>
+        <!-- <%= render "shared/tag_cloud", taggable: "Debate" %> -->
+
+        <br>
+        <div class="tag-cloud">
+          <div class="sidebar-divider"></div>
+          <h1 class="sidebar-title"><%= t("shared.tags_cloud.tags") %></h1>
+          <br>
+          <a href="/debates?search=ผู้แทนฯ+ที่คุณอยากเห็น">ผู้แทนฯ ที่คุณอยากเห็น</a>
+          <a href="/debates?search=สื่อของพรรค">สื่อของพรรค</a>
+          <a href="/debates?search=การรณรงค์สื่อสารนโยบาย">การรณรงค์สื่อสารนโยบาย</a>
+          <a href="/debates?search=งานสภา">งานสภา</a>
+          <a href="/debates?search=การทำงานพื้นที่">การทำงานพื้นที่</a>
+          <a href="/debates?search=การสร้างเครือข่ายและกิจกรรมสมาชิก">การสร้างเครือข่ายและกิจกรรมสมาชิก</a>
+          <a href="/debates?search=ระดมทุน">ระดมทุน</a>
+        </div>
       </aside>
     </div>
 
diff --git a/app/views/layouts/devise.html.erb b/app/views/layouts/devise.html.erb
index 73378271..c48fdb98 100644
--- a/app/views/layouts/devise.html.erb
+++ b/app/views/layouts/devise.html.erb
@@ -8,24 +8,20 @@
   <div class="page-login">
     <body class="auth-page">
       <%= raw setting["html.per_page_code_body"] %>
-      <div class="wrapper">
+      <div class="wrapper_devise">
         <div class="left_left">
-          <div class="small-12 medium-4 column">
+          <div class="small-12 medium-8 column">
             <h1 class="logo margin">
               <div class="img_login">
                   <div class="top">
-                    <%= back_link_to class: "back_login" %>
-                      <%= link_to root_path do %>
-                        <%= image_tag(image_path_for("logo_header.png"), class: "float-left", alt: setting["org_name"]) %>
-                      <% end %>
-                  </div>
-                  <div class="bottom">
-                    <h3><%= t("devise_views.rule.title") %></h3>
-                    <h5><%= t("devise_views.rule.rule_1") %></h5>
-                    <h5><%= t("devise_views.rule.rule_2") %></h5>
-                    <h5><%= t("devise_views.rule.rule_3") %></h5>
-                    <h5><%= t("devise_views.rule.rule_4") %></h5>
+                    <%= back_link_to debates_path class: "back_login" %>
+                    <%= image_tag(image_path_for("logo_header.png"), class: "float-left", alt: setting["org_name"]) %>
                   </div>
+                  <h3 class ="title_login_header" ><%= t("devise_views.rule.title") %></h3>
+                  <h5 class ="title_login"><%= t("devise_views.rule.rule_1") %></h5>
+                  <h5 class ="title_login"><%= t("devise_views.rule.rule_2") %></h5>
+                  <h5 class ="title_login"><%= t("devise_views.rule.rule_3") %></h5>
+                  <h5 class ="title_login"><%= t("devise_views.rule.rule_4") %></h5>
               </div>
             </h1>
           </div>
@@ -33,7 +29,7 @@
         <div class="right_right">
           <div class="small-12 medium-8 column" >
             <div class="row" >
-              <div class="small-12 medium-9 large-7 small-centered column" >
+              <div class="small-12 medium-9  small-centered column" >
                 <div class="auth-form margin" >
                   <%= render "layouts/flash" %>
 
diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml
index 20c977dc..3a42ce1c 100644
--- a/config/locales/en/general.yml
+++ b/config/locales/en/general.yml
@@ -701,10 +701,10 @@ en:
         destroy:
           notice: "You have stopped following this investment project! <br> You will no longer receive notifications related to this project."
       proposal:
-          create:
-            notice: "Now you are following this citizen proposal! <br> We will notify you of changes as they occur so that you are up-to-date."
-          destroy:
-            notice: "You have stopped following this citizen proposal! <br> You will no longer receive notifications related to this proposal."
+        create:
+          notice: "Now you are following this citizen proposal! <br> We will notify you of changes as they occur so that you are up-to-date."
+        destroy:
+          notice: "You have stopped following this citizen proposal! <br> You will no longer receive notifications related to this proposal."
     print:
       print_button: Print this info
     search: Search
@@ -750,9 +750,9 @@ en:
       cards: Cards
       list: List
     recommended_index:
-        title: Recommendations
-        see_more: See more recommendations
-        hide: Hide recommendations
+      title: Recommendations
+      see_more: See more recommendations
+      hide: Hide recommendations
     translations:
       select_language_prompt: Choose language
       remove_language: Remove language
diff --git a/config/locales/th/activerecord.yml b/config/locales/th/activerecord.yml
index 6f0affff..ebf899ff 100644
--- a/config/locales/th/activerecord.yml
+++ b/config/locales/th/activerecord.yml
@@ -32,8 +32,8 @@ th:
         one: "Comment"
         other: "Comments"
       debate:
-        one: "Debate"
-        other: "Debates"
+        one: "ข้อเสนอ"
+        other: "ข้อเสนอ"
       tag:
         one: "Tag"
         other: "Tags"
diff --git a/config/locales/th/admin.yml b/config/locales/th/admin.yml
index a6a46e08..e815007f 100644
--- a/config/locales/th/admin.yml
+++ b/config/locales/th/admin.yml
@@ -43,7 +43,7 @@ th:
       edit:
         editing: Edit banner
         form:
-          submit_button: เปลี่ยนแปลงข้อเสนอ
+          submit_button: บันทึกข้อเสนอ
       new:
         creating: Create banner
       update:
@@ -225,7 +225,7 @@ th:
         main_call_to_action: "Main call to action (optional)"
         main_call_to_action_description: "This link will appear on main banner of this participatory budget when this phase is enabled and encourages your user to perform a specific action like creating a proposal, voting for existing ones, or learn more about the process."
         name_help_text: "This is the title of the phase users will read on the header whenever this phase is active."
-        save_changes: เปลี่ยนแปลงข้อเสนอ
+        save_changes: บันทึกข้อเสนอ
       index:
         title: "%{budget} phases"
     budget_investments:
@@ -568,7 +568,7 @@ th:
           notice: Process deleted successfully
         edit:
           back: Back
-          submit_button: เปลี่ยนแปลงข้อเสนอ
+          submit_button: บันทึกข้อเสนอ
         form:
           enabled: Enabled
           process: Process
@@ -636,7 +636,7 @@ th:
           notice: Draft deleted successfully
         edit:
           back: Back
-          submit_button: เปลี่ยนแปลงข้อเสนอ
+          submit_button: บันทึกข้อเสนอ
           warning: You've edited the text, don't forget to click on Save to permanently save the changes.
           markdown_changes_message: "You've edited the text without saving it. Do you confirm to leave the page?"
         form:
@@ -677,7 +677,7 @@ th:
         edit:
           back: Back
           title: "Edit “%{question_title}”"
-          submit_button: เปลี่ยนแปลงข้อเสนอ
+          submit_button: บันทึกข้อเสนอ
         form:
           add_option: Add option
           value_placeholder: Add a closed answer
@@ -1388,7 +1388,7 @@ th:
         coordinates_help: Coordinates that will generate a clickable area on an HTML image map
       edit:
         form:
-          submit_button: เปลี่ยนแปลงข้อเสนอ
+          submit_button: บันทึกข้อเสนอ
         editing: Editing geozone
         back: Go back
       new:
@@ -1437,7 +1437,7 @@ th:
         stats_title: Stats
         summary:
           comment_votes: Comment votes
-          comments: Comments หหห
+          comments: Comments
           debate_votes: Debate votes
           debates: Debates
           proposal_votes: Proposal votes
diff --git a/config/locales/th/devise.yml b/config/locales/th/devise.yml
index 39a6b382..1c338895 100644
--- a/config/locales/th/devise.yml
+++ b/config/locales/th/devise.yml
@@ -19,7 +19,7 @@ th:
       last_attempt: "You have one more attempt remaining before your account is blocked."
       not_found_in_database: "Invalid %{authentication_keys} or password."
       timeout: "Your session has expired. Please sign in again to continue."
-      unauthenticated: "You must sign in or register to continue."
+      unauthenticated: "คุณต้องลงชื่อเข้าใช้หรือลงทะเบียนเพื่อดำเนินการต่อ"
       unconfirmed: "To continue, please click on the confirmation link that we have sent you via email"
     mailer:
       confirmation_instructions:
@@ -29,7 +29,7 @@ th:
       unlock_instructions:
         subject: "Unlocking instructions"
     omniauth_callbacks:
-      failure: "It has not been possible to authorize you as %{kind} because \"%{reason}\"."
+      failure: 'It has not been possible to authorize you as %{kind} because "%{reason}".'
       success: "Successfully identified as %{kind}."
     passwords:
       no_token: "You cannot access this page except through a password reset link. If you have accessed it through a password reset link, please check that the URL is complete."
@@ -46,9 +46,9 @@ th:
       update_needs_confirmation: "Your account has been updated successfully; however, we need to verify your new email address. Please check your email and click on the link to complete the confirmation of your new email address."
       updated: "Your account has been updated successfully."
     sessions:
-      signed_in: "You have been signed in successfully."
-      signed_out: "You have been signed out successfully."
-      already_signed_out: "You have been signed out successfully."
+      signed_in: "คุณลงชื่อเข้าใช้สำเร็จแล้ว"
+      signed_out: "คุณออกจากระบบเรียบร้อยแล้ว"
+      already_signed_out: "คุณออกจากระบบเรียบร้อยแล้ว"
     unlocks:
       send_instructions: "In a few minutes, you will receive an email containing instructions on unlocking your account."
       send_paranoid_instructions: "If you have an account, in a few minutes you will receive an email containing instructions on unlocking your account."
diff --git a/config/locales/th/general.yml b/config/locales/th/general.yml
index 7419f0f1..9162c6f5 100644
--- a/config/locales/th/general.yml
+++ b/config/locales/th/general.yml
@@ -8,7 +8,7 @@ th:
       personal: Personal details
       public_interests_my_title_list: Tags of elements you follow
       public_interests_user_title_list: Tags of elements this user follows
-      save_changes_submit: เปลี่ยนแปลงข้อเสนอ
+      save_changes_submit: บันทึกข้อเสนอ
       recommendations: Recommendations
       title: My account
       user_permission_info: With your account you can...
@@ -67,7 +67,7 @@ th:
   debates:
     create:
       form:
-        submit_button: Start a debate
+        submit_button: ส่งข้อเสนอ
     debate:
       comments:
         one: 1 ความคิดเห็น
@@ -80,7 +80,7 @@ th:
     edit:
       editing: แก้ไขข้อเสนอ
       form:
-        submit_button: เปลี่ยนแปลงข้อเสนอ
+        submit_button: บันทึกข้อเสนอ
       show_link: ดูข้อเสนอ
     form:
       tags_instructions: Tag this debate.
@@ -96,7 +96,7 @@ th:
         recommendations: แนะนำ
       recommendations:
         without_results: There are no debates related to your interests
-        without_interests: Follow proposals so we can give you recommendations
+        without_interests: ไม่พบกระทู้ที่เกี่ยวข้อง
         disable: "Recommendations for debates will stop showing if you dismiss them. You can enable them again in 'My account' page"
         actions:
           success: "Recommendations for debates are now disabled for this account"
@@ -125,7 +125,7 @@ th:
       recommendation_three: Ruthless criticism is very welcome. This is a space for reflection. But we recommend that you stick to elegance and intelligence. The world is a better place with these virtues in it.
       recommendation_two: Any debate or comment suggesting illegal action will be deleted, as well as those intending to sabotage the debate spaces. Anything else is allowed.
       recommendations_title: Recommendations for creating a debate
-      start_new: Start a debate
+      start_new: ส่งข้อเสนอ
     show:
       author_deleted: User deleted
       comments:
@@ -139,7 +139,7 @@ th:
       author: ผู้เขียน
     update:
       form:
-        submit_button: เปลี่ยนแปลงข้อเสนอ
+        submit_button: บันทึกข้อเสนอ
   errors:
     messages:
       allowed_file_content_types: "content type must be one of %{types}"
@@ -306,7 +306,7 @@ th:
     edit:
       editing: Edit proposal
       form:
-        submit_button: เปลี่ยนแปลงข้อเสนอ
+        submit_button: บันทึกข้อเสนอ
       show_link: View proposal
     retire_form:
       title: Withdraw proposal
@@ -343,7 +343,7 @@ th:
         recommendations: recommendations
       recommendations:
         without_results: There are not proposals related to your interests
-        without_interests: Follow proposals so we can give you recommendations
+        without_interests: ไม่พบกระทู้ที่เกี่ยวข้อง
         disable: "Recommendations for proposals will stop showing if you dismiss them. You can enable them again in 'My account' page"
         actions:
           success: "Recommendations for proposals are now disabled for this account"
@@ -366,8 +366,8 @@ th:
         placeholder: Search proposals...
         title: Search
       search_results:
-        one: " containing the term <strong>'%{search_term}'</strong>"
-        other: " containing the term <strong>'%{search_term}'</strong>"
+        one: "คำว่า <strong>'%{search_term}'</strong>"
+        other: "คำว่า <strong>'%{search_term}'</strong>"
       select_order_long: "You are viewing proposals according to:"
       start_proposal: Create a proposal
       title: Proposals
@@ -442,7 +442,7 @@ th:
       draft: Proposal in draft. Cannot yet get supports, nor does it appear in the list of proposals.
     update:
       form:
-        submit_button: เปลี่ยนแปลงข้อเสนอ
+        submit_button: บันทึกข้อเสนอ
   dashboard:
     menu:
       my_proposal: Edit my proposal
@@ -731,7 +731,7 @@ th:
         message: "You are seeing %{limit} of %{count} proposals containing the term '%{query}'"
         see_all: "See all"
     tags_cloud:
-      tags: Trending
+      tags: หมวดหมู่
       districts: "Districts"
       districts_list: "Districts list"
       categories: "Categories"
@@ -788,11 +788,11 @@ th:
     manage:
       all: "You do not have permission to carry out the action '%{action}' on %{subject}."
   users:
-    login_to_comment: "You must %{signin} or %{signup} to leave a comment."
-    login_to_continue: "You must %{signin} or %{signup} to continue."
-    signin: "sign in"
-    signup: "sign up"
-    verify_account: "verify your account"
+    login_to_comment: "คุณต้อง %{signin} หรือ %{signup} เพื่อแสดงความคิดเห็น"
+    login_to_continue: "คุณต้อง %{signin} หรือ %{signup} เพื่อจะดำเนินการต่อ"
+    signin: "เข้าสู่ระบบ"
+    signup: "ลงชื่อ"
+    verify_account: "ตรวจสอบบัญชีของคุณ"
     direct_messages:
       new:
         direct_messages_bloqued: "This user has decided not to receive direct messages"
@@ -808,17 +808,17 @@ th:
       deleted_budget_investment: This investment project has been deleted
       proposals: Proposals
       proposals_status: Status
-      debates: Debates
+      debates: ข้อเสนอ
       budget_investments: Budget investments
-      comments: Comments
+      comments: ความคิดเห็น
       actions: Actions
       filters:
         comments:
-          one: 1 Comment
-          other: "%{count} Comments"
+          one: 1 ความคิดเห็น
+          other: "%{count} ความคิดเห็น"
         debates:
-          one: 1 Debate
-          other: "%{count} Debates"
+          one: 1 ข้อเสนอ
+          other: "%{count} ข้อเสนอ"
         proposals:
           one: 1 Proposal
           other: "%{count} Proposals"
@@ -895,7 +895,7 @@ th:
       user_permission_verify_my_account: Verify my account
   invisible_captcha:
     sentence_for_humans: "If you are human, ignore this field"
-    timestamp_error_message: "Sorry, that was too quick! Please resubmit."
+    timestamp_error_message: "ขออภัย มันเร็วเกินไป! กรุณาส่งใหม่"
   related_content:
     title: "เนื้อหาที่เกี่ยวข้อง"
     add: "เพิ่มเนื้อหาที่เกี่ยวข้อง"
diff --git a/config/locales/th/kaminari.yml b/config/locales/th/kaminari.yml
index e6e0e820..ea48edf0 100644
--- a/config/locales/th/kaminari.yml
+++ b/config/locales/th/kaminari.yml
@@ -9,12 +9,12 @@ th:
         display_entries: Displaying <strong>%{first}&nbsp;-&nbsp;%{last}</strong> of <strong>%{total} %{entry_name}</strong>
       one_page:
         display_entries:
-          one: There is <strong>1 %{entry_name}</strong>
-          other: There are <strong>%{count} %{entry_name}</strong>
-          zero: "%{entry_name} cannot be found"
+          one: มี <strong>1 %{entry_name}</strong>
+          other: มี <strong>%{count} %{entry_name}</strong>
+          zero: "%{entry_name}ค้นหาไม่เจอ"
   views:
     pagination:
-      current: You're on page
+      current: คุณอยู่ที่เพจ
       first: หน้าสุด
       last: หลังสุด
       next: ถัดไป
diff --git a/config/locales/th/rails.yml b/config/locales/th/rails.yml
index d2955b05..caa123a1 100644
--- a/config/locales/th/rails.yml
+++ b/config/locales/th/rails.yml
@@ -136,9 +136,9 @@ th:
     select:
       prompt: Please select
     submit:
-      create: Create %{model}
-      submit: Save %{model}
-      update: Update %{model}
+      create: ส่ง%{model}
+      submit: บันทึก%{model}
+      update: บันทึก%{model}
   number:
     currency:
       format:
diff --git a/config/locales/th/responders.yml b/config/locales/th/responders.yml
index fdf33a1c..f09393eb 100644
--- a/config/locales/th/responders.yml
+++ b/config/locales/th/responders.yml
@@ -3,7 +3,7 @@ th:
     actions:
       create:
         notice: "%{resource_name} created successfully."
-        debate: "Debate created successfully."
+        debate: "สร้างข้อเสนอสำเร็จแล้ว"
         direct_message: "You message has been sent successfully."
         poll: "Poll created successfully."
         poll_booth: "Booth created successfully."
@@ -21,7 +21,7 @@ th:
         notice: Changes saved
       update:
         notice: "%{resource_name} updated successfully."
-        debate: "Debate updated successfully."
+        debate: "อัปเดตการอภิปรายเรียบร้อยแล้ว"
         poll: "Poll updated successfully."
         poll_booth: "Booth updated successfully."
         active_poll: "Polls description updated successfully."
diff --git a/config/locales/th/settings.yml b/config/locales/th/settings.yml
index b0f0e55c..5c6a5a7c 100644
--- a/config/locales/th/settings.yml
+++ b/config/locales/th/settings.yml
@@ -183,7 +183,7 @@ th:
       proposals: "Proposals"
       proposals_description: "Citizens' proposals are an opportunity for neighbours and collectives to decide directly how they want their society to be, after getting sufficient support and submitting to a citizens' vote"
       polls: "Polls"
-      polls_description:  "Citizens' polls are a participatory mechanism by which citizens with voting rights can make direct decisions"
+      polls_description: "Citizens' polls are a participatory mechanism by which citizens with voting rights can make direct decisions"
       budgets: "Participatory budgeting"
       budgets_description: "With participatory budgets, citizens decide which projects presented by their neighbours will receive a part of the budget"
       legislation: "Collaborative Legislation"
diff --git a/config/locales/th/valuation.yml b/config/locales/th/valuation.yml
index 1efce264..677b09e3 100644
--- a/config/locales/th/valuation.yml
+++ b/config/locales/th/valuation.yml
@@ -61,7 +61,7 @@ th:
         feasibility: Feasibility
         valuation_finished_alert: "Are you sure you want to mark this report as completed? If you do it, it can no longer be modified."
         not_feasible_alert: "An email will be sent immediately to the author of the project with the report of unfeasibility."
-        save: เปลี่ยนแปลงข้อเสนอ
+        save: บันทึกข้อเสนอ
       notice:
         valuate: "Dossier updated"
       valuation_comments: Valuation comments