diff --git a/harbour/ChangeLog.txt b/harbour/ChangeLog.txt
index 623a567027..971dfa200d 100644
--- a/harbour/ChangeLog.txt
+++ b/harbour/ChangeLog.txt
@@ -10,6 +10,20 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2013-01-22 02:53 UTC+0100 Viktor Szakats (harbour syenar.net)
+  * src/rtl/teditor.prg
+    ! fixed current color being used instead of editor's own
+      colorspec when scrolling the editing area using
+      up/down/left/right keys
+
+  * utils/hbmk2/hbmk2.prg
+    ! -env: option being wrongly listed as command-line only in help.
+      Regression after 2012-06-14 12:01 UTC+0200.
+    * comments
+
+  * ChangeLog.txt
+    ! adjusted recommended replacement options in previous commit msg
+
 2013-01-22 00:37 UTC+0100 Viktor Szakats (harbour syenar.net)
   * utils/hbmk2/hbmk2.prg
     * code cleanup to ease adding linker message exceptions
@@ -17,10 +31,10 @@
     + show warning for options that are only valid on command line
       and ignored when used inside .hbp/.hbm files.
     - deleted compatibility features:
-        - '-arch=' option (use '-platform=' instead)
+        - '-arch=' option (use '-plat=' instead)
           Notice it will now be passed to Harbour compiler and possibly
           interpreted as '-a' option, so it's better to update it _now_.
-        - '${hb_arch}' compatibility macro (use '${hb_platform}' instead)
+        - '${hb_arch}' compatibility macro (use '${hb_plat}' instead)
         - 'mt=mt' .hbc command (use 'mt=yes' instead)
     * '-mwindows' and '-mconsole' legacy options will now issue
       a warning with suggested replacement options (-gui/-std)
diff --git a/harbour/src/rtl/teditor.prg b/harbour/src/rtl/teditor.prg
index 779f6305f5..c814bfc9ba 100644
--- a/harbour/src/rtl/teditor.prg
+++ b/harbour/src/rtl/teditor.prg
@@ -483,7 +483,7 @@ METHOD MoveCursor( nKey ) CLASS HBEditor
       ENDIF
       IF ::Row() == ::nBottom
          IF ::nRow < ::naTextLen
-            hb_Scroll( ::nTop, ::nLeft, ::nBottom, ::nRight, 1 )
+            hb_Scroll( ::nTop, ::nLeft, ::nBottom, ::nRight, 1,, ::cColorSpec )
             ::nFirstRow++
             ::nRow++
             ::RefreshLine()
@@ -530,7 +530,7 @@ METHOD MoveCursor( nKey ) CLASS HBEditor
       ENDIF
       IF ::Row() == ::nTop
          IF ::nRow > 1
-            hb_Scroll( ::nTop, ::nLeft, ::nBottom, ::nRight, -1 )
+            hb_Scroll( ::nTop, ::nLeft, ::nBottom, ::nRight, -1,, ::cColorSpec )
             ::nFirstRow--
             ::nRow--
             ::RefreshLine()
@@ -570,7 +570,7 @@ METHOD MoveCursor( nKey ) CLASS HBEditor
    CASE K_RIGHT
       IF ::Col() == ::nRight
          IF ::nCol <= iif( ::lWordWrap, ::nWordWrapCol, ::LineLen( ::nRow ) )
-            hb_Scroll( ::nTop, ::nLeft, ::nBottom, ::nRight,, 1 )
+            hb_Scroll( ::nTop, ::nLeft, ::nBottom, ::nRight,, 1, ::cColorSpec )
             ::nFirstCol++
             ::nCol++
             ::RefreshColumn()
@@ -594,7 +594,7 @@ METHOD MoveCursor( nKey ) CLASS HBEditor
    CASE K_LEFT
       IF ::Col() == ::nLeft
          IF ::nCol > 1
-            hb_Scroll( ::nTop, ::nLeft, ::nBottom, ::nRight,, -1 )
+            hb_Scroll( ::nTop, ::nLeft, ::nBottom, ::nRight,, -1, ::cColorSpec )
             ::nFirstCol--
             ::nCol--
             ::RefreshColumn()
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 8264700999..81a564e2a0 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -2396,9 +2396,9 @@ FUNCTION hbmk( aArgs, nArgTarget, /* @ */ lPause, nLevel )
          ENDIF
 
       CASE cParamL == "-gui"             ; hbmk[ _HBMK_lGUI ]       := .T.
-      CASE cParamL == "-mwindows"        ; hbmk[ _HBMK_lGUI ]       := .T. ; LegacyWarning( hbmk, aParam, "-gui" )
+      CASE cParamL == "-mwindows"        ; hbmk[ _HBMK_lGUI ]       := .T. ; LegacyWarning( hbmk, aParam, "-gui" ) /* Compatibility */
       CASE cParamL == "-std"             ; hbmk[ _HBMK_lGUI ]       := .F.
-      CASE cParamL == "-mconsole"        ; hbmk[ _HBMK_lGUI ]       := .F. ; LegacyWarning( hbmk, aParam, "-std" )
+      CASE cParamL == "-mconsole"        ; hbmk[ _HBMK_lGUI ]       := .F. ; LegacyWarning( hbmk, aParam, "-std" ) /* Compatibility */
       CASE cParamL == "-mt"              ; hbmk[ _HBMK_lMT ]        := .T.
       CASE cParamL == "-st"              ; hbmk[ _HBMK_lMT ]        := .F.
       CASE cParamL == "-shared"          ; hbmk[ _HBMK_lSHARED ]    := .T. ; hbmk[ _HBMK_lSTATICFULL ] := .F. ; hbmk[ _HBMK_lSHAREDDIST ] := NIL
@@ -14707,6 +14707,7 @@ STATIC PROCEDURE ShowHelp( hbmk, lLong )
       { "-runflag=<f>"       , I_( "pass single flag to output executable when -run option is used" ) }, ;
       { "-cflag+=<f>"        , hb_StrFormat( I_( "pass single flag to C compiler overriding C compiler flags added by %1$s itself. Use with caution." ), _SELF_NAME_ ) }, ;
       { "-3rd=<f>"           , hb_StrFormat( I_( "options/flags reserved for 3rd party tools, always ignored by %1$s itself" ), _SELF_NAME_ ) }, ;
+      { "-env:<e>[<o>[<v>]]" , I_( "alter local environment. <e> is the name of the environment variable to alter. <o> can be '=' to set/override, '-' to delete, '+' to append to the end of existing value, '#' to insert to the beginning of existing value. <v> is the value to set/append/insert." ) }, ;
       { "-jobs=<n>"          , I_( "start n compilation threads (multiprocess platforms only)" ) }, ;
       { "-inc"               , I_( "enable incremental build mode" ) }, ;
       { "-[no]head[=<m>]"    , I_( "control source header parsing (in incremental build mode)\n<m> can be: native (uses compiler to extract dependencies), full (default, uses simple text parser on the whole file), dep, off" ) }, ;
@@ -14742,8 +14743,6 @@ STATIC PROCEDURE ShowHelp( hbmk, lLong )
       NIL, ;
       { "-target=<script>"   , I_( "specify a new build target. <script> can be .prg (or no extension) or .hbp file. Note that .hbp files are automatically considered as separate targets." ) }, ;
       NIL, ;
-      { "-env:<e>[<o>[<v>]]" , I_( "alter local environment. <e> is the name of the environment variable to alter. <o> can be '=' to set/override, '-' to delete, '+' to append to the end of existing value, '#' to insert to the beginning of existing value. <v> is the value to set/append/insert." ) }, ;
-      NIL, ;
       { "-hbrun"             , I_( "run target" ) }, ;
       { "-hbraw"             , I_( "stop after running Harbour compiler" ) }, ;
       { "-hbcmp|-clipper"    , hb_StrFormat( I_( "stop after creating the object files\ncreate link/copy %1$s to hbcmp/clipper for the same effect" ), _SELF_NAME_ ) }, ;