diff --git a/data/Tupfile.lua b/data/Tupfile.lua
index 96ab49af0a..6d0e341d17 100644
--- a/data/Tupfile.lua
+++ b/data/Tupfile.lua
@@ -27,7 +27,6 @@ img_files = {
  {"NOTIFY3.PNG", "common/notify3.png"},
  {"UNIMG", PROGS .. "/fs/unimg/unimg"},
  {"3D/HOUSE.3DS", "common/3d/house.3ds"},
- {"DEVELOP/T_EDIT.INI", PROGS .. "/other/t_edit/t_edit.ini"},
  {"File Managers/ICONS.INI", "common/File Managers/icons.ini"},
  {"File Managers/KFM.INI", "common/File Managers/kfm.ini"},
  {"File Managers/FNAV/ABOUT.TXT", "common/File Managers/fNav/About.txt"},
@@ -56,6 +55,7 @@ img_files = {
  {"SETTINGS/APP_PLUS.INI", "common/settings/app_plus.ini"},
  {"SETTINGS/ASSOC.INI", "common/settings/assoc.ini"},
  {"SETTINGS/AUTORUN.DAT", "common/settings/AUTORUN.DAT"},
+ {"SETTINGS/CEDIT.INI", PROGS .. "/develop/cedit/CEDIT.INI"},
  {"SETTINGS/DOCKY.INI", "common/settings/docky.ini"},
  {"SETTINGS/FB2READ.INI", "common/settings/fb2read.ini"},
  {"SETTINGS/HOTANGLES.CFG", PROGS .. "/other/ha/SETTINGS/HOTANGLES.CFG"},
@@ -292,6 +292,7 @@ extra_files = {
  {"kolibrios/utils/cnc_editor/kolibri.NC", PROGS .. "/other/cnc_editor/kolibri.NC"},
  {"kolibrios/utils/vmode", "common/vmode"},
  {"kolibrios/utils/texture", "common/utils/texture"},
+ {"kolibrios/utils/t_edit.ini", PROGS .. "/other/t_edit/t_edit.ini"},
  }
 if build_type == "rus" then tup.append_table(extra_files, {
  {"Docs/cp866/config.txt", build_type .. "/docs/CONFIG.TXT"},
@@ -439,6 +440,7 @@ tup.append_table(img_files, {
  {"DEMOS/WEB", PROGS .. "/demos/web/trunk/web"},
  {"DEVELOP/ASCIIVJU", PROGS .. "/develop/asciivju/trunk/asciivju"},
  {"DEVELOP/BOARD", PROGS .. "/system/board/trunk/board"},
+ {"DEVELOP/CEDIT", PROGS .. "/develop/cedit/CEDIT"},
  {"DEVELOP/COBJ", PROGS .. "/develop/cObj/trunk/cObj"},
  {"DEVELOP/FASM", PROGS .. "/develop/fasm/1.73/fasm"},
  {"DEVELOP/H2D2B", PROGS .. "/develop/h2d2b/trunk/h2d2b"},
@@ -446,7 +448,6 @@ tup.append_table(img_files, {
  {"DEVELOP/KEYASCII", PROGS .. "/develop/keyascii/trunk/keyascii"},
  {"DEVELOP/MTDBG", PROGS .. "/develop/mtdbg/mtdbg"},
  {"DEVELOP/SCANCODE", PROGS .. "/develop/scancode/trunk/scancode"},
- {"DEVELOP/T_EDIT", PROGS .. "/other/t_edit/t_edit"},
  {"DEVELOP/EXAMPLES/CONGET", PROGS .. "/develop/libraries/console_coff/examples/test_gets"},
  {"DEVELOP/EXAMPLES/THREAD", PROGS .. "/develop/examples/thread/trunk/thread"},
  {"DEVELOP/EXAMPLES/USE_MB", PROGS .. "/demos/use_mb/use_mb"},
diff --git a/data/common/File Managers/fNav/fnav.set b/data/common/File Managers/fNav/fnav.set
index d112bd2b4b..dad920be78 100644
--- a/data/common/File Managers/fNav/fnav.set	
+++ b/data/common/File Managers/fNav/fnav.set	
@@ -1 +1 @@
-/sys/TinyPad:              asm, inc, mac, dat
/sys/QUARK:                txt, log
/sys/media/kiv:            gif, bmp, png, tga, jpg, ico, cur, tif, tiff, jpeg, ppm, pgm, pbm, pnm, pcx, wbmp, xcf
/sys/Network/Webview:      htm, html, mht, xhtml, docx, url
/sys/fb2read:              fb2
/sys/develop/cObj:         obj
/sys/skincfg:              skn, dtp
/sys/rtfRead:              rtf
/sys/develop/t_edit:       cpp, h, c, c--, pas, set, ext, ini
/sys/media/mgb:            mgb
/sys/media/pixie:          mp3
/sys/media/AC97SND:        wav, xm
/sys/media/MIDAMP:         mid
/sys/media/listplay:       m3u, lap, asf
/sys/shell:                sh
/sys/3d/view3ds:           3ds, asc
/sys/graph:                cvs, grf
/sys/unz:                  zip, 7z
/sys/unimg:                img
/sys/table:                csv
/kolibrios/media/updf:     pdf
/kolibrios/media/fplay:    avi, mpg, mov, flv, wmv, vob, mkv, mp4, mpeg, divx, 3gp, webm
/kolibrios/emul/zsnes:     smc
/kolibrios/emul/psx4all:   mcr
/kolibrios/emul/fceu/fceu: nes
/kolibrios/emul/e80/e80:   sna
/kolibrios/emul/gameboy:   gb, gbc
/kolibrios/emul/pokemini:  min
/sys/develop/heed:
\ No newline at end of file
+/sys/TinyPad:              asm, inc, mac, dat
/sys/QUARK:                txt, log
/sys/media/kiv:            gif, bmp, png, tga, jpg, ico, cur, tif, tiff, jpeg, ppm, pgm, pbm, pnm, pcx, wbmp, xcf
/sys/Network/Webview:      htm, html, mht, xhtml, docx, url
/sys/fb2read:              fb2
/sys/develop/cObj:         obj
/sys/skincfg:              skn, dtp
/sys/rtfRead:              rtf
/sys/develop/cedit:        cpp, h, c, c--, pas, set, ext, ini, ob07, lua
/sys/media/mgb:            mgb
/sys/media/pixie:          mp3
/sys/media/AC97SND:        wav, xm
/sys/media/MIDAMP:         mid
/sys/media/listplay:       m3u, lap, asf
/sys/shell:                sh
/sys/3d/view3ds:           3ds, asc
/sys/graph:                cvs, grf
/sys/unz:                  zip, 7z
/sys/unimg:                img
/sys/table:                csv
/kolibrios/media/updf:     pdf
/kolibrios/media/fplay:    avi, mpg, mov, flv, wmv, vob, mkv, mp4, mpeg, divx, 3gp, webm
/kolibrios/emul/zsnes:     smc
/kolibrios/emul/psx4all:   mcr
/kolibrios/emul/fceu/fceu: nes
/kolibrios/emul/e80/e80:   sna
/kolibrios/emul/gameboy:   gb, gbc
/kolibrios/emul/pokemini:  min
/sys/develop/heed:
\ No newline at end of file
diff --git a/data/common/File Managers/icons.ini b/data/common/File Managers/icons.ini
index f2f4725a5f..4a66ac1f00 100644
--- a/data/common/File Managers/icons.ini	
+++ b/data/common/File Managers/icons.ini	
@@ -175,6 +175,7 @@ fb2=29
 mgb=47
 dtp=52
 pal=52
+ch8=48
 
 [icons32]
 <dir>=45
diff --git a/data/common/File Managers/kfar.ini b/data/common/File Managers/kfar.ini
index 8c225e53f2..767ad8b437 100644
--- a/data/common/File Managers/kfar.ini	
+++ b/data/common/File Managers/kfar.ini	
@@ -1,7 +1,13 @@
 [Associations]
 asm=/sys/TinyPad; AsmMenu1,AsmMenu2
 inc=/sys/TinyPad
-ini=/sys/develop/t_edit
+ini=/sys/develop/cedit
+c=/sys/develop/cedit
+cpp=/sys/develop/cedit
+h=/sys/develop/cedit
+pas=/sys/develop/cedit
+lua=/sys/develop/cedit
+ob07=/sys/develop/cedit
 txt=/sys/Quark
 jpg=/sys/media/kiv
 jpeg=/sys/media/kiv
diff --git a/data/common/icons16.png b/data/common/icons16.png
index 35ad7e4320..1fe1536e4e 100644
Binary files a/data/common/icons16.png and b/data/common/icons16.png differ
diff --git a/data/common/icons32.png b/data/common/icons32.png
index 7a39b372cd..d26692e38f 100644
Binary files a/data/common/icons32.png and b/data/common/icons32.png differ
diff --git a/data/common/settings/app_plus.ini b/data/common/settings/app_plus.ini
index 38d067a76c..5b49736b13 100644
--- a/data/common/settings/app_plus.ini
+++ b/data/common/settings/app_plus.ini
@@ -27,6 +27,7 @@ Guide=network/webview|/kolibrios/res/guide/guide.htm,92
 DosBox=/k/emul/dosbox/dosbox,11
 Dicty=/k/utils/DICTY.KEX,79
 fNav=File managers/fNav/fNav,93
+TextEdit=/kolibrios/utils/t_edit,58
 CncEditor=/k/utils/cnc_editor/cnc_editor,15
 Life=/k/demos/life2,13
 Calc+=/k/utils/calcplus,4
diff --git a/data/common/settings/assoc.ini b/data/common/settings/assoc.ini
index f0b4b49eba..5e06d96477 100644
--- a/data/common/settings/assoc.ini
+++ b/data/common/settings/assoc.ini
@@ -3,16 +3,16 @@ exec=/sys/QUARK
 icon=85
 next=$TinyPad
 
+[CodeEdit]
+exec=/sys/QUARK
+icon=85
+next=$TinyPad
+
 [TinyPad]
 exec=/sys/tinypad
 icon=9
 next=$TextEditor
 
-[TextEditor]
-exec=/sys/develop/t_edit
-icon=58
-next=$WebView
-
 [Run]
 exec=/sys/run
 icon=55
@@ -77,6 +77,12 @@ icon=98
 exec=/kolibrios/utils/thashview
 icon=124
 
+[TextEditor]
+exec=/kolibrios/utils/t_edit
+icon=9
+next=$CodeEdit
+
+
 [Assoc]
 /=/sys/file managers/eolite
 
@@ -84,9 +90,14 @@ kf=/sys/KF_VIEW
 
 txt=$Quark
 log=$Quark
-c=$Quark
-h=$Quark
-cpp=$Quark
+
+ini=$CodeEdit
+c=$CodeEdit
+cpp=$CodeEdit
+h=$CodeEdit
+pas=$CodeEdit
+lua=$CodeEdit
+ob07=$CodeEdit
 
 asm=$TinyPad
 inc=$TinyPad
diff --git a/data/common/settings/docky.ini b/data/common/settings/docky.ini
index 952838ca31..96a33c779f 100644
--- a/data/common/settings/docky.ini
+++ b/data/common/settings/docky.ini
@@ -14,10 +14,10 @@ path=unz
 param=
 icon=89
 
-[TextEdit]
-path=develop/t_edit
+[Quark]
+path=quark
 param=
-icon=58
+icon=85
 
 [Pixie]
 path=media/pixie
diff --git a/data/eng/settings/icon.ini b/data/eng/settings/icon.ini
index 0426b57081..592dbf1285 100644
--- a/data/eng/settings/icon.ini
+++ b/data/eng/settings/icon.ini
@@ -3,7 +3,6 @@ Processes=cpu
 Theme settings=skincfg
 Background=/sys/media/palitra
 System panel=syspanel
-Shell=shell
 [00]
 name=KFM
 path=/SYS/FILE MANAGERS/KFM
@@ -37,8 +36,8 @@ name=KFAR
 path=/SYS/FILE MANAGERS/KFAR
 param=
 ico=16
-x=68
-y=68
+x=136
+y=0
 [05]
 name=RDSAVE
 path=RDSAVE
@@ -229,12 +228,12 @@ ico=84
 x=-203
 y=68
 [20]
-name=QUARK
-path=/sys/quark
+name=CEDIT
+path=/sys/develop/cedit
 param=
-ico=85
-x=136
-y=0
+ico=58
+x=68
+y=68
 [21]
 name=CALC
 path=CALC
diff --git a/data/eng/settings/menu.dat b/data/eng/settings/menu.dat
index 0ee7f6b32b..60a09483f8 100644
--- a/data/eng/settings/menu.dat
+++ b/data/eng/settings/menu.dat
@@ -86,7 +86,7 @@ Screen keyboard       |zkey
 #10 **** DATA PROCESSING
 Calculator            |calc
 Tinypad               |tinypad
-TextEdit              |develop/t_edit
+CodeEdit              |develop/cedit
 Table processor       |table
 Graph builder         |graph
 Hex editor            |develop/heed
diff --git a/data/et/settings/icon.ini b/data/et/settings/icon.ini
index 2748b2df00..6e83fd59dd 100644
--- a/data/et/settings/icon.ini
+++ b/data/et/settings/icon.ini
@@ -36,8 +36,8 @@ name=KFAR
 path=/SYS/FILE MANAGERS/KFAR
 param=
 ico=16
-x=68
-y=68
+x=136
+y=0
 [05]
 name=RDSAVE
 path=RDSAVE
@@ -228,12 +228,12 @@ ico=84
 x=-203
 y=68
 [20]
-name=QUARK
-path=/sys/quark
+name=CEDIT
+path=/sys/develop/cedit
 param=
-ico=85
-x=136
-y=0
+ico=58
+x=68
+y=68
 [21]
 name=CALC
 path=CALC
diff --git a/data/et/settings/menu.dat b/data/et/settings/menu.dat
index a3f6df7c5a..346a78bb12 100644
--- a/data/et/settings/menu.dat
+++ b/data/et/settings/menu.dat
@@ -93,7 +93,7 @@ Salvesta RD t
 #11 **** DATA PROCESSING ****
 Kalkulaator           |calc
 Teksti redaktor       |tinypad
-TextEdit              |develop/t_edit
+CodeEdit              |develop/cedit
 Tabelarvutus          |table
 Graph builder         |graph
 Hex-Editor            |develop/heed
diff --git a/data/it/settings/icon.ini b/data/it/settings/icon.ini
index 0426b57081..592dbf1285 100644
--- a/data/it/settings/icon.ini
+++ b/data/it/settings/icon.ini
@@ -3,7 +3,6 @@ Processes=cpu
 Theme settings=skincfg
 Background=/sys/media/palitra
 System panel=syspanel
-Shell=shell
 [00]
 name=KFM
 path=/SYS/FILE MANAGERS/KFM
@@ -37,8 +36,8 @@ name=KFAR
 path=/SYS/FILE MANAGERS/KFAR
 param=
 ico=16
-x=68
-y=68
+x=136
+y=0
 [05]
 name=RDSAVE
 path=RDSAVE
@@ -229,12 +228,12 @@ ico=84
 x=-203
 y=68
 [20]
-name=QUARK
-path=/sys/quark
+name=CEDIT
+path=/sys/develop/cedit
 param=
-ico=85
-x=136
-y=0
+ico=58
+x=68
+y=68
 [21]
 name=CALC
 path=CALC
diff --git a/data/it/settings/menu.dat b/data/it/settings/menu.dat
index 85ed3392db..f505f1d521 100644
--- a/data/it/settings/menu.dat
+++ b/data/it/settings/menu.dat
@@ -94,7 +94,7 @@ Salva immagine RD     |rdsave
 #11 **** DATA PROCESSING
 Calcolatrice          |calc
 Tinypad               |tinypad
-TextEdit              |develop/t_edit
+CodeEdit              |develop/cedit
 Table Processor       |table
 Graph builder         |graph
 Hex-Editor            |develop/heed
diff --git a/data/rus/settings/icon.ini b/data/rus/settings/icon.ini
index 3172560ec3..991e5d93f8 100644
--- a/data/rus/settings/icon.ini
+++ b/data/rus/settings/icon.ini
@@ -3,7 +3,6 @@
 Управление темой=skincfg
 Настройка фона=/sys/media/palitra
 Системная панель=syspanel
-Консоль=shell
 [00]
 name=KFM
 path=/SYS/FILE MANAGERS/KFM
@@ -37,8 +36,8 @@ name=KFAR
 path=/SYS/FILE MANAGERS/KFAR
 param=
 ico=16
-x=68
-y=68
+x=136
+y=0
 [05]
 name=RDSAVE
 path=RDSAVE
@@ -229,12 +228,12 @@ ico=84
 x=-203
 y=68
 [20]
-name=QUARK
-path=/sys/quark
+name=CEDIT
+path=/sys/develop/cedit
 param=
-ico=85
-x=136
-y=0
+ico=58
+x=68
+y=68
 [21]
 name=CALC
 path=CALC
diff --git a/data/rus/settings/menu.dat b/data/rus/settings/menu.dat
index 15f18a6204..ba5e781688 100644
--- a/data/rus/settings/menu.dat
+++ b/data/rus/settings/menu.dat
@@ -83,7 +83,7 @@ Eolite               |File Managers/Eolite
 #10 ==Офис
 Калькулятор          |calc
 Редактор Tinypad     |tinypad
-Редактор TextEdit    |develop/t_edit
+Редактор CodeEdit    |develop/cedit
 Табличный процессор  |table
 Построение графиков  |graph
 Просмотр RTF         |rtfread
diff --git a/data/sp/settings/icon.ini b/data/sp/settings/icon.ini
index 0426b57081..592dbf1285 100644
--- a/data/sp/settings/icon.ini
+++ b/data/sp/settings/icon.ini
@@ -3,7 +3,6 @@ Processes=cpu
 Theme settings=skincfg
 Background=/sys/media/palitra
 System panel=syspanel
-Shell=shell
 [00]
 name=KFM
 path=/SYS/FILE MANAGERS/KFM
@@ -37,8 +36,8 @@ name=KFAR
 path=/SYS/FILE MANAGERS/KFAR
 param=
 ico=16
-x=68
-y=68
+x=136
+y=0
 [05]
 name=RDSAVE
 path=RDSAVE
@@ -229,12 +228,12 @@ ico=84
 x=-203
 y=68
 [20]
-name=QUARK
-path=/sys/quark
+name=CEDIT
+path=/sys/develop/cedit
 param=
-ico=85
-x=136
-y=0
+ico=58
+x=68
+y=68
 [21]
 name=CALC
 path=CALC
diff --git a/data/sp/settings/menu.dat b/data/sp/settings/menu.dat
index edc8f1b801..7f2254855d 100644
--- a/data/sp/settings/menu.dat
+++ b/data/sp/settings/menu.dat
@@ -94,7 +94,7 @@ Guardar im
 #11 **** PROCESO DE DATOS
 Calculadora           |calc
 Tinypad               |tinypad
-TextEdit              |develop/t_edit
+CodeEdit              |develop/cedit
 Procesador de tablas  |table
 Generador de grаficas |graph
 Hex-Editor            |develop/heed