diff --git a/README.md b/README.md
index 7c51fbe..0d0cb98 100644
--- a/README.md
+++ b/README.md
@@ -58,7 +58,7 @@
 
 1. **Доступные для скачивания через [Updater](https://github.com/Ultra-NX/Ultra/wiki/Tuner-RU#Updater)**
    * Homebrews:
-      * [Linkalho](https://github.com/rdmrocha/linkalho) - Программа для привязки аккаунта.
+      * [Linkalho](https://www.gamebrew.org/wiki/Linkalho_Switch) - Программа для привязки аккаунта.
       * [Tinfoil](https://tinfoil.io) - Установщик и каталог игр.
       * [HB App Store](https://github.com/fortheusers/hb-appstore) - Бесплатный магазин для скачивания Homebrew приложений.
       * [ThemezerNX](https://github.com/suchmememanyskill/themezer-nx) + [NXThemes Installer](https://github.com/exelix11/SwitchThemeInjector) + [Theme Patches](https://github.com/exelix11/theme-patches) - Поиск и установка тем на свитч.
diff --git a/README_ENG.md b/README_ENG.md
index 6122f84..57ef4d1 100644
--- a/README_ENG.md
+++ b/README_ENG.md
@@ -57,7 +57,7 @@
 
 1. **Available for download via [Updater](https://github.com/Ultra-NX/Ultra/wiki/Tuner-RU#Updater)**
    * Homebrews:
-      * [Linkalho](https://github.com/rdmrocha/linkalho) - Account linking program.
+      * [Linkalho](https://www.gamebrew.org/wiki/Linkalho_Switch) - Account linking program.
       * [Tinfoil](https://tinfoil.io) - Installer and game store.
       * [HB App Store](https://github.com/fortheusers/hb-appstore) - A free store for downloading Homebrew apps.
       * [ThemezerNX](https://github.com/suchmememanyskill/themezer-nx) + [NXThemes Installer](https://github.com/exelix11/SwitchThemeInjector) + [Theme Patches](https://github.com/exelix11/theme-patches) - Searching and installing themes on Switch.
diff --git a/atmosphere/kips/loader.kip b/atmosphere/kips/loader.kip
index de6a419..97ce8c6 100644
Binary files a/atmosphere/kips/loader.kip and b/atmosphere/kips/loader.kip differ
diff --git a/bootloader/ini/sys_sm.ini b/bootloader/ini/more_configs.ini
similarity index 57%
rename from bootloader/ini/sys_sm.ini
rename to bootloader/ini/more_configs.ini
index 811726b..0c8f07a 100644
--- a/bootloader/ini/sys_sm.ini
+++ b/bootloader/ini/more_configs.ini
@@ -1,5 +1,14 @@
 
-[Semi Stock SM]
+[Semi Stock]
+fss0=atmosphere/package3
+emummc_force_disable=1
+cal0blank=0
+kip1=atmosphere/kips/*
+logopath=bootloader/res/bootscreen.bmp
+icon=bootloader/res/sys_cfw.bmp
+{}
+
+[Semi Safe]
 fss0=atmosphere/package3
 emummc_force_disable=1
 cal0blank=0
diff --git a/bootloader/ini/sys_cfw.ini b/bootloader/ini/sys_cfw.ini
deleted file mode 100644
index a892991..0000000
--- a/bootloader/ini/sys_cfw.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-
-[Atmosphere OC]
-fss0=atmosphere/package3
-cal0blank=1
-kip1=atmosphere/kips/*
-logopath=bootloader/res/bootscreen.bmp
-icon=bootloader/res/emu_cfw.bmp
-{}
-
-[Semi Stock]
-fss0=atmosphere/package3
-emummc_force_disable=1
-cal0blank=0
-kip1=atmosphere/kips/*
-logopath=bootloader/res/bootscreen.bmp
-icon=bootloader/res/sys_cfw.bmp
-{}
diff --git a/switch/.overlays/ovlmenu.ovl b/switch/.overlays/ovlmenu.ovl
index f92e086..2636d9b 100644
Binary files a/switch/.overlays/ovlmenu.ovl and b/switch/.overlays/ovlmenu.ovl differ
diff --git a/switch/.packages/boot_package.ini b/switch/.packages/boot_package.ini
index 47a69d3..7941edd 100644
--- a/switch/.packages/boot_package.ini
+++ b/switch/.packages/boot_package.ini
@@ -1,4 +1,4 @@
-[clean]
+[boot]
 clear hex_sum_cache
 
 del '/atmosphere/config_templates/'
@@ -22,6 +22,8 @@ del '/atmosphere/fatal_reports/'
 
 
 del '/bootloader/ini/fullstock.ini'
+del '/bootloader/ini/sys_cfw.ini'
+del '/bootloader/ini/sys_sm.ini'
 del '/bootloader/res/atmosphere.bmp'
 del '/bootloader/res/icon_payload.bmp'
 del '/bootloader/res/icon_switch.bmp'
diff --git a/switch/.packages/package.ini b/switch/.packages/package.ini
index c54472f..a3ada29 100644
--- a/switch/.packages/package.ini
+++ b/switch/.packages/package.ini
@@ -1,5 +1,16 @@
 [Reboot]
 reboot
 
+[*Options]
+[*Main Launch]
+ini_file_source /bootloader/hekate_ipl.ini
+filter config
+reboot boot '{ini_file_source(*)}'
+
+[*More Configs]
+ini_file_source /bootloader/ini/more_configs.ini
+filter config
+reboot boot '{ini_file_source(*)}'
+
 [Shutdown]
-shutdown
\ No newline at end of file
+shutdown
diff --git a/switch/DBI/dbi.config b/switch/DBI/dbi.config
index 3a1ff68..3b50760 100644
--- a/switch/DBI/dbi.config
+++ b/switch/DBI/dbi.config
@@ -193,4 +193,3 @@ DBILogs=sdmc:/switch/DBI/logs
 
 [Disabled titles to check for updates]
 010072400E04A000; Pokemon Cafe Mix
-