diff --git a/app/assets/images/miniColors/circle.gif b/app/assets/images/miniColors/circle.gif
new file mode 100755
index 00000000..599f7f13
Binary files /dev/null and b/app/assets/images/miniColors/circle.gif differ
diff --git a/app/assets/images/miniColors/gradient.png b/app/assets/images/miniColors/gradient.png
new file mode 100755
index 00000000..561cdd9c
Binary files /dev/null and b/app/assets/images/miniColors/gradient.png differ
diff --git a/app/assets/images/miniColors/line.gif b/app/assets/images/miniColors/line.gif
new file mode 100755
index 00000000..9eb19837
Binary files /dev/null and b/app/assets/images/miniColors/line.gif differ
diff --git a/app/assets/images/miniColors/rainbow.png b/app/assets/images/miniColors/rainbow.png
new file mode 100755
index 00000000..8d6c71bf
Binary files /dev/null and b/app/assets/images/miniColors/rainbow.png differ
diff --git a/app/assets/images/miniColors/trigger.png b/app/assets/images/miniColors/trigger.png
new file mode 100755
index 00000000..8c169fd6
Binary files /dev/null and b/app/assets/images/miniColors/trigger.png differ
diff --git a/vendor/built_in_modules/faq/app/views/panel/faq/back_end/qas/_form.html.erb b/vendor/built_in_modules/faq/app/views/panel/faq/back_end/qas/_form.html.erb
index 014e826e..ee937ea6 100644
--- a/vendor/built_in_modules/faq/app/views/panel/faq/back_end/qas/_form.html.erb
+++ b/vendor/built_in_modules/faq/app/views/panel/faq/back_end/qas/_form.html.erb
@@ -16,16 +16,16 @@
 <div class="input-area">
 
 <!-- Module Tabs -->
-    <div class="nav-name"><strong>Module</strong></div>
+    <div class="nav-name"><strong><%= t(:module) %></strong></div>
     <ul class="nav nav-pills module-nav">
         <li class="active">
-          <a href="#basic" data-toggle="tab">Basic</a>
+          <a href="#basic" data-toggle="tab"><%= t(:basic) %></a>
         </li>
         <li>
-          <a href="#status" data-toggle="tab">Status</a>
+          <a href="#status" data-toggle="tab"><%= t(:status) %></a>
         </li>
         <li>
-          <a href="#tag" data-toggle="tab">Tags</a>
+          <a href="#tag" data-toggle="tab"><%= t(:tags) %></a>
         </li>
     </ul>
 
@@ -231,4 +231,5 @@
       })
     });
   </script>
-<% end %>
\ No newline at end of file
+<% end %>
+
diff --git a/vendor/built_in_modules/faq/app/views/panel/faq/back_end/qas/new.html.erb b/vendor/built_in_modules/faq/app/views/panel/faq/back_end/qas/new.html.erb
index 47e6c67c..49ec7437 100644
--- a/vendor/built_in_modules/faq/app/views/panel/faq/back_end/qas/new.html.erb
+++ b/vendor/built_in_modules/faq/app/views/panel/faq/back_end/qas/new.html.erb
@@ -1,7 +1,6 @@
 
 <%= flash_messages %>
 <div id="poststuff">
-<h1><%= t('qa.new_faq') %></h1>
 <%= form_for @qa, :url => panel_faq_back_end_qas_path, :html => {:class => 'form-horizontal main-forms'} do |f| %>
 	<%= render :partial => 'form', :locals => {:f => f} %>
 <% end %>
diff --git a/vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_form.html.erb b/vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_form.html.erb
index 46108ee1..3ed4c021 100644
--- a/vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_form.html.erb
+++ b/vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_form.html.erb
@@ -1,76 +1,111 @@
-<% # encoding: utf-8 %>
+<% content_for :page_specific_css do %>
+  <%= stylesheet_link_tag "lib/main-forms" %>
+  <%= stylesheet_link_tag "lib/fileupload" %>
+  <%= stylesheet_link_tag "lib/main-list" %>
+<% end %>
+<% content_for :page_specific_javascript do %>
+  <%= javascript_include_tag "lib/bootstrap-fileupload" %>
+  <%= javascript_include_tag "lib/bootstrap-datetimepicker" %>
+  <%= javascript_include_tag "lib/datetimepicker/datetimepicker.js" %>
+  <%= javascript_include_tag "lib/modal-preview" %>
+  <%= javascript_include_tag "lib/file-type" %>
+<% end %>
+<%= f.error_messages %>
+<fieldset>
+  <div class="input-area">
+    <div class="nav-name"><strong><%= t(:module) %></strong></div>
+     <ul class="nav nav-pills module-nav">
+      <li class="active">
+        <a href="#basic" data-toggle="tab"><%= t(:basic) %></a>
+      </li>
+      <li>
+        <a href="#redirect" data-toggle="tab"><%= t('survey.redirect') %></a>
+      </li>
+    </ul>
+
+  <div class="tab-content module-area">
+
+  <!-- Basic Module -->
+    <div class="tab-pane fade in active" id="basic">
+      <div class="input-area">
+         <div class="control-group">
+            <label class="control-label muted"><%= t(:start) %></label>
+            <div class="controls">
+              <%= f.datetime_picker :postdate, :no_label => true %>
+            </div>
+          </div>
+
+          <div class="control-group">
+            <label class="control-label muted"><%= t(:end) %></label>
+            <div class="controls">
+              <%= f.datetime_picker :deadline, :no_label => true %>
+            </div>
+          </div>
+
+      </div>
+    </div>
+    <div class="tab-pane fade" id="redirect">
+      <div class="input-area">
+         <div class="control-group">
+          <label class="control-label muted"><%= t('survey.redirect_mode') %></label>
+           <div class="controls">
+              <%= f.check_box :redirect_mode %>
+           </div>
+         </div>
+         <div class="control-group">
+          <label class="control-label muted"><%= t('survey.redirect_url') %></label>
+           <div class="controls">
+              <%= f.text_field :redirect_url %>
+           </div>
+         </div>
+      </div>
+    </div>
+
+  </div>
+  <div class="nav-name"><strong>Language</strong></div>
+  <ul class="nav nav-pills language-nav">
+      <% @site_valid_locales.each_with_index do |locale, i| %>
+          <li <%= ( i == 0 ) ? "class=active" : '' %>><a data-toggle="tab" href=".<%= locale %>"><%= I18nVariable.from_locale(locale) %></a></li>
+      <% end %>
+  </ul>
+
+  <!-- Language -->
+  <div class="tab-content language-area">
+    <% @site_valid_locales.each_with_index do |locale, i| %>
+      <div class="<%= locale %> fade tab-pane <%= ( i == 0 ) ? "in active" : '' %>">
+          <div class="control-group input-title">
+              <%= f.label :title , t('survey.question'), :class=>"control-label muted" %>
+              <div class="controls">
+                  <%= f.fields_for :title_translations do |f| %>
+                      <%= f.text_field locale, :class=>'post-title', :value => (@survey.title_translations[locale] rescue nil) %>
+                  <% end %>
+              </div>
+          </div>
+          <div class="control-group input-content">
+              <%= f.label :description ,t('survey.description'), :class => "control-label muted" %>
+              <%= f.fields_for :description_translations do |f| %>
+                  <div class="controls">
+                      <div class="textarea">
+                          <%= f.text_area locale, :style=>"width:100%", :class => 'ckeditor input-block-level', :value => (@survey.description_translations[locale] rescue nil) %>
+                      </div>
+                  </div>
+              <% end %>
+          </div>
+      </div>
+    <% end %>
+  </div>
+</div>
+</fieldset>
+
 <div id= "poststuff">
 
-  <%= f.error_messages %>
 
-  <div id="sub-wiget">
-    <div id="widget-date" class="widget-box widget-size-300">
-      <div class="widget-action clear tip" title="Set the announcement to start and end dates">
-        <a href="#" class="action"><i class="icon-exclamation-sign icon-white"></i></a>
-      </div>
-      <h3 class="widget-title"><i class="icons-calendar"></i><%= t(:date_) %></h3>
-        <div class="widget-content clear">
-        <div class="control-group">
-          <%= f.datetime_picker :postdate, :picker_type => 'separated', :label => t('survey.postdate') %>
-        </div>
-        <div class="control-group">
-          <%= f.datetime_picker :deadline, :picker_type => 'separated', :label => t('survey.deadline') %>
-        </div>
-      </div>
-    </div>
-    <div id="widget-redirect" class="widget-box widget-size-300">
-      <div class="widget-action clear tip">
-        <a href="#" class="action"><i class="icon-exclamation-sign icon-white"></i></a>
-      </div>
-      <h3 class="widget-title"><i class="icons-calendar"></i><%= t('survey.redirect') %></h3>
-        <div class="widget-content clear">
-        <div class="control-group">
-          <%= f.label :redirect_mode, t('survey.redirect_mode')%> 
-          <%= f.check_box :redirect_mode %>
-        </div>
-        <div class="control-group">
-          <%= f.label :redirect_url, t('survey.redirect_url') %>
-          <%= f.text_field :redirect_url %>
-        </div>
-      </div>
-    </div>
-  </div>
+
+  
 
   <div id="post-body">
     <div id="post-body-content" class="clear">
-      <ul class="nav nav-tabs">
-        <% @site_valid_locales.each_with_index do |locale, i| %>
-          <li <%= ( i == 0 ) ? "class=active" : '' %>><a data-toggle="tab" href=".<%= locale %>"><%= I18nVariable.from_locale(locale) %></a></li>
-        <% end %>
-      </ul>
-      <div class="tab-content">
-
-        <% @site_valid_locales.each_with_index do |locale, i| %>
-
-          <div class="<%= locale %> fade tab-pane <%= ( i == 0 ) ? "in active" : '' %>">
-            <div class="title">
-              <%= f.label :title , t('survey.title') %>
-              <%= f.fields_for :title_translations do |f| %>
-                <%= I18nVariable.from_locale(locale) %>
-                <%= f.text_field locale, :style=>"width:98%;", :class=>'post-title', :value => (@survey.title_translations[locale] rescue nil) %>
-              <% end %>
-            </div>
-
-            <div class="description">
-              <%= f.label :description ,t('survey.description') %>
-              <%= f.fields_for :description_translations do |f| %>
-                <%= I18nVariable.from_locale(locale) %>
-                <%= f.text_area locale, :rows => 5, :style=>"width:98%;", :value => (@survey.description_translations[locale] rescue nil) %>
-              <% end %>       
-            </div>
-
-          </div>
-
-        <% end %>
-
-      </div>
-
-      <div class="main-widget">
+       <div class="main-widget">
         <div id="survey_questions_wrapper">
           <div id='survey_questions' class="survey_questions_block">
             <% @survey.survey_questions.each_with_index do |survey_question, i| %>
diff --git a/vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/new.html.erb b/vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/new.html.erb
index cb9ee207..5bf625df 100644
--- a/vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/new.html.erb
+++ b/vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/new.html.erb
@@ -1,7 +1,6 @@
 <%= flash_messages %>
 <div id="poststuff">
-<h1><%= t('survey.new_survey') %></h1>
-<%= form_for @survey, :url => panel_survey_back_end_surveys_path, :html => {:class => 'clear'} do |f| %>
+<%= form_for @survey, :url => panel_survey_back_end_surveys_path, :html => {:class => 'form-horizontal main-forms'} do |f| %>
   <%= render :partial => 'form', :locals => {:f => f} %>
 <% end %>
 </div>
\ No newline at end of file