diff --git a/module/common/view/kindeditor.html.php b/module/common/view/kindeditor.html.php
index d3db022618..cda16df7ea 100755
--- a/module/common/view/kindeditor.html.php
+++ b/module/common/view/kindeditor.html.php
@@ -38,7 +38,7 @@ var fullTools =
 $(document).ready(initKindeditor);
 function initKindeditor(afterInit)
 {
-    var nextFormControl = 'input:not([type="hidden"]), textarea';
+    var nextFormControl = 'input:not([type="hidden"]), textarea:not(.ke-edit-textarea), button[type="submit"], select';
     $.each(editor.id, function(key, editorID)
     {
         editorTool = simpleTools;
@@ -112,10 +112,17 @@ function initKindeditor(afterInit)
                 var $next = $editor.next(nextFormControl);
                 if(!$next.length) $next = $editor.parent().next().find(nextFormControl);
                 if(!$next.length) $next = $editor.parent().parent().next().find(nextFormControl);
-                $next.first().focus();
+                $next = $next.first().focus();
+                var keditor = $next.data('keditor');
+                if(keditor) keditor.focus();
             }
         };
-        try {window.editor['#'] = window.editor[editorID] = K.create('#' + editorID, options);}
+        try
+        {
+            var keditor = K.create('#' + editorID, options);
+            window.editor['#'] = window.editor[editorID] = keditor;
+            $editor.data('keditor', keditor);
+        }
         catch(e){}
     });
 
diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php
index 67949a6e1e..32ec89123a 100644
--- a/module/testcase/view/browse.html.php
+++ b/module/testcase/view/browse.html.php
@@ -75,7 +75,7 @@ js::set('confirmDelete', $lang->testcase->confirmDelete);
         <td><?php echo $users[$case->lastRunner];?></td>
         <td><?php if(!helper::isZeroDate($case->lastRunDate)) echo date(DT_MONTHTIME1, strtotime($case->lastRunDate));?></td>
         <td class='<?php echo $case->lastRunResult;?>'><?php if($case->lastRunResult) echo $lang->testcase->resultList[$case->lastRunResult];?></td>
-        <td class='<?php if(isset($run)) echo $run->status;?>'><?php echo $lang->testcase->statusList[$case->status];?></td>
+        <td class='<?php if(isset($run)) echo $run->status;?> status-<?php echo $case->status?>'><?php echo $lang->testcase->statusList[$case->status];?></td>
         <td class='text-right'>
           <?php
           common::printIcon('testtask', 'runCase', "runID=0&caseID=$case->id&version=$case->version", '', 'list', 'play', '', 'runCase iframe');
diff --git a/module/testtask/view/browse.html.php b/module/testtask/view/browse.html.php
index 23121e02f8..f00f39ebd7 100644
--- a/module/testtask/view/browse.html.php
+++ b/module/testtask/view/browse.html.php
@@ -44,7 +44,7 @@
     <td><?php echo $users[$task->owner];?></td>
     <td><?php echo $task->begin?></td>
     <td><?php echo $task->end?></td>
-    <td><?php echo $lang->testtask->statusList[$task->status];?></td>
+    <td class='status-<?php echo $task->status?>'><?php echo $lang->testtask->statusList[$task->status];?></td>
     <td class='text-center'>
       <?php
       common::printIcon('testtask', 'cases',    "taskID=$task->id", '', 'list', 'smile');
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index fcd7a064c7..7a8c118948 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -195,14 +195,21 @@ fieldset.actionbox ol {padding-top: 8px\0/;}
 .stars-list {color: #E48600}
 
 /* status in table */
-td.done, td[class$="-done"], td.pass, td[class$="-pass"], td.resolved, td[class$="-resolved"] {color:#229f24;}
+td.done, td[class$="-done"],
+td.pass, td[class$="-pass"],
+td.resolved, td[class$="-resolved"],
+td.normal, td[class$="-normal"],
+td.status-active, td[class$="-active"] {color:#229f24;}
 td.wait, td[class$="-wait"] {color:#808080;}
-td.cancel, td[class$="-cancel"] {color:#999;}
-td.doing, td[class$="-doing"]  {color:#d2322d;}
+td.pause, td[class$="-pause"] {color:#E48600;}
+td.closed, td[class$="-closed"],
+td.cancel, td[class$="-cancel"] {color:#888;}
+td.doing, td[class$="-doing"],
+td.changed, td[class$="-changed"],
+td.investigate, td[class$="-investigate"] {color:#d2322d;}
 td.delayed, td[class$="-delayed"] {background:#e84e0f!important; color:white;}
 td.blocked, td[class$="-blocked"] {background:yellow!important;}
 td.fail, td[class$="-fail"]  {color:#d2322d}
-td.status-active, td[class$="-active"] {color: #e48600;}
 td.draft, td[class$="-draft"]  {color:#8957a1}
 
 /* tabs */
@@ -320,9 +327,6 @@ div.form-control[contenteditable='true'] {height: auto; text-align: left; outlin
 .list-group-item.active,.list-group-item.active:hover {background: #fff; border-color: #ddd; background: #f1f1f1; color: #333; font-weight: bold;}
 .list-group-item.active > a {color: #333}
 
-/* Bug status */
-.bug-closed, .bug-closed a {color: #808080; text-decoration: line-through;}
-
 /* progressbar */
 .progressbar {display: inline-block; height: 16px; background: #229F24; position: relative; top: 1px}