diff --git a/doc/man/es/mc.1.in b/doc/man/es/mc.1.in
index c2b76e36d..f833a1407 100644
--- a/doc/man/es/mc.1.in
+++ b/doc/man/es/mc.1.in
@@ -3076,7 +3076,7 @@ El formato de la definición de color es:
 .fi
 .PP
 los colores son opcionales, y las palabras claves son: normal, selected,
-marked, markselect, errors, input, reverse menu, menusel, menuhot, menuhotsel,
+marked, markselect, errors, input, reverse menunormal, menusel, menuhot, menuhotsel,
 menuinactive, gauge;  los colores por defecto son: dnormal, dfocus, dhotnormal,
 dhotfocus; los colores de Ayuda son: helpnormal, helpitalic, helpbold, helplink,
 helpslink;  color del visor: viewunderline; colores del editor: editnormal,
@@ -3093,8 +3093,8 @@ en los componentes normales, mientras que el color
 .I dhotfocus
 se utiliza para el color resaltado en el componente seleccionado.
 .PP
-Los menús utilizan el mismo esquema equivalente con los nombres menu, menusel,
-menuhot, menuhotsel and menuinactive en lugar de los anteriores.
+Los menús utilizan el mismo esquema equivalente con los nombres menunormal,
+menusel, menuhot, menuhotsel and menuinactive en lugar de los anteriores.
 .PP
 La ayuda utiliza los siguientes colores:
 .I helpnormal
@@ -3344,7 +3344,7 @@ Color del texto seleccionado.
 .I editwhitespace
 Color de las tabulaciones y espacios al final de línea resaltados.
 .TP
-.I linestate
+.I editlinestate
 Color de la línea de estado.
 
 .PP
diff --git a/doc/man/hu/mc.1.in b/doc/man/hu/mc.1.in
index 0a98eddc4..62c3e9abb 100644
--- a/doc/man/hu/mc.1.in
+++ b/doc/man/hu/mc.1.in
@@ -2827,7 +2827,7 @@ A színmeghatározás formátuma:
 .fi
 .PP
 A színek opcionálisak, a kulcsszavak a következők: normal, selected,
-marked, markselect, errors, input, reverse, gauge; A menü színek: menu,
+marked, markselect, errors, input, reverse, gauge; A menü színek: menunormal,
 menusel, menuhot, menuhotsel, menuinactive; A dialog színek: dnormal, dfocus,
 dhotnormal, dhotfocus; Súgó színek: helpnormal, helpitalic, helpbold,
 helplink, helpslink; Fájlnéző színek: viewunderline; Speciális kijelölés
@@ -2853,7 +2853,7 @@ aholis a
 .I dhotfocus
 színt használjuk a jelenleg kiválasztott komponensekhez.
 .PP
-A menük azonos sémát használnak a menu, menusel, menuhot, menuhotsel és a
+A menük azonos sémát használnak a menunormal, menusel, menuhot, menuhotsel és a
 menuinactive részeknél.
 .PP
 A súgó a következő színeket használja:
diff --git a/doc/man/it/mc.1.in b/doc/man/it/mc.1.in
index f73413ed7..8dfbb68b2 100644
--- a/doc/man/it/mc.1.in
+++ b/doc/man/it/mc.1.in
@@ -2865,7 +2865,7 @@ Il formato della definizione dei colori è:
 .fi
 .PP
 I colori sono opzionali e le parolechiave sono: normal, selected, marked,
-markselect, errors, input, reverse, gauge. I colori dei menu sono: menu,
+markselect, errors, input, reverse, gauge. I colori dei menu sono: menunormal,
 menusel, menuhot, menuhotsel, menuinactive. I colori delle finestre di
 dialogo sono: dnormal, dfocus, dhotnormal, dhotfocus. I colori dell'aiuto
 sono: helpnormal, helpitalic, helpbold, helplink, helpslink.
@@ -2894,7 +2894,7 @@ nei componenti normali, mentre il colore
 viene usato per il colore evidenziato nel componente correntemente
 selezionato.
 .PP
-I menu usano lo stesso schema ma usano invece i selettori menu, menusel, 
+I menu usano lo stesso schema ma usano invece i selettori menunormal, menusel,
 menuhot, menuhotsel e menuinactive.
 .PP
 L'aiuto usa i seguenti colori:
diff --git a/doc/man/mc.1.in b/doc/man/mc.1.in
index dfdd89861..b161ec453 100644
--- a/doc/man/mc.1.in
+++ b/doc/man/mc.1.in
@@ -3233,7 +3233,7 @@ The format for the color definition is:
 .fi
 .PP
 The colors are optional, and the keywords are: normal, selected, marked,
-markselect, errors, input, reverse, gauge.  Menu colors are: menu,
+markselect, errors, input, reverse, gauge.  Menu colors are: menunormal,
 menusel, menuhot, menuhotsel, menuinactive. Dialog colors are: dnormal, dfocus,
 dhotnormal, dhotfocus.  Help colors are: helpnormal, helpitalic,
 helpbold, helplink, helpslink.  Viewer color is: viewunderline. Editor
@@ -3259,7 +3259,7 @@ components, whereas the
 color is used for the highlighted color in the currently selected
 component.
 .PP
-Menus use the same scheme but uses the menu, menusel, menuhot, menuhotsel
+Menus use the same scheme but uses the menunormal, menusel, menuhot, menuhotsel
 and menuinactive tags instead.
 .PP
 Help uses the following colors:
@@ -3434,7 +3434,7 @@ Color of hotkeys in focused element
 .PP
 Section
 .B [menu]
-describes the elements that are placed on menu. This section describes
+describes the elements that are placed in menu. This section describes
 system menu (called by F9) and user-defined menus (called by F2 in panels
 and by F11 in editor).
 .TP
@@ -3499,7 +3499,7 @@ Color of selected text
 .I editwhitespace
 Color of tabs and trailing spaces highlighting
 .TP
-.I linestate
+.I editlinestate
 Color for line state area
 
 .PP
diff --git a/doc/man/pl/mc.1.in b/doc/man/pl/mc.1.in
index 63258a838..dcd65af58 100644
--- a/doc/man/pl/mc.1.in
+++ b/doc/man/pl/mc.1.in
@@ -2502,7 +2502,7 @@ Format definicji kolorów jest następujący:
 .fi
 .PP
 Kolory są opcjonalne, a słowa kluczowe są następujące: normal, selected,
-marked, markselect, errors, input, reverse menu, menusel, menuhot, menuhotsel,
+marked, markselect, errors, input, reverse menunormal, menusel, menuhot, menuhotsel,
 menuinactive, gauge;  kolory okien dialogowych: dnormal, dfocus, dhotnormal,
 dhotfocus; Kolory pomocy: helpnormal, helpitalic, helpbold, helplink,
 helpslink; Kolory podglądu: viewunderline; Specjalne tryby podświetlenia:
@@ -2521,7 +2521,7 @@ a
 .I dhotfocus
 jest używany do wyświetlania owych w aktualnie wybranym.
 .PP
-Menu używa tego samego schematu, ale jako nazw kolorów używa menu, menusel,
+Menu używa tego samego schematu, ale jako nazw kolorów używa menunormal, menusel,
 menuhot, menuhotsel i menuinactive.
 .PP
 Pomoc używa następujących kolorów:
diff --git a/doc/man/ru/mc.1.in b/doc/man/ru/mc.1.in
index b3d166c54..8e04229df 100644
--- a/doc/man/ru/mc.1.in
+++ b/doc/man/ru/mc.1.in
@@ -3523,7 +3523,7 @@ xterm=menu=magenta:marked=,magenta:markselect=,red
 Цвета не являются обязательными, а в качестве ключевых слов (keywords)
 могут использоваться: для задания цветовой палитры в панелях: normal,
 selected, marked, markselect, errors, input, reverse, gauge; Цвета
-пунктов меню:  menu, menusel, menuhot, menuhotsel, menuinactive; Цвета
+пунктов меню: menunormal, menusel, menuhot, menuhotsel, menuinactive; Цвета
 в окне диалога: dnormal, dfocus, dhotnormal, dhotfocus; Цвета в окне подсказки:
 helpnormal, helpitalic, helpbold, helplink, helpslink; в окне программы
 просмотра:  viewunderline; специальные подсветки: executable, directory,
@@ -3556,7 +3556,7 @@ editmarked.
 компонентах окна.
 .PP
 В меню используется та же самая схема, только в качестве названий
-элементов используются menu, menusel, menuhot, menuhotsel и menuinactive.
+элементов используются menunormal, menusel, menuhot, menuhotsel и menuinactive.
 .PP
 Окно подсказки использует следующие цвета:
 .I helpnormal
@@ -3737,7 +3737,7 @@ base_color=normal=white,default:marked=magenta,default
 .PP
 Секция
 .BR [menu]
-содержит описание элементов, отображающихся в меню. Это касается как системного меню 
+содержит описание элементов, отображающихся в меню. Это касается как системного меню
 (вызываемого клавишей F9), так и пользовательских меню (F2 в панелях или F11 в редакторе).
 .TP
 .I _default_
@@ -3798,7 +3798,7 @@ base_color=normal=white,default:marked=magenta,default
 .I editwhitespace
 Подсветка знаков табуляции и "висящих" пробелов
 .TP
-.I linestate
+.I editlinestate
 Цвет области отображения состояния строки.
 
 
diff --git a/doc/man/sr/mc.1.in b/doc/man/sr/mc.1.in
index 8a1fbfe81..519dfc8c7 100644
--- a/doc/man/sr/mc.1.in
+++ b/doc/man/sr/mc.1.in
@@ -2998,7 +2998,7 @@ xterm=menu=magenta:marked=,magenta:markselect=,red
 .PP
 Боје су необавезне, док кључне речи могу бити: normal, selected,
 marked, markselect, errors, input, reverse, gauge. Боје менија су:
-menu, menusel, menuhot, menuhotsel, menuinactive. Боје дијалога су:
+menunormal, menusel, menuhot, menuhotsel, menuinactive. Боје дијалога су:
 dnormal, dfocus, dhotnormal, dhotfocus. Боје помоћи су: helpnormal, helpitalic,
 helpbold, helplink, helpslink. Боја прегледача је: viewunderline.
 Посебне боје за истицање су: executable, directory, link, stalelink,
@@ -3022,7 +3022,7 @@ editmarked.
 .I dhotfocus
 се користи за боју истицања у тренутно изабраној контроли.
 .PP
-Менији користе исту шему, али користе изнаке menu, menusel, menuhot, menuhotsel
+Менији користе исту шему, али користе изнаке menunormal, menusel, menuhot, menuhotsel
 и menuinactive.
 .PP
 Помоћ користи следеће боје:
diff --git a/lib/skin/colors-old.c b/lib/skin/colors-old.c
index 95f6d435a..20b1c135d 100644
--- a/lib/skin/colors-old.c
+++ b/lib/skin/colors-old.c
@@ -49,7 +49,7 @@ typedef struct mc_skin_colors_old_struct {
 
 /*** file scope variables ************************************************************************/
 
-mc_skin_colors_old_t old_colors[] = {
+static const mc_skin_colors_old_t old_colors[] = {
     {"normal", "core", "_default_"},
     {"marked", "core", "marked"},
     {"selected", "core", "selected"},
@@ -62,7 +62,7 @@ mc_skin_colors_old_t old_colors[] = {
     {"errors", "error", "_default_"},
     {"errdhotnormal", "error", "errdhotnormal"},
     {"errdhotfocus", "error", "errdhotfocus"},
-    {"menu", "menu", "_default_"},
+    {"menunormal", "menu", "_default_"},
     {"menuhot", "menu", "menuhot"},
     {"menusel", "menu", "menusel"},
     {"menuhotsel", "menu", "menuhotsel"},
@@ -79,7 +79,7 @@ mc_skin_colors_old_t old_colors[] = {
     {"editbold", "editor", "editbold"},
     {"editmarked", "editor", "editmarked"},
     {"editwhitespace", "editor", "editwhitespace"},
-    {"editlinestate", "editor", "linestate"},
+    {"editlinestate", "editor", "editlinestate"},
     {NULL, NULL, NULL}
 };
 
diff --git a/lib/skin/colors.c b/lib/skin/colors.c
index 22f6c1ae0..11e53763f 100644
--- a/lib/skin/colors.c
+++ b/lib/skin/colors.c
@@ -226,7 +226,7 @@ mc_skin_color_cache_init (void)
     EDITOR_MARKED_COLOR = mc_skin_color_get ("editor", "editmarked");
     EDITOR_WHITESPACE_COLOR = mc_skin_color_get ("editor", "editwhitespace");
     EDITOR_RIGHT_MARGIN_COLOR = mc_skin_color_get ("editor", "editrightmargin");
-    LINE_STATE_COLOR = mc_skin_color_get ("editor", "linestate");
+    LINE_STATE_COLOR = mc_skin_color_get ("editor", "editlinestate");
 
     BOOK_MARK_COLOR = mc_skin_color_get ("editor", "bookmark");
     BOOK_MARK_FOUND_COLOR = mc_skin_color_get ("editor", "bookmarkfound");
diff --git a/misc/skins/darkfar.ini b/misc/skins/darkfar.ini
index 38b1fe901..adca0e277 100644
--- a/misc/skins/darkfar.ini
+++ b/misc/skins/darkfar.ini
@@ -79,7 +79,7 @@
     editbold=yellow;brightgreen
     editmarked=black;white
     editwhitespace=brightblue;black
-    linestate=white;cyan
+    editlinestate=white;cyan
     bookmark=white;red
     bookmarkfound=black;green
     editrightmargin=white;blue
diff --git a/misc/skins/default.ini b/misc/skins/default.ini
index d13939dc6..f73213253 100644
--- a/misc/skins/default.ini
+++ b/misc/skins/default.ini
@@ -83,7 +83,7 @@
     editbold=yellow;brightgreen
     editmarked=black;cyan
     editwhitespace=brightblue;blue
-    linestate=white;cyan
+    editlinestate=white;cyan
     bookmark=white;red
     bookmarkfound=black;green
     editrightmargin=brightblue;black
diff --git a/misc/skins/double-lines.ini b/misc/skins/double-lines.ini
index 80a5f7b05..e389fee99 100644
--- a/misc/skins/double-lines.ini
+++ b/misc/skins/double-lines.ini
@@ -79,7 +79,7 @@
     editbold=yellow;brightgreen
     editmarked=black;cyan
     editwhitespace=brightblue;blue
-    linestate=white;cyan
+    editlinestate=white;cyan
     bookmark=white;red
     bookmarkfound=black;green
     editrightmargin=brightblue;black
diff --git a/misc/skins/featured.ini b/misc/skins/featured.ini
index 9c94be531..9adcf1bc5 100644
--- a/misc/skins/featured.ini
+++ b/misc/skins/featured.ini
@@ -85,7 +85,7 @@
     editbold=yellow;brightgreen
     editmarked=black;cyan
     editwhitespace=brightblue;blue
-    linestate=white;cyan
+    editlinestate=white;cyan
     bookmark=white;red
     bookmarkfound=black;green
     editrightmargin=brightblue;black
diff --git a/misc/skins/gotar.ini b/misc/skins/gotar.ini
index 46f0dae66..c2d7fc4a9 100644
--- a/misc/skins/gotar.ini
+++ b/misc/skins/gotar.ini
@@ -79,7 +79,7 @@
 	editbold=yellow;blue
 	editmarked=brightgreen;red
 	editwhitespace=brightblue;blue
-	linestate=brightgreen
+	editlinestate=brightgreen
 	bookmark=white;red
 	bookmarkfound=black;green
 	editrightmargin=brightblue;blue
diff --git a/misc/skins/nicedark.ini b/misc/skins/nicedark.ini
index c6bbef5fd..1bddd814c 100644
--- a/misc/skins/nicedark.ini
+++ b/misc/skins/nicedark.ini
@@ -82,7 +82,7 @@
     editbold=brown;blue
     editmarked=black;cyan
     editwhitespace=brightblue;blue
-    linestate=white;cyan
+    editlinestate=white;cyan
     bookmark=white;red
     bookmarkfound=black;green
 
diff --git a/src/args.c b/src/args.c
index 128469522..61f19ea6c 100644
--- a/src/args.c
+++ b/src/args.c
@@ -307,7 +307,7 @@ mc_args_new_color_group(void)
 	    "   File display: normal, selected, marked, markselect\n"
 	    "   Dialog boxes: dnormal, dfocus, dhotnormal, dhotfocus, errdhotnormal,\n"
 	    "                 errdhotfocus\n"
-	    "   Menus:        menu, menuhot, menusel, menuhotsel, menuinactive\n"
+	    "   Menus:        menunormal, menuhot, menusel, menuhotsel, menuinactive\n"
 	    "   Editor:       editnormal, editbold, editmarked, editwhitespace,\n"
 	    "                 editlinestate\n"),
 	/* TRANSLATORS: don't translate keywords and names of colors */