diff --git a/data/Tupfile.lua b/data/Tupfile.lua
index 6bd2b7a3b..c843dbf94 100644
--- a/data/Tupfile.lua
+++ b/data/Tupfile.lua
@@ -80,7 +80,7 @@ if build_type == "ru_RU" then tup.append_table(img_files, {
  {"GAMES/DESCENT", build_type .. "/games/descent"},
  {"SETTINGS/.shell", SRC_PROGS .. "/system/shell/bin/rus/.shell"},
  {"SETTINGS/GAMES.INI", "ru_RU/settings/games.ini"},
- {"SETTINGS/MYKEY.INI", SRC_PROGS .. "/system/MyKey/trunk/mykey.ini"},
+ {"SETTINGS/MYKEY.INI", SRC_PROGS .. "/system/MyKey/mykey.ini"},
  {"SETTINGS/SYSPANEL.INI", "ru_RU/settings/syspanel.ini"},
 }) elseif build_type == "en_US" then tup.append_table(img_files, {
  {"WELCOME.HTM", VAR_DATA .. "/" .. build_type .. "/welcome.htm.kpack"},
@@ -90,7 +90,7 @@ if build_type == "ru_RU" then tup.append_table(img_files, {
  {"GAMES/DESCENT", "common/games/descent"},
  {"SETTINGS/.shell", SRC_PROGS .. "/system/shell/bin/eng/.shell"},
  {"SETTINGS/GAMES.INI", "common/settings/games.ini"},
- {"SETTINGS/MYKEY.INI", SRC_PROGS .. "/system/MyKey/trunk/mykey.ini"},
+ {"SETTINGS/MYKEY.INI", SRC_PROGS .. "/system/MyKey/mykey.ini"},
  {"SETTINGS/SYSPANEL.INI", "common/settings/syspanel.ini"},
 }) elseif build_type == "es_ES" then tup.append_table(img_files, {
  {"EXAMPLE.ASM", SRC_PROGS .. "/develop/examples/example/trunk/example.asm"},
@@ -99,7 +99,7 @@ if build_type == "ru_RU" then tup.append_table(img_files, {
  {"GAMES/DESCENT", "common/games/descent"},
  {"SETTINGS/.shell", SRC_PROGS .. "/system/shell/bin/eng/.shell"},
  {"SETTINGS/GAMES.INI", "common/settings/games.ini"},
- {"SETTINGS/MYKEY.INI", SRC_PROGS .. "/system/MyKey/trunk/mykey.ini"},
+ {"SETTINGS/MYKEY.INI", SRC_PROGS .. "/system/MyKey/mykey.ini"},
  {"SETTINGS/SYSPANEL.INI", "common/settings/syspanel.ini"},
 }) elseif build_type == "it_IT" then tup.append_table(img_files, {
  {"EXAMPLE.ASM", SRC_PROGS .. "/develop/examples/example/trunk/example.asm"},
@@ -107,7 +107,7 @@ if build_type == "ru_RU" then tup.append_table(img_files, {
  {"File Managers/KFAR.INI", "common/File Managers/kfar.ini"},
  {"GAMES/DESCENT", "common/games/descent"},
  {"SETTINGS/.shell", SRC_PROGS .. "/system/shell/bin/eng/.shell"},
- {"SETTINGS/MYKEY.INI", SRC_PROGS .. "/system/MyKey/trunk/mykey_it.ini"},
+ {"SETTINGS/MYKEY.INI", SRC_PROGS .. "/system/MyKey/mykey_it.ini"},
  {"SETTINGS/GAMES.INI", "common/settings/games.ini"},
  {"SETTINGS/SYSPANEL.INI", "common/settings/syspanel.ini"},
 }) else tup.append_table(img_files, {
@@ -117,7 +117,7 @@ if build_type == "ru_RU" then tup.append_table(img_files, {
  {"GAMES/DESCENT", "common/games/descent"},
  {"SETTINGS/.shell", SRC_PROGS .. "/system/shell/bin/eng/.shell"},
  {"SETTINGS/GAMES.INI", "common/settings/games.ini"},
- {"SETTINGS/MYKEY.INI", SRC_PROGS .. "/system/MyKey/trunk/mykey.ini"},
+ {"SETTINGS/MYKEY.INI", SRC_PROGS .. "/system/MyKey/mykey.ini"},
  {"SETTINGS/SYSPANEL.INI", "common/settings/syspanel.ini"},
 }) end
 
@@ -432,7 +432,7 @@ tup.append_table(img_files, {
  {"MGB", VAR_PROGS .. "/testing/mgb/trunk/mgb"},
  {"MOUSEMUL", VAR_PROGS .. "/system/mousemul/mousemul"},
  {"MADMOUSE", VAR_PROGS .. "/other/madmouse/madmouse"},
- {"MYKEY", VAR_PROGS .. "/system/MyKey/trunk/MyKey"},
+ {"MYKEY", VAR_PROGS .. "/system/MyKey/MyKey"},
  {"PCIDEV", VAR_PROGS .. "/testing/pcidev/trunk/PCIDEV"},
  {"RDSAVE", VAR_PROGS .. "/system/rdsave/trunk/rdsave"},
  {"RTFREAD", VAR_PROGS .. "/other/rtfread/trunk/rtfread"},
diff --git a/programs/system/MyKey/trunk/ASPAPI.INC b/programs/system/MyKey/ASPAPI.INC
similarity index 100%
rename from programs/system/MyKey/trunk/ASPAPI.INC
rename to programs/system/MyKey/ASPAPI.INC
diff --git a/programs/system/MyKey/trunk/MyKey.asm b/programs/system/MyKey/MyKey.asm
similarity index 99%
rename from programs/system/MyKey/trunk/MyKey.asm
rename to programs/system/MyKey/MyKey.asm
index 809c091cb..b4be2d9cc 100644
--- a/programs/system/MyKey/trunk/MyKey.asm
+++ b/programs/system/MyKey/MyKey.asm
@@ -1,4 +1,6 @@
+; SPDX-License-Identifier: NOASSERTION
 ;
+
 ;   MyKey. Version 0.2.
 ;
 ;   Author:         Asper
@@ -23,13 +25,13 @@ include 'lang.inc' ; Language support for locales: it_IT, en_US.
 
 include 'string.inc'
 ;include 'macros.inc'
-include '../../../macros.inc'
+include '../../macros.inc'
 include 'ASPAPI.INC'
 ;include 'editbox_ex.mac'
-include '../../../develop/libraries/box_lib/trunk/box_lib.mac'
+include '../../develop/libraries/box_lib/trunk/box_lib.mac'
 ;include 'load_lib.mac'
-include '../../../develop/libraries/box_lib/load_lib.mac'
-include '../../../dll.inc'
+include '../../develop/libraries/box_lib/load_lib.mac'
+include '../../dll.inc'
 
 include 'debug.inc'
 DEBUG	 equ 0;1
diff --git a/programs/system/MyKey/trunk/ReadMe.txt b/programs/system/MyKey/ReadMe.txt
similarity index 100%
rename from programs/system/MyKey/trunk/ReadMe.txt
rename to programs/system/MyKey/ReadMe.txt
diff --git a/programs/system/MyKey/trunk/Tupfile.lua b/programs/system/MyKey/Tupfile.lua
similarity index 79%
rename from programs/system/MyKey/trunk/Tupfile.lua
rename to programs/system/MyKey/Tupfile.lua
index 3b1a5cc5c..f911b2dbb 100644
--- a/programs/system/MyKey/trunk/Tupfile.lua
+++ b/programs/system/MyKey/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/MyKey/trunk/debug.inc b/programs/system/MyKey/debug.inc
similarity index 100%
rename from programs/system/MyKey/trunk/debug.inc
rename to programs/system/MyKey/debug.inc
diff --git a/programs/system/MyKey/trunk/makefile b/programs/system/MyKey/makefile
similarity index 100%
rename from programs/system/MyKey/trunk/makefile
rename to programs/system/MyKey/makefile
diff --git a/programs/system/MyKey/trunk/mykey.ini b/programs/system/MyKey/mykey.ini
similarity index 100%
rename from programs/system/MyKey/trunk/mykey.ini
rename to programs/system/MyKey/mykey.ini
diff --git a/programs/system/MyKey/trunk/mykey_it.ini b/programs/system/MyKey/mykey_it.ini
similarity index 100%
rename from programs/system/MyKey/trunk/mykey_it.ini
rename to programs/system/MyKey/mykey_it.ini
diff --git a/programs/system/MyKey/trunk/string.inc b/programs/system/MyKey/string.inc
similarity index 100%
rename from programs/system/MyKey/trunk/string.inc
rename to programs/system/MyKey/string.inc