diff --git a/skins/Leency/Florence/ra.bmp b/skins/Leency/Florence/ra.bmp
index 86355fa119..143ffde730 100644
Binary files a/skins/Leency/Florence/ra.bmp and b/skins/Leency/Florence/ra.bmp differ
diff --git a/skins/_old/MenuetOS/1.MenuetOS/1/MenuetOS.asm b/skins/_old/MenuetOS/1.MenuetOS/MenuetOS.asm
similarity index 91%
rename from skins/_old/MenuetOS/1.MenuetOS/1/MenuetOS.asm
rename to skins/_old/MenuetOS/1.MenuetOS/MenuetOS.asm
index 749c8baceb..4adf2c25ea 100644
--- a/skins/_old/MenuetOS/1.MenuetOS/1/MenuetOS.asm
+++ b/skins/_old/MenuetOS/1.MenuetOS/MenuetOS.asm
@@ -1,4 +1,4 @@
-include 'skin.inc'
+include '../../../skin.inc'
 
 SKIN_PARAMS \
   height	  = bmp_base.height,\	  ; skin height
@@ -9,7 +9,7 @@ SKIN_PARAMS \
   colors inactive = [binner=0x111B27:\	  ; border inner color
 		     bouter=0x111B27:\	  ; border outer color
 		     bframe=0x5C646C],\   ; border frame color
-  dtp		  = 'GRAY.DTP'	  ; dtp colors
+  dtp		  = 'menuet.dtp'	  ; dtp colors
 
 SKIN_BUTTONS \
   close    = [-19:6][12:12],\		  ; buttons coordinates
diff --git a/skins/_old/MenuetOS/3.MenuetOS/1/Tupfile.lua b/skins/_old/MenuetOS/1.MenuetOS/Tupfile.lua
similarity index 79%
rename from skins/_old/MenuetOS/3.MenuetOS/1/Tupfile.lua
rename to skins/_old/MenuetOS/1.MenuetOS/Tupfile.lua
index dcf82711f0..89d403fbd6 100644
--- a/skins/_old/MenuetOS/3.MenuetOS/1/Tupfile.lua
+++ b/skins/_old/MenuetOS/1.MenuetOS/Tupfile.lua
@@ -1,2 +1,2 @@
 if tup.getconfig("NO_FASM") ~= "" then return end
-tup.rule("MenuetOS.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "3.MenuetOS.1.skn")
+tup.rule("MenuetOS.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "MenuetOS 1.skn")
diff --git a/skins/_old/MenuetOS/1.MenuetOS/1/active/base.bmp b/skins/_old/MenuetOS/1.MenuetOS/active/base.bmp
similarity index 100%
rename from skins/_old/MenuetOS/1.MenuetOS/1/active/base.bmp
rename to skins/_old/MenuetOS/1.MenuetOS/active/base.bmp
diff --git a/skins/_old/MenuetOS/1.MenuetOS/1/active/left.bmp b/skins/_old/MenuetOS/1.MenuetOS/active/left.bmp
similarity index 100%
rename from skins/_old/MenuetOS/1.MenuetOS/1/active/left.bmp
rename to skins/_old/MenuetOS/1.MenuetOS/active/left.bmp
diff --git a/skins/_old/MenuetOS/1.MenuetOS/1/active/oper.bmp b/skins/_old/MenuetOS/1.MenuetOS/active/oper.bmp
similarity index 100%
rename from skins/_old/MenuetOS/1.MenuetOS/1/active/oper.bmp
rename to skins/_old/MenuetOS/1.MenuetOS/active/oper.bmp
diff --git a/skins/_old/MenuetOS/1.MenuetOS/build.bat b/skins/_old/MenuetOS/1.MenuetOS/build.bat
new file mode 100644
index 0000000000..616c7df3c3
--- /dev/null
+++ b/skins/_old/MenuetOS/1.MenuetOS/build.bat
@@ -0,0 +1,2 @@
+@fasm MenuetOS.asm MenuetOS.skn
+@pause
\ No newline at end of file
diff --git a/skins/_old/MenuetOS/1.MenuetOS/1/inactive/base.bmp b/skins/_old/MenuetOS/1.MenuetOS/inactive/base.bmp
similarity index 100%
rename from skins/_old/MenuetOS/1.MenuetOS/1/inactive/base.bmp
rename to skins/_old/MenuetOS/1.MenuetOS/inactive/base.bmp
diff --git a/skins/_old/MenuetOS/1.MenuetOS/1/inactive/left.bmp b/skins/_old/MenuetOS/1.MenuetOS/inactive/left.bmp
similarity index 100%
rename from skins/_old/MenuetOS/1.MenuetOS/1/inactive/left.bmp
rename to skins/_old/MenuetOS/1.MenuetOS/inactive/left.bmp
diff --git a/skins/_old/MenuetOS/1.MenuetOS/1/inactive/oper.bmp b/skins/_old/MenuetOS/1.MenuetOS/inactive/oper.bmp
similarity index 100%
rename from skins/_old/MenuetOS/1.MenuetOS/1/inactive/oper.bmp
rename to skins/_old/MenuetOS/1.MenuetOS/inactive/oper.bmp
diff --git a/skins/_old/MenuetOS/1.MenuetOS/1/menuet.dtp b/skins/_old/MenuetOS/1.MenuetOS/menuet.dtp
similarity index 100%
rename from skins/_old/MenuetOS/1.MenuetOS/1/menuet.dtp
rename to skins/_old/MenuetOS/1.MenuetOS/menuet.dtp
diff --git a/skins/_old/MenuetOS/1.MenuetOS/1/skin.inc b/skins/_old/MenuetOS/1.MenuetOS/skin.inc
similarity index 100%
rename from skins/_old/MenuetOS/1.MenuetOS/1/skin.inc
rename to skins/_old/MenuetOS/1.MenuetOS/skin.inc
diff --git a/skins/_old/MenuetOS/2.MenuetOS/1/GRAY.DTP b/skins/_old/MenuetOS/2.MenuetOS/GRAY.DTP
similarity index 100%
rename from skins/_old/MenuetOS/2.MenuetOS/1/GRAY.DTP
rename to skins/_old/MenuetOS/2.MenuetOS/GRAY.DTP
diff --git a/skins/_old/MenuetOS/2.MenuetOS/1/MenuetOS.asm b/skins/_old/MenuetOS/2.MenuetOS/MenuetOS.asm
similarity index 94%
rename from skins/_old/MenuetOS/2.MenuetOS/1/MenuetOS.asm
rename to skins/_old/MenuetOS/2.MenuetOS/MenuetOS.asm
index fbb1a454b9..4208686888 100644
--- a/skins/_old/MenuetOS/2.MenuetOS/1/MenuetOS.asm
+++ b/skins/_old/MenuetOS/2.MenuetOS/MenuetOS.asm
@@ -1,4 +1,4 @@
-include 'skin.inc'
+include '../../../skin.inc'
 
 SKIN_PARAMS \
   height	  = bmp_base.height,\	  ; skin height
diff --git a/skins/_old/MenuetOS/4.MenuetOS/1/Tupfile.lua b/skins/_old/MenuetOS/2.MenuetOS/Tupfile.lua
similarity index 79%
rename from skins/_old/MenuetOS/4.MenuetOS/1/Tupfile.lua
rename to skins/_old/MenuetOS/2.MenuetOS/Tupfile.lua
index 9238a4afef..d8a7d699b6 100644
--- a/skins/_old/MenuetOS/4.MenuetOS/1/Tupfile.lua
+++ b/skins/_old/MenuetOS/2.MenuetOS/Tupfile.lua
@@ -1,2 +1,2 @@
 if tup.getconfig("NO_FASM") ~= "" then return end
-tup.rule("MenuetOS.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "4.MenuetOS.1.skn")
+tup.rule("MenuetOS.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "MenuetOS 2.skn")
diff --git a/skins/_old/MenuetOS/2.MenuetOS/1/active/base.bmp b/skins/_old/MenuetOS/2.MenuetOS/active/base.bmp
similarity index 100%
rename from skins/_old/MenuetOS/2.MenuetOS/1/active/base.bmp
rename to skins/_old/MenuetOS/2.MenuetOS/active/base.bmp
diff --git a/skins/_old/MenuetOS/2.MenuetOS/1/active/left.bmp b/skins/_old/MenuetOS/2.MenuetOS/active/left.bmp
similarity index 100%
rename from skins/_old/MenuetOS/2.MenuetOS/1/active/left.bmp
rename to skins/_old/MenuetOS/2.MenuetOS/active/left.bmp
diff --git a/skins/_old/MenuetOS/2.MenuetOS/1/active/oper.bmp b/skins/_old/MenuetOS/2.MenuetOS/active/oper.bmp
similarity index 100%
rename from skins/_old/MenuetOS/2.MenuetOS/1/active/oper.bmp
rename to skins/_old/MenuetOS/2.MenuetOS/active/oper.bmp
diff --git a/skins/_old/MenuetOS/2.MenuetOS/1/inactive/base.bmp b/skins/_old/MenuetOS/2.MenuetOS/inactive/base.bmp
similarity index 100%
rename from skins/_old/MenuetOS/2.MenuetOS/1/inactive/base.bmp
rename to skins/_old/MenuetOS/2.MenuetOS/inactive/base.bmp
diff --git a/skins/_old/MenuetOS/2.MenuetOS/1/inactive/left.bmp b/skins/_old/MenuetOS/2.MenuetOS/inactive/left.bmp
similarity index 100%
rename from skins/_old/MenuetOS/2.MenuetOS/1/inactive/left.bmp
rename to skins/_old/MenuetOS/2.MenuetOS/inactive/left.bmp
diff --git a/skins/_old/MenuetOS/2.MenuetOS/1/inactive/oper.bmp b/skins/_old/MenuetOS/2.MenuetOS/inactive/oper.bmp
similarity index 100%
rename from skins/_old/MenuetOS/2.MenuetOS/1/inactive/oper.bmp
rename to skins/_old/MenuetOS/2.MenuetOS/inactive/oper.bmp
diff --git a/skins/_old/MenuetOS/3.MenuetOS/1/skin.inc b/skins/_old/MenuetOS/3.MenuetOS/1/skin.inc
deleted file mode 100644
index 81a6bd8f3f..0000000000
--- a/skins/_old/MenuetOS/3.MenuetOS/1/skin.inc
+++ /dev/null
@@ -1,239 +0,0 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2017. All rights reserved. ;;
-;; Distributed under terms of the GNU General Public License    ;;
-;;                                                              ;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;============================================================================
-; This file should be used to generate skins of new standard
-;============================================================================
-; skin file structure:
-;----------------------------------------------------------------------------
-;  header:
-;   dd 'SKIN'
-;   dd = version (1 for now)
-;   dd @ params
-;   dd @ buttons
-;   dd @ bitmaps
-; ...
-;----------------------------------------------------------------------------
-; NOTE: order of sections listed below is insignificant
-;       since they're identified by pointer in above header
-;----------------------------------------------------------------------------
-; ...
-;  params:
-;   dd = skin height
-;   dw = right margin
-;   dw = left margin
-;   dw = bottom margin
-;   dw = top margin
-;   dd = inner line color
-;   dd = outer line color
-;   dd = frame color
-;   dd = dtp file size
-;   ?? = dtp file itself
-; ...
-;----------------------------------------------------------------------------
-; ...
-;  buttons:
-;   dd = button type (1 = close, 2 = minimize)
-;   dw = left button coord (could be negative)
-;   dw = top button coord (could be negative)
-;   dw = button width
-;   dw = button height
-;   ... etc for all buttons
-;   dd = 0 (end of buttons list)
-; ...
-;----------------------------------------------------------------------------
-; ...
-;  bitmaps:
-;   dw = bitmap kind (1 = left, 2 = oper, 3 = base)
-;   dw = bitmap type (1 = active, 0 = inactive)
-;   dd @ bitmap
-;   ... etc for all bitmaps
-;   dd 0 (end of bitmaps list)
-; ...
-;----------------------------------------------------------------------------
-; ...
-;  bitmap:
-;   dd = bitmap width
-;   dd = bitmap height
-;   ?? = raw bitmap data
-;   ... etc for all bitmaps
-; ...
-;============================================================================
-
-dd 'SKIN',1,__params__,__buttons__,__bitmaps__
-
-struc BITMAPFILEHEADER {
-  .bfType      dw ? ; WORD
-  .bfSize      dd ? ; DWORD
-  .bfReserved1 dw ? ; WORD
-  .bfReserved2 dw ? ; WORD
-  .bfOffBits   dd ? ; DWORD
-}
-
-struc BITMAPINFOHEADER {
-  .biSize          dd ? ; DWORD
-  .biWidth         dd ? ; LONG
-  .biHeight        dd ? ; LONG
-  .biPlanes        dw ? ; WORD
-  .biBitCount      dw ? ; WORD
-  .biCompression   dd ? ; DWORD
-  .biSizeImage     dd ? ; DWORD
-  .biXPelsPerMeter dd ? ; LONG
-  .biYPelsPerMeter dd ? ; LONG
-  .biClrUsed       dd ? ; DWORD
-  .biClrImportant  dd ? ; DWORD
-}
-
-struc _bmp {
-  .h BITMAPFILEHEADER
-  .i BITMAPINFOHEADER
-}
-virtual at 0
-  _bmp _bmp
-end virtual
-
-macro BITMAP _name*,_fname*
-{
-  local w,h,a,r,g,b
-  virtual at 0
-    _file equ _#_name
-    _file::
-    file _fname
-  end virtual
-  load w dword from _file:_bmp.i.biWidth
-  load h dword from _file:_bmp.i.biHeight
-  load hsize dword from _file:_bmp.h.bfOffBits
-  align 4
-  label _name
-    .width  = w
-    .height = h
-  dd w,h
-  a=hsize+(w*3+(w mod 4))*(h-1)
-  size = $
-  repeat h
-    repeat w
-      load r from _file:a+0
-      load g from _file:a+1
-      load b from _file:a+2
-      db r,g,b
-      a=a+3
-    end repeat
-    a=a-w*3*2-(w mod 4)
-  end repeat
-}
-
-macro define_colors name,[col,val]
-{
-  common
-    local a,b,c
-  forward
-    match =binner,col \{ a = val \}
-    match =bouter,col \{ b = val \}
-    match =bframe,col \{ c = val \}
-  common
-    name equ a,b,c
-}
-
-macro SKIN_PARAMS [a]
-{
-  common
-    local _height,_margins,_colors,_colors_1,_dtp
-    __params__:
-  forward
-    match qq == ww,a
-    \{
-      match =height,qq \\{ _height = ww \\}
-      match =margins,qq \\{
-        match [q1:q2:q3:q4],ww
-        \\\{
-          _margins equ q3,q1,q4,q2
-        \\\}
-      \\}
-      match =colors =active,qq
-      \\{
-        match [q10==q11:q20==q21:q30==q31],ww
-        \\\{
-          define_colors _colors,q10,q11,q20,q21,q30,q31
-        \\\}
-      \\}
-      match =colors =inactive,qq
-      \\{
-        match [q10==q11:q20==q21:q30==q31],ww
-        \\\{
-          define_colors _colors_1,q10,q11,q20,q21,q30,q31
-        \\\}
-      \\}
-      match =dtp,qq \\{ _dtp equ ww \\}
-    \}
-  common
-    dd _height
-    dw _margins
-    dd _colors,_colors_1
-    dd @f - $ - 4
-    file _dtp
-    @@:
-}
-
-macro SKIN_BUTTONS [a]
-{
-  common
-    local btn
-    __buttons__:
-  forward
-    match qq == ww,a
-    \{
-      btn = 0
-      match =close,qq    \\{ btn = 1 \\}
-      match =minimize,qq \\{ btn = 2 \\}
-      match [q1:q2][q3:q4],ww
-      \\{
-        if btn <> 0
-          dd btn
-          dw q1,q2,q3,q4
-        end if
-      \\}
-    \}
-  common
-    dd 0
-}
-
-macro SKIN_BITMAPS [a]
-{
-  common
-    local bmp
-    __bitmaps__:
-  forward
-    match qq == ww,a
-    \{
-      bmp=-1
-      match qqq =active,qq   \\{ bmp = 1 \\}
-      match qqq =inactive,qq \\{ bmp = 0 \\}
-      match =left qqq,qq
-      \\{
-        if bmp >= 0
-          dw 1,bmp
-          dd ww
-        end if
-      \\}
-      match =oper qqq,qq
-      \\{
-        if bmp >= 0
-          dw 2,bmp
-          dd ww
-        end if
-      \\}
-      match =base qqq,qq
-      \\{
-        if bmp >= 0
-          dw 3,bmp
-          dd ww
-        end if
-      \\}
-    \}
-  common
-    dd 0
-}
diff --git a/skins/_old/MenuetOS/3.MenuetOS/1/GRAY.DTP b/skins/_old/MenuetOS/3.MenuetOS/GRAY.DTP
similarity index 100%
rename from skins/_old/MenuetOS/3.MenuetOS/1/GRAY.DTP
rename to skins/_old/MenuetOS/3.MenuetOS/GRAY.DTP
diff --git a/skins/_old/MenuetOS/3.MenuetOS/1/MenuetOS.asm b/skins/_old/MenuetOS/3.MenuetOS/MenuetOS.asm
similarity index 94%
rename from skins/_old/MenuetOS/3.MenuetOS/1/MenuetOS.asm
rename to skins/_old/MenuetOS/3.MenuetOS/MenuetOS.asm
index 51f88e8314..e3f086c8a6 100644
--- a/skins/_old/MenuetOS/3.MenuetOS/1/MenuetOS.asm
+++ b/skins/_old/MenuetOS/3.MenuetOS/MenuetOS.asm
@@ -1,4 +1,4 @@
-include 'skin.inc'
+include '../../../skin.inc'
 
 SKIN_PARAMS \
   height	  = bmp_base.height,\	  ; skin height
diff --git a/skins/_old/MenuetOS/2.MenuetOS/1/Tupfile.lua b/skins/_old/MenuetOS/3.MenuetOS/Tupfile.lua
similarity index 79%
rename from skins/_old/MenuetOS/2.MenuetOS/1/Tupfile.lua
rename to skins/_old/MenuetOS/3.MenuetOS/Tupfile.lua
index ea380781b4..24bdb2169e 100644
--- a/skins/_old/MenuetOS/2.MenuetOS/1/Tupfile.lua
+++ b/skins/_old/MenuetOS/3.MenuetOS/Tupfile.lua
@@ -1,2 +1,2 @@
 if tup.getconfig("NO_FASM") ~= "" then return end
-tup.rule("MenuetOS.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "2.MenuetOS.1.skn")
+tup.rule("MenuetOS.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "MenuetOS 3.skn")
diff --git a/skins/_old/MenuetOS/3.MenuetOS/1/active/base.bmp b/skins/_old/MenuetOS/3.MenuetOS/active/base.bmp
similarity index 100%
rename from skins/_old/MenuetOS/3.MenuetOS/1/active/base.bmp
rename to skins/_old/MenuetOS/3.MenuetOS/active/base.bmp
diff --git a/skins/_old/MenuetOS/3.MenuetOS/1/active/left.bmp b/skins/_old/MenuetOS/3.MenuetOS/active/left.bmp
similarity index 100%
rename from skins/_old/MenuetOS/3.MenuetOS/1/active/left.bmp
rename to skins/_old/MenuetOS/3.MenuetOS/active/left.bmp
diff --git a/skins/_old/MenuetOS/3.MenuetOS/1/active/oper.bmp b/skins/_old/MenuetOS/3.MenuetOS/active/oper.bmp
similarity index 100%
rename from skins/_old/MenuetOS/3.MenuetOS/1/active/oper.bmp
rename to skins/_old/MenuetOS/3.MenuetOS/active/oper.bmp
diff --git a/skins/_old/MenuetOS/3.MenuetOS/1/inactive/base.bmp b/skins/_old/MenuetOS/3.MenuetOS/inactive/base.bmp
similarity index 100%
rename from skins/_old/MenuetOS/3.MenuetOS/1/inactive/base.bmp
rename to skins/_old/MenuetOS/3.MenuetOS/inactive/base.bmp
diff --git a/skins/_old/MenuetOS/3.MenuetOS/1/inactive/left.bmp b/skins/_old/MenuetOS/3.MenuetOS/inactive/left.bmp
similarity index 100%
rename from skins/_old/MenuetOS/3.MenuetOS/1/inactive/left.bmp
rename to skins/_old/MenuetOS/3.MenuetOS/inactive/left.bmp
diff --git a/skins/_old/MenuetOS/3.MenuetOS/1/inactive/oper.bmp b/skins/_old/MenuetOS/3.MenuetOS/inactive/oper.bmp
similarity index 100%
rename from skins/_old/MenuetOS/3.MenuetOS/1/inactive/oper.bmp
rename to skins/_old/MenuetOS/3.MenuetOS/inactive/oper.bmp
diff --git a/skins/_old/MenuetOS/2.MenuetOS/1/skin.inc b/skins/_old/MenuetOS/3.MenuetOS/skin.inc
similarity index 100%
rename from skins/_old/MenuetOS/2.MenuetOS/1/skin.inc
rename to skins/_old/MenuetOS/3.MenuetOS/skin.inc
diff --git a/skins/_old/MenuetOS/4.MenuetOS/1/skin.inc b/skins/_old/MenuetOS/4.MenuetOS/1/skin.inc
deleted file mode 100644
index 81a6bd8f3f..0000000000
--- a/skins/_old/MenuetOS/4.MenuetOS/1/skin.inc
+++ /dev/null
@@ -1,239 +0,0 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2017. All rights reserved. ;;
-;; Distributed under terms of the GNU General Public License    ;;
-;;                                                              ;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;============================================================================
-; This file should be used to generate skins of new standard
-;============================================================================
-; skin file structure:
-;----------------------------------------------------------------------------
-;  header:
-;   dd 'SKIN'
-;   dd = version (1 for now)
-;   dd @ params
-;   dd @ buttons
-;   dd @ bitmaps
-; ...
-;----------------------------------------------------------------------------
-; NOTE: order of sections listed below is insignificant
-;       since they're identified by pointer in above header
-;----------------------------------------------------------------------------
-; ...
-;  params:
-;   dd = skin height
-;   dw = right margin
-;   dw = left margin
-;   dw = bottom margin
-;   dw = top margin
-;   dd = inner line color
-;   dd = outer line color
-;   dd = frame color
-;   dd = dtp file size
-;   ?? = dtp file itself
-; ...
-;----------------------------------------------------------------------------
-; ...
-;  buttons:
-;   dd = button type (1 = close, 2 = minimize)
-;   dw = left button coord (could be negative)
-;   dw = top button coord (could be negative)
-;   dw = button width
-;   dw = button height
-;   ... etc for all buttons
-;   dd = 0 (end of buttons list)
-; ...
-;----------------------------------------------------------------------------
-; ...
-;  bitmaps:
-;   dw = bitmap kind (1 = left, 2 = oper, 3 = base)
-;   dw = bitmap type (1 = active, 0 = inactive)
-;   dd @ bitmap
-;   ... etc for all bitmaps
-;   dd 0 (end of bitmaps list)
-; ...
-;----------------------------------------------------------------------------
-; ...
-;  bitmap:
-;   dd = bitmap width
-;   dd = bitmap height
-;   ?? = raw bitmap data
-;   ... etc for all bitmaps
-; ...
-;============================================================================
-
-dd 'SKIN',1,__params__,__buttons__,__bitmaps__
-
-struc BITMAPFILEHEADER {
-  .bfType      dw ? ; WORD
-  .bfSize      dd ? ; DWORD
-  .bfReserved1 dw ? ; WORD
-  .bfReserved2 dw ? ; WORD
-  .bfOffBits   dd ? ; DWORD
-}
-
-struc BITMAPINFOHEADER {
-  .biSize          dd ? ; DWORD
-  .biWidth         dd ? ; LONG
-  .biHeight        dd ? ; LONG
-  .biPlanes        dw ? ; WORD
-  .biBitCount      dw ? ; WORD
-  .biCompression   dd ? ; DWORD
-  .biSizeImage     dd ? ; DWORD
-  .biXPelsPerMeter dd ? ; LONG
-  .biYPelsPerMeter dd ? ; LONG
-  .biClrUsed       dd ? ; DWORD
-  .biClrImportant  dd ? ; DWORD
-}
-
-struc _bmp {
-  .h BITMAPFILEHEADER
-  .i BITMAPINFOHEADER
-}
-virtual at 0
-  _bmp _bmp
-end virtual
-
-macro BITMAP _name*,_fname*
-{
-  local w,h,a,r,g,b
-  virtual at 0
-    _file equ _#_name
-    _file::
-    file _fname
-  end virtual
-  load w dword from _file:_bmp.i.biWidth
-  load h dword from _file:_bmp.i.biHeight
-  load hsize dword from _file:_bmp.h.bfOffBits
-  align 4
-  label _name
-    .width  = w
-    .height = h
-  dd w,h
-  a=hsize+(w*3+(w mod 4))*(h-1)
-  size = $
-  repeat h
-    repeat w
-      load r from _file:a+0
-      load g from _file:a+1
-      load b from _file:a+2
-      db r,g,b
-      a=a+3
-    end repeat
-    a=a-w*3*2-(w mod 4)
-  end repeat
-}
-
-macro define_colors name,[col,val]
-{
-  common
-    local a,b,c
-  forward
-    match =binner,col \{ a = val \}
-    match =bouter,col \{ b = val \}
-    match =bframe,col \{ c = val \}
-  common
-    name equ a,b,c
-}
-
-macro SKIN_PARAMS [a]
-{
-  common
-    local _height,_margins,_colors,_colors_1,_dtp
-    __params__:
-  forward
-    match qq == ww,a
-    \{
-      match =height,qq \\{ _height = ww \\}
-      match =margins,qq \\{
-        match [q1:q2:q3:q4],ww
-        \\\{
-          _margins equ q3,q1,q4,q2
-        \\\}
-      \\}
-      match =colors =active,qq
-      \\{
-        match [q10==q11:q20==q21:q30==q31],ww
-        \\\{
-          define_colors _colors,q10,q11,q20,q21,q30,q31
-        \\\}
-      \\}
-      match =colors =inactive,qq
-      \\{
-        match [q10==q11:q20==q21:q30==q31],ww
-        \\\{
-          define_colors _colors_1,q10,q11,q20,q21,q30,q31
-        \\\}
-      \\}
-      match =dtp,qq \\{ _dtp equ ww \\}
-    \}
-  common
-    dd _height
-    dw _margins
-    dd _colors,_colors_1
-    dd @f - $ - 4
-    file _dtp
-    @@:
-}
-
-macro SKIN_BUTTONS [a]
-{
-  common
-    local btn
-    __buttons__:
-  forward
-    match qq == ww,a
-    \{
-      btn = 0
-      match =close,qq    \\{ btn = 1 \\}
-      match =minimize,qq \\{ btn = 2 \\}
-      match [q1:q2][q3:q4],ww
-      \\{
-        if btn <> 0
-          dd btn
-          dw q1,q2,q3,q4
-        end if
-      \\}
-    \}
-  common
-    dd 0
-}
-
-macro SKIN_BITMAPS [a]
-{
-  common
-    local bmp
-    __bitmaps__:
-  forward
-    match qq == ww,a
-    \{
-      bmp=-1
-      match qqq =active,qq   \\{ bmp = 1 \\}
-      match qqq =inactive,qq \\{ bmp = 0 \\}
-      match =left qqq,qq
-      \\{
-        if bmp >= 0
-          dw 1,bmp
-          dd ww
-        end if
-      \\}
-      match =oper qqq,qq
-      \\{
-        if bmp >= 0
-          dw 2,bmp
-          dd ww
-        end if
-      \\}
-      match =base qqq,qq
-      \\{
-        if bmp >= 0
-          dw 3,bmp
-          dd ww
-        end if
-      \\}
-    \}
-  common
-    dd 0
-}
diff --git a/skins/_old/MenuetOS/4.MenuetOS/1/GRAY.DTP b/skins/_old/MenuetOS/4.MenuetOS/GRAY.DTP
similarity index 100%
rename from skins/_old/MenuetOS/4.MenuetOS/1/GRAY.DTP
rename to skins/_old/MenuetOS/4.MenuetOS/GRAY.DTP
diff --git a/skins/_old/MenuetOS/4.MenuetOS/1/MenuetOS.asm b/skins/_old/MenuetOS/4.MenuetOS/MenuetOS.asm
similarity index 94%
rename from skins/_old/MenuetOS/4.MenuetOS/1/MenuetOS.asm
rename to skins/_old/MenuetOS/4.MenuetOS/MenuetOS.asm
index c26e59cb37..c97838a0a9 100644
--- a/skins/_old/MenuetOS/4.MenuetOS/1/MenuetOS.asm
+++ b/skins/_old/MenuetOS/4.MenuetOS/MenuetOS.asm
@@ -1,4 +1,4 @@
-include 'skin.inc'
+include '../../../skin.inc'
 
 SKIN_PARAMS \
   height	  = bmp_base.height,\	  ; skin height
diff --git a/skins/_old/MenuetOS/5.MenuetOS/1/Tupfile.lua b/skins/_old/MenuetOS/4.MenuetOS/Tupfile.lua
similarity index 79%
rename from skins/_old/MenuetOS/5.MenuetOS/1/Tupfile.lua
rename to skins/_old/MenuetOS/4.MenuetOS/Tupfile.lua
index db1ac6aba3..6ff1f91794 100644
--- a/skins/_old/MenuetOS/5.MenuetOS/1/Tupfile.lua
+++ b/skins/_old/MenuetOS/4.MenuetOS/Tupfile.lua
@@ -1,2 +1,2 @@
 if tup.getconfig("NO_FASM") ~= "" then return end
-tup.rule("MenuetOS.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "5.MenuetOS.1.skn")
+tup.rule("MenuetOS.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "MenuetOS 4.skn")
diff --git a/skins/_old/MenuetOS/4.MenuetOS/1/active/base.bmp b/skins/_old/MenuetOS/4.MenuetOS/active/base.bmp
similarity index 100%
rename from skins/_old/MenuetOS/4.MenuetOS/1/active/base.bmp
rename to skins/_old/MenuetOS/4.MenuetOS/active/base.bmp
diff --git a/skins/_old/MenuetOS/4.MenuetOS/1/active/left.bmp b/skins/_old/MenuetOS/4.MenuetOS/active/left.bmp
similarity index 100%
rename from skins/_old/MenuetOS/4.MenuetOS/1/active/left.bmp
rename to skins/_old/MenuetOS/4.MenuetOS/active/left.bmp
diff --git a/skins/_old/MenuetOS/4.MenuetOS/1/active/oper.bmp b/skins/_old/MenuetOS/4.MenuetOS/active/oper.bmp
similarity index 100%
rename from skins/_old/MenuetOS/4.MenuetOS/1/active/oper.bmp
rename to skins/_old/MenuetOS/4.MenuetOS/active/oper.bmp
diff --git a/skins/_old/MenuetOS/4.MenuetOS/1/inactive/base.bmp b/skins/_old/MenuetOS/4.MenuetOS/inactive/base.bmp
similarity index 100%
rename from skins/_old/MenuetOS/4.MenuetOS/1/inactive/base.bmp
rename to skins/_old/MenuetOS/4.MenuetOS/inactive/base.bmp
diff --git a/skins/_old/MenuetOS/4.MenuetOS/1/inactive/left.bmp b/skins/_old/MenuetOS/4.MenuetOS/inactive/left.bmp
similarity index 100%
rename from skins/_old/MenuetOS/4.MenuetOS/1/inactive/left.bmp
rename to skins/_old/MenuetOS/4.MenuetOS/inactive/left.bmp
diff --git a/skins/_old/MenuetOS/4.MenuetOS/1/inactive/oper.bmp b/skins/_old/MenuetOS/4.MenuetOS/inactive/oper.bmp
similarity index 100%
rename from skins/_old/MenuetOS/4.MenuetOS/1/inactive/oper.bmp
rename to skins/_old/MenuetOS/4.MenuetOS/inactive/oper.bmp
diff --git a/skins/_old/MenuetOS/5.MenuetOS/1/skin.inc b/skins/_old/MenuetOS/5.MenuetOS/1/skin.inc
deleted file mode 100644
index 81a6bd8f3f..0000000000
--- a/skins/_old/MenuetOS/5.MenuetOS/1/skin.inc
+++ /dev/null
@@ -1,239 +0,0 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;                                                              ;;
-;; Copyright (C) KolibriOS team 2004-2017. All rights reserved. ;;
-;; Distributed under terms of the GNU General Public License    ;;
-;;                                                              ;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;============================================================================
-; This file should be used to generate skins of new standard
-;============================================================================
-; skin file structure:
-;----------------------------------------------------------------------------
-;  header:
-;   dd 'SKIN'
-;   dd = version (1 for now)
-;   dd @ params
-;   dd @ buttons
-;   dd @ bitmaps
-; ...
-;----------------------------------------------------------------------------
-; NOTE: order of sections listed below is insignificant
-;       since they're identified by pointer in above header
-;----------------------------------------------------------------------------
-; ...
-;  params:
-;   dd = skin height
-;   dw = right margin
-;   dw = left margin
-;   dw = bottom margin
-;   dw = top margin
-;   dd = inner line color
-;   dd = outer line color
-;   dd = frame color
-;   dd = dtp file size
-;   ?? = dtp file itself
-; ...
-;----------------------------------------------------------------------------
-; ...
-;  buttons:
-;   dd = button type (1 = close, 2 = minimize)
-;   dw = left button coord (could be negative)
-;   dw = top button coord (could be negative)
-;   dw = button width
-;   dw = button height
-;   ... etc for all buttons
-;   dd = 0 (end of buttons list)
-; ...
-;----------------------------------------------------------------------------
-; ...
-;  bitmaps:
-;   dw = bitmap kind (1 = left, 2 = oper, 3 = base)
-;   dw = bitmap type (1 = active, 0 = inactive)
-;   dd @ bitmap
-;   ... etc for all bitmaps
-;   dd 0 (end of bitmaps list)
-; ...
-;----------------------------------------------------------------------------
-; ...
-;  bitmap:
-;   dd = bitmap width
-;   dd = bitmap height
-;   ?? = raw bitmap data
-;   ... etc for all bitmaps
-; ...
-;============================================================================
-
-dd 'SKIN',1,__params__,__buttons__,__bitmaps__
-
-struc BITMAPFILEHEADER {
-  .bfType      dw ? ; WORD
-  .bfSize      dd ? ; DWORD
-  .bfReserved1 dw ? ; WORD
-  .bfReserved2 dw ? ; WORD
-  .bfOffBits   dd ? ; DWORD
-}
-
-struc BITMAPINFOHEADER {
-  .biSize          dd ? ; DWORD
-  .biWidth         dd ? ; LONG
-  .biHeight        dd ? ; LONG
-  .biPlanes        dw ? ; WORD
-  .biBitCount      dw ? ; WORD
-  .biCompression   dd ? ; DWORD
-  .biSizeImage     dd ? ; DWORD
-  .biXPelsPerMeter dd ? ; LONG
-  .biYPelsPerMeter dd ? ; LONG
-  .biClrUsed       dd ? ; DWORD
-  .biClrImportant  dd ? ; DWORD
-}
-
-struc _bmp {
-  .h BITMAPFILEHEADER
-  .i BITMAPINFOHEADER
-}
-virtual at 0
-  _bmp _bmp
-end virtual
-
-macro BITMAP _name*,_fname*
-{
-  local w,h,a,r,g,b
-  virtual at 0
-    _file equ _#_name
-    _file::
-    file _fname
-  end virtual
-  load w dword from _file:_bmp.i.biWidth
-  load h dword from _file:_bmp.i.biHeight
-  load hsize dword from _file:_bmp.h.bfOffBits
-  align 4
-  label _name
-    .width  = w
-    .height = h
-  dd w,h
-  a=hsize+(w*3+(w mod 4))*(h-1)
-  size = $
-  repeat h
-    repeat w
-      load r from _file:a+0
-      load g from _file:a+1
-      load b from _file:a+2
-      db r,g,b
-      a=a+3
-    end repeat
-    a=a-w*3*2-(w mod 4)
-  end repeat
-}
-
-macro define_colors name,[col,val]
-{
-  common
-    local a,b,c
-  forward
-    match =binner,col \{ a = val \}
-    match =bouter,col \{ b = val \}
-    match =bframe,col \{ c = val \}
-  common
-    name equ a,b,c
-}
-
-macro SKIN_PARAMS [a]
-{
-  common
-    local _height,_margins,_colors,_colors_1,_dtp
-    __params__:
-  forward
-    match qq == ww,a
-    \{
-      match =height,qq \\{ _height = ww \\}
-      match =margins,qq \\{
-        match [q1:q2:q3:q4],ww
-        \\\{
-          _margins equ q3,q1,q4,q2
-        \\\}
-      \\}
-      match =colors =active,qq
-      \\{
-        match [q10==q11:q20==q21:q30==q31],ww
-        \\\{
-          define_colors _colors,q10,q11,q20,q21,q30,q31
-        \\\}
-      \\}
-      match =colors =inactive,qq
-      \\{
-        match [q10==q11:q20==q21:q30==q31],ww
-        \\\{
-          define_colors _colors_1,q10,q11,q20,q21,q30,q31
-        \\\}
-      \\}
-      match =dtp,qq \\{ _dtp equ ww \\}
-    \}
-  common
-    dd _height
-    dw _margins
-    dd _colors,_colors_1
-    dd @f - $ - 4
-    file _dtp
-    @@:
-}
-
-macro SKIN_BUTTONS [a]
-{
-  common
-    local btn
-    __buttons__:
-  forward
-    match qq == ww,a
-    \{
-      btn = 0
-      match =close,qq    \\{ btn = 1 \\}
-      match =minimize,qq \\{ btn = 2 \\}
-      match [q1:q2][q3:q4],ww
-      \\{
-        if btn <> 0
-          dd btn
-          dw q1,q2,q3,q4
-        end if
-      \\}
-    \}
-  common
-    dd 0
-}
-
-macro SKIN_BITMAPS [a]
-{
-  common
-    local bmp
-    __bitmaps__:
-  forward
-    match qq == ww,a
-    \{
-      bmp=-1
-      match qqq =active,qq   \\{ bmp = 1 \\}
-      match qqq =inactive,qq \\{ bmp = 0 \\}
-      match =left qqq,qq
-      \\{
-        if bmp >= 0
-          dw 1,bmp
-          dd ww
-        end if
-      \\}
-      match =oper qqq,qq
-      \\{
-        if bmp >= 0
-          dw 2,bmp
-          dd ww
-        end if
-      \\}
-      match =base qqq,qq
-      \\{
-        if bmp >= 0
-          dw 3,bmp
-          dd ww
-        end if
-      \\}
-    \}
-  common
-    dd 0
-}
diff --git a/skins/_old/MenuetOS/5.MenuetOS/1/GRAY.DTP b/skins/_old/MenuetOS/5.MenuetOS/GRAY.DTP
similarity index 100%
rename from skins/_old/MenuetOS/5.MenuetOS/1/GRAY.DTP
rename to skins/_old/MenuetOS/5.MenuetOS/GRAY.DTP
diff --git a/skins/_old/MenuetOS/5.MenuetOS/1/MenuetOS.asm b/skins/_old/MenuetOS/5.MenuetOS/MenuetOS.asm
similarity index 94%
rename from skins/_old/MenuetOS/5.MenuetOS/1/MenuetOS.asm
rename to skins/_old/MenuetOS/5.MenuetOS/MenuetOS.asm
index 81f277995d..2290121cda 100644
--- a/skins/_old/MenuetOS/5.MenuetOS/1/MenuetOS.asm
+++ b/skins/_old/MenuetOS/5.MenuetOS/MenuetOS.asm
@@ -1,4 +1,4 @@
-include 'skin.inc'
+include '../../../skin.inc'
 
 SKIN_PARAMS \
   height	  = bmp_base.height,\	  ; skin height
diff --git a/skins/_old/MenuetOS/5.MenuetOS/Tupfile.lua b/skins/_old/MenuetOS/5.MenuetOS/Tupfile.lua
new file mode 100644
index 0000000000..9de804fc2c
--- /dev/null
+++ b/skins/_old/MenuetOS/5.MenuetOS/Tupfile.lua
@@ -0,0 +1,2 @@
+if tup.getconfig("NO_FASM") ~= "" then return end
+tup.rule("MenuetOS.asm", 'fasm "%f" "%o" ' .. tup.getconfig("KPACK_CMD"), "MenuetOS 5.skn")
diff --git a/skins/_old/MenuetOS/5.MenuetOS/1/active/base.bmp b/skins/_old/MenuetOS/5.MenuetOS/active/base.bmp
similarity index 100%
rename from skins/_old/MenuetOS/5.MenuetOS/1/active/base.bmp
rename to skins/_old/MenuetOS/5.MenuetOS/active/base.bmp
diff --git a/skins/_old/MenuetOS/5.MenuetOS/1/active/left.bmp b/skins/_old/MenuetOS/5.MenuetOS/active/left.bmp
similarity index 100%
rename from skins/_old/MenuetOS/5.MenuetOS/1/active/left.bmp
rename to skins/_old/MenuetOS/5.MenuetOS/active/left.bmp
diff --git a/skins/_old/MenuetOS/5.MenuetOS/1/active/oper.bmp b/skins/_old/MenuetOS/5.MenuetOS/active/oper.bmp
similarity index 100%
rename from skins/_old/MenuetOS/5.MenuetOS/1/active/oper.bmp
rename to skins/_old/MenuetOS/5.MenuetOS/active/oper.bmp
diff --git a/skins/_old/MenuetOS/5.MenuetOS/1/inactive/base.bmp b/skins/_old/MenuetOS/5.MenuetOS/inactive/base.bmp
similarity index 100%
rename from skins/_old/MenuetOS/5.MenuetOS/1/inactive/base.bmp
rename to skins/_old/MenuetOS/5.MenuetOS/inactive/base.bmp
diff --git a/skins/_old/MenuetOS/5.MenuetOS/1/inactive/left.bmp b/skins/_old/MenuetOS/5.MenuetOS/inactive/left.bmp
similarity index 100%
rename from skins/_old/MenuetOS/5.MenuetOS/1/inactive/left.bmp
rename to skins/_old/MenuetOS/5.MenuetOS/inactive/left.bmp
diff --git a/skins/_old/MenuetOS/5.MenuetOS/1/inactive/oper.bmp b/skins/_old/MenuetOS/5.MenuetOS/inactive/oper.bmp
similarity index 100%
rename from skins/_old/MenuetOS/5.MenuetOS/1/inactive/oper.bmp
rename to skins/_old/MenuetOS/5.MenuetOS/inactive/oper.bmp
diff --git a/skins/skinlist.lua b/skins/skinlist.lua
index 5cf6522dcc..be382177c0 100644
--- a/skins/skinlist.lua
+++ b/skins/skinlist.lua
@@ -86,10 +86,11 @@ skinlist = {
 "_old/lightskin/lightskin.skn",
 "_old/macos_l/macos_l.skn",
 "_old/mage-scroll/mage-scroll.skn",
-"_old/MenuetOS/2.MenuetOS/1/2.MenuetOS.1.skn",
-"_old/MenuetOS/3.MenuetOS/1/3.MenuetOS.1.skn",
-"_old/MenuetOS/4.MenuetOS/1/4.MenuetOS.1.skn",
-"_old/MenuetOS/5.MenuetOS/1/5.MenuetOS.1.skn",
+"_old/MenuetOS/1.MenuetOS/MenuetOS 1.skn",
+"_old/MenuetOS/2.MenuetOS/MenuetOS 2.skn",
+"_old/MenuetOS/3.MenuetOS/MenuetOS 3.skn",
+"_old/MenuetOS/4.MenuetOS/MenuetOS 4.skn",
+"_old/MenuetOS/5.MenuetOS/MenuetOS 5.skn",
 "_old/MetalColor/MCBlue/MCBlue.skn",
 "_old/MetalColor/MCRed/MCRed.skn",
 "_old/MetalGearArrows/1.MetalGearArrows/1.MetalGearArrows.skn",