diff --git a/data/Tupfile.lua b/data/Tupfile.lua
index 2e3034319..0e94c6fab 100644
--- a/data/Tupfile.lua
+++ b/data/Tupfile.lua
@@ -411,7 +411,7 @@ tup.append_table(img_files, {
  {"APM", VAR_PROGS .. "/system/apm/apm"},
  {"CALC", VAR_PROGS .. "/other/calc/calc"},
  {"CALCPLUS", VAR_PROGS .. "/other/calcplus/calcplus"},
- {"CALENDAR", VAR_PROGS .. "/system/calendar/trunk/calendar"},
+ {"CALENDAR", VAR_PROGS .. "/system/calendar/calendar"},
  {"COLRDIAL", VAR_PROGS .. "/system/colrdial/color_dialog"},
  {"CROPFLAT", VAR_PROGS .. "/system/cropflat/cropflat"},
  {"CPU", VAR_PROGS .. "/system/cpu/trunk/cpu"},
diff --git a/programs/build_all.bat b/programs/build_all.bat
index 561aac17b..805878597 100644
--- a/programs/build_all.bat
+++ b/programs/build_all.bat
@@ -56,7 +56,7 @@ for %%i in (%BIN% %BIN%\demos %BIN%\develop %BIN%\lib %BIN%\games %BIN%\network
 echo *
 echo Building system
 echo *
-fasm system\calendar\trunk\calendar.asm %BIN%\calendar
+fasm system\calendar\calendar.asm %BIN%\calendar
 fasm system\board\board.asm %BIN%\develop\board
 fasm system\commouse\trunk\commouse.asm %BIN%\commouse
 fasm system\cpu\trunk\cpu.asm %BIN%\cpu
diff --git a/programs/system/calendar/trunk/Tupfile.lua b/programs/system/calendar/Tupfile.lua
similarity index 79%
rename from programs/system/calendar/trunk/Tupfile.lua
rename to programs/system/calendar/Tupfile.lua
index 4e3fdcb90..0a9d51b79 100644
--- a/programs/system/calendar/trunk/Tupfile.lua
+++ b/programs/system/calendar/Tupfile.lua
@@ -1,5 +1,5 @@
 if tup.getconfig("NO_FASM") ~= "" then return end
-HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../.." or tup.getconfig("HELPERDIR")
+HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../.." or tup.getconfig("HELPERDIR")
 tup.include(HELPERDIR .. "/use_fasm.lua")
 add_include(tup.getvariantdir())
 
diff --git a/programs/system/calendar/trunk/build_de.bat b/programs/system/calendar/build_de.bat
similarity index 100%
rename from programs/system/calendar/trunk/build_de.bat
rename to programs/system/calendar/build_de.bat
diff --git a/programs/system/calendar/trunk/build_en.bat b/programs/system/calendar/build_en.bat
similarity index 100%
rename from programs/system/calendar/trunk/build_en.bat
rename to programs/system/calendar/build_en.bat
diff --git a/programs/system/calendar/trunk/build_et.bat b/programs/system/calendar/build_et.bat
similarity index 100%
rename from programs/system/calendar/trunk/build_et.bat
rename to programs/system/calendar/build_et.bat
diff --git a/programs/system/calendar/trunk/build_ru.bat b/programs/system/calendar/build_ru.bat
similarity index 100%
rename from programs/system/calendar/trunk/build_ru.bat
rename to programs/system/calendar/build_ru.bat
diff --git a/programs/system/calendar/trunk/calendar.asm b/programs/system/calendar/calendar.asm
similarity index 98%
rename from programs/system/calendar/trunk/calendar.asm
rename to programs/system/calendar/calendar.asm
index a35a57744..f5422b138 100644
--- a/programs/system/calendar/trunk/calendar.asm
+++ b/programs/system/calendar/calendar.asm
@@ -1,8 +1,11 @@
+; SPDX-License-Identifier: NOASSERTION
+;
+
 ; Calendar for KolibriOS
 ;
 ; v1.5 - time redesign by Heavyiron
 ; v1.2 - v1.55 - new design and functionality by Leency
-; v1.1 - add change time support by DedOK 
+; v1.1 - add change time support by DedOK
 ; v1.0 - written in pure assembler by Ivushkin Andrey aka Willow
 ; also - diamond, spraid, fedesco
 ;
@@ -21,7 +24,7 @@ use32
   dd	 0x1000
   dd	 0x0
   dd	 0x0
-include '..\..\..\macros.inc'
+include '..\..\macros.inc'
 include 'lang.inc'
 include 'data.inc'
 
@@ -126,7 +129,7 @@ macro DrawRect color1,color2,color3,color4 ; pizdec... but optimized well
 	add ebx,1 shl 16
 	sub ecx,1 shl 16
 	sub bx,2
-	mcall 
+	mcall
 }
 
 
@@ -361,7 +364,7 @@ day_bounds db -1,0,7,0,-7,0,1,0 ; left,down,up,right
     je	 year_dec
     cmp  ah,179
     je	 year_inc
-	
+
     mov  ebx,10
     cmp  ah,9
     je	 key.tab
@@ -401,8 +404,8 @@ day_bounds db -1,0,7,0,-7,0,1,0 ; left,down,up,right
     jmp  upd
 
 update_clock:
-    mcall 22,0x00000000 
-    call draw_clock	
+    mcall 22,0x00000000
+    call draw_clock
     jmp  still
 
 reset:
@@ -522,7 +525,7 @@ panel_top:
 	mov ebx, eax
 	sub eax, WIN_W
 	shl ebx, 16
-	add ebx, WIN_W	
+	add ebx, WIN_W
     mcall 0,,,COL_WINDOW_BG, ,title ; define window
 	mcall 12,2
 	GetSkinHeight
@@ -532,7 +535,7 @@ panel_top:
 	mcall 13,B_WBAR_X, ,COL_TOOLBAR_BG ; draw toolbar background
 	mcall 13,B_WBAR_X,BT_WBAR_Y,COL_TOOLBAR_BG ; draw toolbar background
 	mcall 13,0*65536+B_WBAR_X,84*65536+199,0xE7E7E7
-	
+
 draw_window:
     call draw_clock
     call draw_week
diff --git a/programs/system/calendar/trunk/calendar.txt b/programs/system/calendar/calendar.txt
similarity index 100%
rename from programs/system/calendar/trunk/calendar.txt
rename to programs/system/calendar/calendar.txt
diff --git a/programs/system/calendar/trunk/data.inc b/programs/system/calendar/data.inc
similarity index 100%
rename from programs/system/calendar/trunk/data.inc
rename to programs/system/calendar/data.inc
diff --git a/programs/system/calendar/trunk/makefile b/programs/system/calendar/makefile
similarity index 100%
rename from programs/system/calendar/trunk/makefile
rename to programs/system/calendar/makefile