diff --git a/data/common/settings/assoc.ini b/data/common/settings/assoc.ini
index baa8eca7bc..83e25e9bfc 100644
--- a/data/common/settings/assoc.ini
+++ b/data/common/settings/assoc.ini
@@ -99,6 +99,7 @@ pas=$CodeEdit
 pp=$CodeEdit
 lua=$CodeEdit
 ob07=$CodeEdit
+json=$CodeEdit
 
 asm=$TinyPad
 inc=$TinyPad
diff --git a/programs/develop/cedit/CEDIT b/programs/develop/cedit/CEDIT
index 262986b7c8..5670372a8e 100644
Binary files a/programs/develop/cedit/CEDIT and b/programs/develop/cedit/CEDIT differ
diff --git a/programs/develop/cedit/README.TXT b/programs/develop/cedit/README.TXT
deleted file mode 100644
index 5713bd9128..0000000000
--- a/programs/develop/cedit/README.TXT
+++ /dev/null
@@ -1,35 +0,0 @@
-Горячие клавиши:
-
-  ctrl+A    выделить всё
-  ctrl+C    копировать
-  ctrl+V    вставить
-  ctrl+X    вырезать
-  ctrl+L    преобразовать буквы A..Z слева от курсора в a..z
-  ctrl+U    преобразовать буквы a..z слева от курсора в A..Z
-  ctrl+F    показать панель поиска
-  Esc       закрыть панель поиска
-  F3        найти следующий
-  shift+F3  найти предыдущий
-  ctrl+Z    отменить
-  ctrl+Y    вернуть
-  ctrl+G    перейти на строку...
-  ctrl+Del  удалить строку
-  ctrl+D    дублировать строку
-  ctrl+Up   переместить строку вверх
-  ctrl+Down переместить строку вниз
-
-  ctrl+F2   установить/снять метку
-  F2        перейти к метке ниже
-  shift+F2  перейти к метке выше
-
-  ctrl+S    сохранить
-  ctrl+O    открыть
-  ctrl+N    создать новый
-  ctrl+W    закрыть файл
-  ctrl+Tab  переключиться на следующую вкладку
-
-  ctrl+F9   компилировать
-  F9        выполнить
-
-  перемещение по тексту:
-  (ctrl+)Home, (ctrl+)End, (ctrl+)PageUp, (ctrl+)PageDown
diff --git a/programs/develop/cedit/SRC/CEdit.ob07 b/programs/develop/cedit/SRC/CEdit.ob07
index e9c7a99383..94f0667259 100644
--- a/programs/develop/cedit/SRC/CEdit.ob07
+++ b/programs/develop/cedit/SRC/CEdit.ob07
@@ -28,7 +28,7 @@ IMPORT
     RW, Ini, box_lib, Icons, Tabs, Timer;
 
 CONST
-    header = "CEdit (02-sep-2021)";
+    header = "CEdit (03-sep-2021)";
 
     ShellFilter = "";
     EditFilter = "SH|ASM|TXT|INC|OB07|C|CPP|H|PAS|PP|LUA|INI|JSON";
@@ -185,7 +185,7 @@ VAR
     winWidth, winHeight: INTEGER;
     AppPath, runScript, buildScript, debugScript: RW.tFileName;
     OD: OpenDlg.Dialog;
-    confirm, notFound, search, searchOpened, modified: BOOLEAN;
+    confirm, notFound, menuFindClicked, search, searchOpened, modified: BOOLEAN;
 
     switch, closing: BOOLEAN;
     leftButton: BOOLEAN;
@@ -206,6 +206,8 @@ VAR
     menuView, menuSyntax, menuProgram, menuTools,
     subCurLine, subIndent, subCase, subBookmark: Menu.tMenu;
 
+    menuActive: BOOLEAN;
+
     icons: INTEGER;
     grayIcons: INTEGER;
 
@@ -308,7 +310,11 @@ PROCEDURE NotFound;
 BEGIN
     IF notFound THEN
         Message("not found");
-        notFound := FALSE;
+        IF menuFindClicked THEN
+        	menuFindClicked := FALSE
+        ELSE
+        	notFound := FALSE
+        END;
         SetFocus(FindEdit, TRUE)
     END
 END NotFound;
@@ -329,31 +335,40 @@ BEGIN
 END Replaced;
 
 
+PROCEDURE drawIcon (icons, idx, x: INTEGER);
+BEGIN
+	Icons.draw(icons, idx, x + iconPad, btnTop + iconPad)
+END drawIcon;
+
+
 PROCEDURE toolbarIcons;
 VAR
-    x, color: INTEGER;
+    x, color, ico: INTEGER;
 BEGIN
     x := searchLeft + (toolBtnSize + 5)*2;
     IF text.modified THEN
-        Icons.draw(icons, 5, x + iconPad, btnTop + iconPad)
+    	ico := icons
     ELSE
-        Icons.draw(grayIcons, 5, x + iconPad, btnTop + iconPad)
+    	ico := grayIcons
     END;
+    drawIcon(ico, 5, x);
 
     IF text.edition # NIL THEN
         x := searchLeft + (toolBtnSize + 5)*4 + toolbarDelim*2;
         IF ChangeLog.isFirstGuard(text.edition) THEN
-            Icons.draw(grayIcons, 37, x + iconPad, btnTop + iconPad)
+        	ico := grayIcons
         ELSE
-            Icons.draw(icons, 37, x + iconPad, btnTop + iconPad)
+        	ico := icons
         END;
+        drawIcon(ico, 37, x);
 
         x := searchLeft + (toolBtnSize + 5)*5 + toolbarDelim*2;
         IF ChangeLog.isLastGuard(text.edition) THEN
-            Icons.draw(grayIcons, 36, x + iconPad, btnTop + iconPad)
+        	ico := grayIcons
         ELSE
-            Icons.draw(icons, 36, x + iconPad, btnTop + iconPad)
-        END
+        	ico := icons
+        END;
+        drawIcon(ico, 36, x)
     END;
 
     IF T.selected(text) THEN
@@ -371,16 +386,19 @@ BEGIN
 
     x := searchLeft + (toolBtnSize + 5)*8 + toolbarDelim*4;
     IF buildScript # "" THEN
-        Icons.draw(icons, 54, x + iconPad, btnTop + iconPad)
+    	ico := icons
     ELSE
-        Icons.draw(grayIcons, 54, x + iconPad, btnTop + iconPad)
+    	ico := grayIcons
     END;
+	drawIcon(ico, 54, x);
+
     INC(x, toolBtnSize + 5);
     IF runScript # "" THEN
-        Icons.draw(icons, 53, x + iconPad, btnTop + iconPad)
+    	ico := icons
     ELSE
-        Icons.draw(grayIcons, 53, x + iconPad, btnTop + iconPad)
-    END
+    	ico := grayIcons
+    END;
+    drawIcon(ico, 53, x)
 END toolbarIcons;
 
 
@@ -596,18 +614,18 @@ BEGIN
         x := searchLeft;
 
         drawToolbarBtn(btnNew, x);
-        Icons.draw(icons, 2, x + iconPad, btnTop + iconPad);
+        drawIcon(icons, 2, x);
         INC(x, toolBtnSize + 5);
 
         drawToolbarBtn(btnOpen, x);
-        Icons.draw(icons, 0, x + iconPad, btnTop + iconPad);
+        drawIcon(icons, 0, x);
         INC(x, toolBtnSize + 5);
 
         drawToolbarBtn(btnSave, x);
         INC(x, toolBtnSize + 5 + toolbarDelim);
 
         drawToolbarBtn(btnSearch, x);
-        Icons.draw(icons, 49, x + iconPad, btnTop + iconPad);
+        drawIcon(icons, 49, x);
         INC(x, toolBtnSize + 5 + toolbarDelim);
 
         drawToolbarBtn(btnUndo, x);
@@ -1226,8 +1244,9 @@ BEGIN
         IF Menu.opened(menu) THEN
             Menu.close(menu)
         END;
-        Menu.open(menu, x, y)
-    END;
+        Menu.open(menu, x, y);
+        menuActive := TRUE
+    END
 END ShowMenu;
 
 
@@ -1238,8 +1257,8 @@ BEGIN
 	scrollIPC := FALSE;
 
     IF IPC[0] = Timer.ID THEN
-    	T.toggleCursor;
-    	repaint;
+		T.toggleCursor;
+		repaint;
     	IPC[2] := 0
     ELSIF IPC[0] = mainTID THEN
     	IF IPC[2] = Scroll.ScrollIPC THEN
@@ -1255,7 +1274,13 @@ BEGIN
 	    	ELSIF vScroll.Inc THEN
 				T.scroll(text, 0, 1)
 	    	END;
-        	repaint;
+
+    		IF menuActive THEN
+    			draw_window;
+    			menuActive := FALSE
+    		ELSE
+    			repaint
+    		END;
 
     		IF (0 IN K.MouseState()) THEN
     			WHILE (0 IN K.MouseState()) & (delay > 0) DO
@@ -1316,9 +1341,11 @@ BEGIN
         ShowSearchPanel;
         SetFocus(FindEdit, TRUE)
     |menuFindNext:
-        notFound := ~T.findNext(text, box_lib.check_box_get_value(BKW))
+        notFound := ~T.findNext(text, box_lib.check_box_get_value(BKW));
+        menuFindClicked := TRUE
     |menuFindPrev:
-        notFound := ~T.findNext(text, ~box_lib.check_box_get_value(BKW))
+        notFound := ~T.findNext(text, ~box_lib.check_box_get_value(BKW));
+        menuFindClicked := TRUE
     |menuGoto:
         ShowSearchPanel;
         SetFocus(GotoEdit, TRUE)
@@ -2112,6 +2139,8 @@ BEGIN
     T.SetPos(text, 0, 0);
     confirm := FALSE;
     notFound := FALSE;
+    menuFindClicked := FALSE;
+    menuActive := FALSE;
     search := FALSE;
     searchOpened := FALSE;
     createSearchForm;
diff --git a/programs/develop/cedit/SRC/KolibriOS.ob07 b/programs/develop/cedit/SRC/KolibriOS.ob07
index 77e480c94f..cbb6f010c8 100644
--- a/programs/develop/cedit/SRC/KolibriOS.ob07
+++ b/programs/develop/cedit/SRC/KolibriOS.ob07
@@ -30,7 +30,7 @@ VAR
 
     winColor*, textColor*, btnColor*, btnTextColor*,
     toolbarColor*, scrollColor*, scrollBkColor*,
-    borderColor*, shadowColor*, (*darkColor*, lightColor*,*)
+    borderColor*, shadowColor*, darkColor*, lightColor*,
     caseColor*, disCaseColor*: INTEGER;
 
 
@@ -339,16 +339,11 @@ PROCEDURE GetSystemColors*;
 VAR
     buf: ARRAY 10 OF INTEGER;
 BEGIN
-    toolbarColor := 0DFDFDFH;
-    shadowColor := 0808080H;
-    caseColor := 00000FFH;
-    disCaseColor := 0808080H;
-
     ASSERT(LEN(buf) >= 10);
     KOSAPI.sysfunc4(48, 3, SYSTEM.ADR(buf[0]), 40);
 
-(*    darkColor := buf[2];
-    lightColor := buf[3];*)
+    darkColor := buf[2];
+    lightColor := buf[3];
     winColor := buf[5];
     textColor := buf[8];
     btnColor := buf[6];
@@ -356,6 +351,11 @@ BEGIN
     scrollColor := btnColor;
     scrollBkColor := winColor;
     borderColor := buf[9];
+
+    toolbarColor := 0DFDFDFH;
+    shadowColor := 0808080H;
+    caseColor := 00000FFH;
+    disCaseColor := 0808080H;
 END GetSystemColors;
 
 
diff --git a/programs/develop/cedit/SRC/Menu.ob07 b/programs/develop/cedit/SRC/Menu.ob07
index 0631c2290a..f61de282e6 100644
--- a/programs/develop/cedit/SRC/Menu.ob07
+++ b/programs/develop/cedit/SRC/Menu.ob07
@@ -76,7 +76,10 @@ VAR
     resetTimer: tProc;
     _open: PROCEDURE (m: tMenu; x, y: INTEGER);
     redraw*: BOOLEAN;
-
+(*
+    backColor, foreColor, selBackColor, selForeColor,
+    disBackColor, disForeColor, disSelBackColor, disSelForeColor: INTEGER;
+*)
 
 PROCEDURE isSender* (tid: INTEGER): BOOLEAN;
 VAR
@@ -107,6 +110,17 @@ VAR
     canvas: G.tCanvas;
 
 BEGIN
+(*
+    backColor := K.winColor;
+    foreColor := K.textColor;
+    selBackColor := K.btnColor;
+    selForeColor := K.btnTextColor;
+
+    disBackColor := backColor;
+    disForeColor := K.darkColor;
+    disSelBackColor := K.lightColor;
+    disSelForeColor := disForeColor;
+*)
     canvas := m.canvas;
     G.SetColor(canvas, backColor);
     G.clear(canvas);
diff --git a/programs/develop/cedit/SRC/Tabs.ob07 b/programs/develop/cedit/SRC/Tabs.ob07
index 5301151e73..ec13a844bf 100644
--- a/programs/develop/cedit/SRC/Tabs.ob07
+++ b/programs/develop/cedit/SRC/Tabs.ob07
@@ -53,11 +53,10 @@ BEGIN
     IF id = t.current THEN
         INC(height, curTabHeight - tabHeight);
         DEC(y, curTabHeight - tabHeight);
-        (*color := K.lightColor
+        color := K.lightColor
     ELSE
-        color := K.darkColor*)
+        color := K.winColor
     END;
-    color := K.winColor;
     DEC(x); INC(width);
     x2 := x + width - 1;
     y2 := y + height - 1;
diff --git a/programs/develop/cedit/SRC/Text.ob07 b/programs/develop/cedit/SRC/Text.ob07
index f3434e266b..7274b0c6a9 100644
--- a/programs/develop/cedit/SRC/Text.ob07
+++ b/programs/develop/cedit/SRC/Text.ob07
@@ -1123,8 +1123,8 @@ BEGIN
         IF text.cursor.X > 0 THEN
             i := text.cursor.X;
             n := leadingSpaces(curLine);
+            modify(text);
             IF n < i THEN
-                modify(text);
                 move(text, -1);
                 delete(text)
             ELSE