diff --git a/applications/main/archive/helpers/archive_files.h b/applications/main/archive/helpers/archive_files.h
index a9c33c9f6..6eb3dda50 100644
--- a/applications/main/archive/helpers/archive_files.h
+++ b/applications/main/archive/helpers/archive_files.h
@@ -6,7 +6,7 @@
 #include <m-string.h>
 #include <storage/storage.h>
 #include "toolbox/path.h"
-#include "../../../settings/xtreme_settings/xtreme_settings.h"
+#include "xtreme/settings.h"
 
 #define FAP_MANIFEST_MAX_ICON_SIZE 32
 
diff --git a/applications/main/bad_usb/scenes/bad_usb_scene_error.c b/applications/main/bad_usb/scenes/bad_usb_scene_error.c
index d32eee382..5cef1b7ef 100644
--- a/applications/main/bad_usb/scenes/bad_usb_scene_error.c
+++ b/applications/main/bad_usb/scenes/bad_usb_scene_error.c
@@ -1,5 +1,5 @@
 #include "../bad_usb_app_i.h"
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"
 
 typedef enum {
     BadUsbCustomEventErrorBack,
diff --git a/applications/main/bad_usb/views/bad_usb_view.c b/applications/main/bad_usb/views/bad_usb_view.c
index 51bed3835..88a225271 100644
--- a/applications/main/bad_usb/views/bad_usb_view.c
+++ b/applications/main/bad_usb/views/bad_usb_view.c
@@ -3,7 +3,7 @@
 #include <toolbox/path.h>
 #include <gui/elements.h>
 #include <assets_icons.h>
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"
 
 #define MAX_NAME_LEN 64
 
diff --git a/applications/main/ibutton/scenes/ibutton_scene_delete_success.c b/applications/main/ibutton/scenes/ibutton_scene_delete_success.c
index 5f12d49d7..e2b7e3837 100644
--- a/applications/main/ibutton/scenes/ibutton_scene_delete_success.c
+++ b/applications/main/ibutton/scenes/ibutton_scene_delete_success.c
@@ -1,5 +1,5 @@
 #include "../ibutton_i.h"
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"
 
 static void ibutton_scene_delete_success_popup_callback(void* context) {
     iButton* ibutton = context;
diff --git a/applications/main/ibutton/scenes/ibutton_scene_read.c b/applications/main/ibutton/scenes/ibutton_scene_read.c
index 718cb8bfc..1ccd2562b 100644
--- a/applications/main/ibutton/scenes/ibutton_scene_read.c
+++ b/applications/main/ibutton/scenes/ibutton_scene_read.c
@@ -1,6 +1,6 @@
 #include "../ibutton_i.h"
 #include <dolphin/dolphin.h>
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"
 
 static void ibutton_scene_read_callback(void* context) {
     iButton* ibutton = context;
diff --git a/applications/main/ibutton/scenes/ibutton_scene_save_success.c b/applications/main/ibutton/scenes/ibutton_scene_save_success.c
index ee49b432c..03e88e047 100644
--- a/applications/main/ibutton/scenes/ibutton_scene_save_success.c
+++ b/applications/main/ibutton/scenes/ibutton_scene_save_success.c
@@ -1,5 +1,5 @@
 #include "../ibutton_i.h"
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"
 
 static void ibutton_scene_save_success_popup_callback(void* context) {
     iButton* ibutton = context;
diff --git a/applications/main/ibutton/scenes/ibutton_scene_write_success.c b/applications/main/ibutton/scenes/ibutton_scene_write_success.c
index e77f3f049..3f565e274 100644
--- a/applications/main/ibutton/scenes/ibutton_scene_write_success.c
+++ b/applications/main/ibutton/scenes/ibutton_scene_write_success.c
@@ -1,5 +1,5 @@
 #include "../ibutton_i.h"
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"
 
 static void ibutton_scene_write_success_popup_callback(void* context) {
     iButton* ibutton = context;
diff --git a/applications/main/infrared/scenes/infrared_scene_edit_rename_done.c b/applications/main/infrared/scenes/infrared_scene_edit_rename_done.c
index 3d7a9d081..36224f418 100644
--- a/applications/main/infrared/scenes/infrared_scene_edit_rename_done.c
+++ b/applications/main/infrared/scenes/infrared_scene_edit_rename_done.c
@@ -1,5 +1,5 @@
 #include "../infrared_i.h"
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"
 
 void infrared_scene_edit_rename_done_on_enter(void* context) {
     Infrared* infrared = context;
diff --git a/applications/main/infrared/scenes/infrared_scene_learn_done.c b/applications/main/infrared/scenes/infrared_scene_learn_done.c
index dce74db54..0d2522946 100644
--- a/applications/main/infrared/scenes/infrared_scene_learn_done.c
+++ b/applications/main/infrared/scenes/infrared_scene_learn_done.c
@@ -1,5 +1,5 @@
 #include "../infrared_i.h"
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"
 
 void infrared_scene_learn_done_on_enter(void* context) {
     Infrared* infrared = context;
diff --git a/applications/main/infrared/scenes/infrared_scene_learn_success.c b/applications/main/infrared/scenes/infrared_scene_learn_success.c
index 3340a6342..bbc84ba3b 100644
--- a/applications/main/infrared/scenes/infrared_scene_learn_success.c
+++ b/applications/main/infrared/scenes/infrared_scene_learn_success.c
@@ -1,5 +1,5 @@
 #include "../infrared_i.h"
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"
 
 static void
     infrared_scene_learn_success_dialog_result_callback(DialogExResult result, void* context) {
diff --git a/applications/main/lfrfid/scenes/lfrfid_scene_clear_t5577.c b/applications/main/lfrfid/scenes/lfrfid_scene_clear_t5577.c
index 7d9d50765..888288a31 100644
--- a/applications/main/lfrfid/scenes/lfrfid_scene_clear_t5577.c
+++ b/applications/main/lfrfid/scenes/lfrfid_scene_clear_t5577.c
@@ -1,6 +1,6 @@
 #include "../lfrfid_i.h"
 #include "../helpers/rfid_writer.h"
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"
 
 static void writer_initialize(T55xxTiming* t55xxtiming) {
     t55xxtiming->wait_time = 400;
diff --git a/applications/main/lfrfid/scenes/lfrfid_scene_delete_success.c b/applications/main/lfrfid/scenes/lfrfid_scene_delete_success.c
index 873382b6c..991748515 100644
--- a/applications/main/lfrfid/scenes/lfrfid_scene_delete_success.c
+++ b/applications/main/lfrfid/scenes/lfrfid_scene_delete_success.c
@@ -1,5 +1,5 @@
 #include "../lfrfid_i.h"
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"
 
 void lfrfid_scene_delete_success_on_enter(void* context) {
     LfRfid* app = context;
diff --git a/applications/main/lfrfid/scenes/lfrfid_scene_emulate.c b/applications/main/lfrfid/scenes/lfrfid_scene_emulate.c
index 9132f4a91..eff92dc37 100644
--- a/applications/main/lfrfid/scenes/lfrfid_scene_emulate.c
+++ b/applications/main/lfrfid/scenes/lfrfid_scene_emulate.c
@@ -1,5 +1,5 @@
 #include "../lfrfid_i.h"
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"
 
 void lfrfid_scene_emulate_on_enter(void* context) {
     LfRfid* app = context;
diff --git a/applications/main/lfrfid/scenes/lfrfid_scene_raw_read.c b/applications/main/lfrfid/scenes/lfrfid_scene_raw_read.c
index 73e1dbbb9..3213297d7 100644
--- a/applications/main/lfrfid/scenes/lfrfid_scene_raw_read.c
+++ b/applications/main/lfrfid/scenes/lfrfid_scene_raw_read.c
@@ -1,5 +1,5 @@
 #include "../lfrfid_i.h"
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"
 
 #define RAW_READ_TIME 5000
 
diff --git a/applications/main/lfrfid/scenes/lfrfid_scene_rpc.c b/applications/main/lfrfid/scenes/lfrfid_scene_rpc.c
index c11dd1109..181346e9d 100644
--- a/applications/main/lfrfid/scenes/lfrfid_scene_rpc.c
+++ b/applications/main/lfrfid/scenes/lfrfid_scene_rpc.c
@@ -1,5 +1,5 @@
 #include "../lfrfid_i.h"
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"
 
 void lfrfid_scene_rpc_on_enter(void* context) {
     LfRfid* app = context;
diff --git a/applications/main/lfrfid/scenes/lfrfid_scene_save_success.c b/applications/main/lfrfid/scenes/lfrfid_scene_save_success.c
index 4003ee405..738e90bfd 100644
--- a/applications/main/lfrfid/scenes/lfrfid_scene_save_success.c
+++ b/applications/main/lfrfid/scenes/lfrfid_scene_save_success.c
@@ -1,5 +1,5 @@
 #include "../lfrfid_i.h"
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"
 
 void lfrfid_scene_save_success_on_enter(void* context) {
     LfRfid* app = context;
diff --git a/applications/main/lfrfid/scenes/lfrfid_scene_write.c b/applications/main/lfrfid/scenes/lfrfid_scene_write.c
index 9cae43c96..0f74ece45 100644
--- a/applications/main/lfrfid/scenes/lfrfid_scene_write.c
+++ b/applications/main/lfrfid/scenes/lfrfid_scene_write.c
@@ -1,5 +1,5 @@
 #include "../lfrfid_i.h"
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"
 
 static void lfrfid_write_callback(LFRFIDWorkerWriteResult result, void* context) {
     LfRfid* app = context;
diff --git a/applications/main/lfrfid/scenes/lfrfid_scene_write_success.c b/applications/main/lfrfid/scenes/lfrfid_scene_write_success.c
index 48d046227..5eeb88616 100644
--- a/applications/main/lfrfid/scenes/lfrfid_scene_write_success.c
+++ b/applications/main/lfrfid/scenes/lfrfid_scene_write_success.c
@@ -1,5 +1,5 @@
 #include "../lfrfid_i.h"
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"
 
 void lfrfid_scene_write_success_on_enter(void* context) {
     LfRfid* app = context;
diff --git a/applications/main/nfc/scenes/nfc_scene_delete_success.c b/applications/main/nfc/scenes/nfc_scene_delete_success.c
index a732f5384..4994dd8d4 100644
--- a/applications/main/nfc/scenes/nfc_scene_delete_success.c
+++ b/applications/main/nfc/scenes/nfc_scene_delete_success.c
@@ -1,5 +1,5 @@
 #include "../nfc_i.h"
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"
 
 void nfc_scene_delete_success_popup_callback(void* context) {
     Nfc* nfc = context;
diff --git a/applications/main/nfc/scenes/nfc_scene_emulate_nfcv.c b/applications/main/nfc/scenes/nfc_scene_emulate_nfcv.c
index f423efc38..0e9f6b428 100644
--- a/applications/main/nfc/scenes/nfc_scene_emulate_nfcv.c
+++ b/applications/main/nfc/scenes/nfc_scene_emulate_nfcv.c
@@ -1,5 +1,5 @@
 #include "../nfc_i.h"
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"
 
 #define NFC_SCENE_EMULATE_NFCV_LOG_SIZE_MAX (100)
 
diff --git a/applications/main/nfc/scenes/nfc_scene_emulate_uid.c b/applications/main/nfc/scenes/nfc_scene_emulate_uid.c
index a583ac12d..7c016ceda 100644
--- a/applications/main/nfc/scenes/nfc_scene_emulate_uid.c
+++ b/applications/main/nfc/scenes/nfc_scene_emulate_uid.c
@@ -1,5 +1,5 @@
 #include "../nfc_i.h"
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"
 
 #define NFC_SCENE_EMULATE_UID_LOG_SIZE_MAX (200)
 
diff --git a/applications/main/nfc/scenes/nfc_scene_mf_classic_emulate.c b/applications/main/nfc/scenes/nfc_scene_mf_classic_emulate.c
index 1d2e1784f..7f5cac406 100644
--- a/applications/main/nfc/scenes/nfc_scene_mf_classic_emulate.c
+++ b/applications/main/nfc/scenes/nfc_scene_mf_classic_emulate.c
@@ -1,5 +1,5 @@
 #include "../nfc_i.h"
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"
 
 #define NFC_MF_CLASSIC_DATA_NOT_CHANGED (0UL)
 #define NFC_MF_CLASSIC_DATA_CHANGED (1UL)
diff --git a/applications/main/nfc/scenes/nfc_scene_mf_classic_update_success.c b/applications/main/nfc/scenes/nfc_scene_mf_classic_update_success.c
index 3c2c724bd..9544721b6 100644
--- a/applications/main/nfc/scenes/nfc_scene_mf_classic_update_success.c
+++ b/applications/main/nfc/scenes/nfc_scene_mf_classic_update_success.c
@@ -1,6 +1,6 @@
 #include "../nfc_i.h"
 #include <dolphin/dolphin.h>
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"
 
 void nfc_scene_mf_classic_update_success_popup_callback(void* context) {
     Nfc* nfc = context;
diff --git a/applications/main/nfc/scenes/nfc_scene_mf_classic_write_success.c b/applications/main/nfc/scenes/nfc_scene_mf_classic_write_success.c
index f16d2f733..e82dedeaf 100644
--- a/applications/main/nfc/scenes/nfc_scene_mf_classic_write_success.c
+++ b/applications/main/nfc/scenes/nfc_scene_mf_classic_write_success.c
@@ -1,6 +1,6 @@
 #include "../nfc_i.h"
 #include <dolphin/dolphin.h>
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"
 
 void nfc_scene_mf_classic_write_success_popup_callback(void* context) {
     Nfc* nfc = context;
diff --git a/applications/main/nfc/scenes/nfc_scene_mf_ultralight_emulate.c b/applications/main/nfc/scenes/nfc_scene_mf_ultralight_emulate.c
index d50ad5b84..77d831cf8 100644
--- a/applications/main/nfc/scenes/nfc_scene_mf_ultralight_emulate.c
+++ b/applications/main/nfc/scenes/nfc_scene_mf_ultralight_emulate.c
@@ -1,6 +1,6 @@
 #include "../nfc_i.h"
 #include <lib/nfc/protocols/mifare_ultralight.h>
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"
 
 #define NFC_SCENE_MF_ULTRALIGHT_EMULATE_LOG_SIZE_MAX (200)
 
diff --git a/applications/main/nfc/scenes/nfc_scene_restore_original.c b/applications/main/nfc/scenes/nfc_scene_restore_original.c
index 3794b438d..409785e26 100644
--- a/applications/main/nfc/scenes/nfc_scene_restore_original.c
+++ b/applications/main/nfc/scenes/nfc_scene_restore_original.c
@@ -1,5 +1,5 @@
 #include "../nfc_i.h"
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"
 
 void nfc_scene_restore_original_popup_callback(void* context) {
     Nfc* nfc = context;
diff --git a/applications/main/nfc/scenes/nfc_scene_rpc.c b/applications/main/nfc/scenes/nfc_scene_rpc.c
index e6b31fffa..6adacfda5 100644
--- a/applications/main/nfc/scenes/nfc_scene_rpc.c
+++ b/applications/main/nfc/scenes/nfc_scene_rpc.c
@@ -1,5 +1,5 @@
 #include "../nfc_i.h"
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"
 
 void nfc_scene_rpc_on_enter(void* context) {
     Nfc* nfc = context;
diff --git a/applications/main/nfc/scenes/nfc_scene_save_success.c b/applications/main/nfc/scenes/nfc_scene_save_success.c
index a9359c434..c5d8a6872 100644
--- a/applications/main/nfc/scenes/nfc_scene_save_success.c
+++ b/applications/main/nfc/scenes/nfc_scene_save_success.c
@@ -1,5 +1,5 @@
 #include "../nfc_i.h"
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"
 
 void nfc_scene_save_success_popup_callback(void* context) {
     Nfc* nfc = context;
diff --git a/applications/main/subghz/scenes/subghz_scene_delete_success.c b/applications/main/subghz/scenes/subghz_scene_delete_success.c
index de17d7a86..8e3ca5c78 100644
--- a/applications/main/subghz/scenes/subghz_scene_delete_success.c
+++ b/applications/main/subghz/scenes/subghz_scene_delete_success.c
@@ -1,6 +1,6 @@
 #include "../subghz_i.h"
 #include "../helpers/subghz_custom_event.h"
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"
 
 void subghz_scene_delete_success_popup_callback(void* context) {
     SubGhz* subghz = context;
diff --git a/applications/main/subghz/scenes/subghz_scene_rpc.c b/applications/main/subghz/scenes/subghz_scene_rpc.c
index 2a61d5dc5..609b4a71d 100644
--- a/applications/main/subghz/scenes/subghz_scene_rpc.c
+++ b/applications/main/subghz/scenes/subghz_scene_rpc.c
@@ -1,7 +1,7 @@
 #include "../subghz_i.h"
 #include <lib/subghz/protocols/keeloq.h>
 #include <lib/subghz/protocols/star_line.h>
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"
 
 typedef enum {
     SubGhzRpcStateIdle,
diff --git a/applications/main/subghz/scenes/subghz_scene_save_success.c b/applications/main/subghz/scenes/subghz_scene_save_success.c
index bf8ed0185..48804fe54 100644
--- a/applications/main/subghz/scenes/subghz_scene_save_success.c
+++ b/applications/main/subghz/scenes/subghz_scene_save_success.c
@@ -1,6 +1,6 @@
 #include "../subghz_i.h"
 #include "../helpers/subghz_custom_event.h"
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"
 
 void subghz_scene_save_success_popup_callback(void* context) {
     SubGhz* subghz = context;
diff --git a/applications/main/subghz/views/receiver.c b/applications/main/subghz/views/receiver.c
index 74bdbf5b0..fa3569245 100644
--- a/applications/main/subghz/views/receiver.c
+++ b/applications/main/subghz/views/receiver.c
@@ -7,7 +7,7 @@
 #include <assets_icons.h>
 #include <m-array.h>
 
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"
 
 #define FRAME_HEIGHT 12
 #define MAX_LEN_PX 111
diff --git a/applications/main/u2f/scenes/u2f_scene_error.c b/applications/main/u2f/scenes/u2f_scene_error.c
index 35a6ce1d9..d87b13063 100644
--- a/applications/main/u2f/scenes/u2f_scene_error.c
+++ b/applications/main/u2f/scenes/u2f_scene_error.c
@@ -1,5 +1,5 @@
 #include "../u2f_app_i.h"
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"
 
 static void u2f_scene_error_event_callback(GuiButtonType result, InputType type, void* context) {
     furi_assert(context);
diff --git a/applications/main/u2f/views/u2f_view.c b/applications/main/u2f/views/u2f_view.c
index fc1c5c4fa..7bd2cf94f 100644
--- a/applications/main/u2f/views/u2f_view.c
+++ b/applications/main/u2f/views/u2f_view.c
@@ -1,7 +1,7 @@
 #include "u2f_view.h"
 #include <gui/elements.h>
 #include <assets_icons.h>
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"
 
 struct U2fView {
     View* view;
diff --git a/applications/services/bt/bt_service/bt.c b/applications/services/bt/bt_service/bt.c
index 1ca6a2775..3f1577751 100644
--- a/applications/services/bt/bt_service/bt.c
+++ b/applications/services/bt/bt_service/bt.c
@@ -5,7 +5,7 @@
 #include <notification/notification_messages.h>
 #include <gui/elements.h>
 #include <assets_icons.h>
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"
 
 #define TAG "BtSrv"
 
diff --git a/applications/services/desktop/animations/animation_manager.c b/applications/services/desktop/animations/animation_manager.c
index 0808a3618..5b548c5bc 100644
--- a/applications/services/desktop/animations/animation_manager.c
+++ b/applications/services/desktop/animations/animation_manager.c
@@ -13,7 +13,7 @@
 #include "animation_storage.h"
 #include "animation_manager.h"
 
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"
 
 #define TAG "AnimationManager"
 
diff --git a/applications/services/desktop/animations/animation_storage.c b/applications/services/desktop/animations/animation_storage.c
index 4263dc0a4..4ac36762e 100644
--- a/applications/services/desktop/animations/animation_storage.c
+++ b/applications/services/desktop/animations/animation_storage.c
@@ -11,7 +11,7 @@
 #include "animation_storage_i.h"
 #include <assets_dolphin_internal.h>
 #include <assets_dolphin_blocking.h>
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"
 #define ANIMATION_META_FILE "meta.txt"
 #define BASE_ANIMATION_DIR EXT_PATH("dolphin")
 #define TAG "AnimationStorage"
diff --git a/applications/services/desktop/desktop.c b/applications/services/desktop/desktop.c
index b5b73668b..7840cd00a 100644
--- a/applications/services/desktop/desktop.c
+++ b/applications/services/desktop/desktop.c
@@ -17,8 +17,6 @@
 #include "helpers/pin_lock.h"
 #include "helpers/slideshow_filename.h"
 
-#include "../../settings/xtreme_settings/xtreme_assets.h"
-
 static void desktop_auto_lock_arm(Desktop*);
 static void desktop_auto_lock_inhibit(Desktop*);
 static void desktop_start_auto_lock_timer(Desktop*);
@@ -307,9 +305,6 @@ static bool desktop_check_file_flag(const char* flag_path) {
 int32_t desktop_srv(void* p) {
     UNUSED(p);
 
-    // TODO: find a (working) way to run this at startup without hooking desktop
-    XTREME_ASSETS_LOAD();
-
     if(furi_hal_rtc_get_boot_mode() != FuriHalRtcBootModeNormal) {
         FURI_LOG_W("Desktop", "Desktop load skipped. Device is in special startup mode.");
     } else {
diff --git a/applications/services/desktop/scenes/desktop_scene_fault.c b/applications/services/desktop/scenes/desktop_scene_fault.c
index c2149253c..b3801d78d 100644
--- a/applications/services/desktop/scenes/desktop_scene_fault.c
+++ b/applications/services/desktop/scenes/desktop_scene_fault.c
@@ -1,7 +1,7 @@
 #include <furi_hal.h>
 
 #include "../desktop_i.h"
-#include "../../../settings/xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"
 
 #define DesktopFaultEventExit 0x00FF00FF
 
diff --git a/applications/services/desktop/views/desktop_view_lock_menu.c b/applications/services/desktop/views/desktop_view_lock_menu.c
index 594676c28..9e02f2bdf 100644
--- a/applications/services/desktop/views/desktop_view_lock_menu.c
+++ b/applications/services/desktop/views/desktop_view_lock_menu.c
@@ -5,7 +5,7 @@
 
 #include "../desktop_i.h"
 #include "desktop_view_lock_menu.h"
-#include "../../../settings/xtreme_settings/xtreme_settings.h"
+#include "xtreme/settings.h"
 
 #define LOCK_MENU_ITEMS_NB 5
 
diff --git a/applications/services/gui/application.fam b/applications/services/gui/application.fam
index 43e93559e..7981a4fcb 100644
--- a/applications/services/gui/application.fam
+++ b/applications/services/gui/application.fam
@@ -7,7 +7,7 @@ App(
     requires=[
         "input",
         "notification",
-        "xtreme_settings",
+        "xtreme",
     ],
     stack_size=2 * 1024,
     order=70,
diff --git a/applications/services/gui/gui.c b/applications/services/gui/gui.c
index 46baf453d..2fdec197b 100644
--- a/applications/services/gui/gui.c
+++ b/applications/services/gui/gui.c
@@ -1,4 +1,4 @@
-#include "../../settings/xtreme_settings/xtreme_settings.h"
+#include "xtreme/settings.h"
 #include "gui_i.h"
 #include <assets_icons.h>
 
diff --git a/applications/services/gui/modules/file_browser.c b/applications/services/gui/modules/file_browser.c
index a3011a049..0a08db7c3 100644
--- a/applications/services/gui/modules/file_browser.c
+++ b/applications/services/gui/modules/file_browser.c
@@ -14,7 +14,7 @@
 #include "m-string.h"
 #include "m-algo.h"
 #include <m-array.h>
-#include "../../../settings/xtreme_settings/xtreme_settings.h"
+#include "xtreme/settings.h"
 
 #define LIST_ITEMS 5u
 #define MAX_LEN_PX 110
diff --git a/applications/services/power/power_service/power.c b/applications/services/power/power_service/power.c
index e52cb4e10..6f31f3044 100644
--- a/applications/services/power/power_service/power.c
+++ b/applications/services/power/power_service/power.c
@@ -2,7 +2,7 @@
 
 #include <furi.h>
 #include <furi_hal.h>
-#include "../../../settings/xtreme_settings/xtreme_settings.h"
+#include "xtreme/settings.h"
 
 #define POWER_OFF_TIMEOUT 90
 
diff --git a/applications/services/xtreme/application.fam b/applications/services/xtreme/application.fam
new file mode 100644
index 000000000..2dfcab051
--- /dev/null
+++ b/applications/services/xtreme/application.fam
@@ -0,0 +1,10 @@
+App(
+    appid="xtreme",
+    apptype=FlipperAppType.STARTUP,
+    entry_point="xtreme_on_system_start",
+    requires=["storage"],
+    order=1000,
+    provides=[
+        "xtreme",
+    ],
+)
diff --git a/applications/settings/xtreme_settings/xtreme_assets.c b/applications/services/xtreme/assets.c
similarity index 99%
rename from applications/settings/xtreme_settings/xtreme_assets.c
rename to applications/services/xtreme/assets.c
index 13014b8d1..4d3f3470b 100644
--- a/applications/settings/xtreme_settings/xtreme_assets.c
+++ b/applications/services/xtreme/assets.c
@@ -1,5 +1,5 @@
-#include "xtreme_assets.h"
-#include "assets_icons.h"
+#include "assets.h"
+#include <assets_icons.h>
 #include <core/dangerous_defines.h>
 
 #define ICONS_FMT PACKS_DIR "/%s/Icons/%s"
diff --git a/applications/settings/xtreme_settings/xtreme_assets.h b/applications/services/xtreme/assets.h
similarity index 97%
rename from applications/settings/xtreme_settings/xtreme_assets.h
rename to applications/services/xtreme/assets.h
index 038372a43..b88a6cf1e 100644
--- a/applications/settings/xtreme_settings/xtreme_assets.h
+++ b/applications/services/xtreme/assets.h
@@ -1,7 +1,7 @@
 #pragma once
 
+#include "settings.h"
 #include <gui/icon_i.h>
-#include "xtreme_settings.h"
 #include <toolbox/path.h>
 
 #define PACKS_DIR EXT_PATH("dolphin_custom")
diff --git a/applications/services/xtreme/on_system_start.c b/applications/services/xtreme/on_system_start.c
new file mode 100644
index 000000000..531888f1b
--- /dev/null
+++ b/applications/services/xtreme/on_system_start.c
@@ -0,0 +1,7 @@
+#include "settings.h"
+#include "assets.h"
+
+void xtreme_on_system_start() {
+    XTREME_SETTINGS_LOAD();
+    XTREME_ASSETS_LOAD();
+}
diff --git a/applications/settings/xtreme_settings/xtreme_settings.c b/applications/services/xtreme/settings.c
similarity index 97%
rename from applications/settings/xtreme_settings/xtreme_settings.c
rename to applications/services/xtreme/settings.c
index 3db0a4c1c..eea68bd2b 100644
--- a/applications/settings/xtreme_settings/xtreme_settings.c
+++ b/applications/services/xtreme/settings.c
@@ -1,4 +1,4 @@
-#include "xtreme_settings.h"
+#include "settings.h"
 
 XtremeSettings* xtreme_settings = NULL;
 
diff --git a/applications/settings/xtreme_settings/xtreme_settings.h b/applications/services/xtreme/settings.h
similarity index 94%
rename from applications/settings/xtreme_settings/xtreme_settings.h
rename to applications/services/xtreme/settings.h
index aacbdd92a..9fd5f5c53 100644
--- a/applications/settings/xtreme_settings/xtreme_settings.h
+++ b/applications/services/xtreme/settings.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "xtreme_settings_filename.h"
+#include "settings_filename.h"
 
 #include <furi_hal.h>
 #include <stdint.h>
diff --git a/applications/settings/xtreme_settings/xtreme_settings_filename.h b/applications/services/xtreme/settings_filename.h
similarity index 100%
rename from applications/settings/xtreme_settings/xtreme_settings_filename.h
rename to applications/services/xtreme/settings_filename.h
diff --git a/applications/settings/application.fam b/applications/settings/application.fam
index cc4b9703d..49695b4b3 100644
--- a/applications/settings/application.fam
+++ b/applications/settings/application.fam
@@ -5,6 +5,7 @@ App(
     provides=[
         "passport",
         "system_settings",
+        "xtreme_app",
         "about",
     ],
 )
diff --git a/applications/settings/bt_settings_app/scenes/bt_settings_scene_forget_dev_success.c b/applications/settings/bt_settings_app/scenes/bt_settings_scene_forget_dev_success.c
index f797cdc0d..59071959c 100644
--- a/applications/settings/bt_settings_app/scenes/bt_settings_scene_forget_dev_success.c
+++ b/applications/settings/bt_settings_app/scenes/bt_settings_scene_forget_dev_success.c
@@ -1,6 +1,6 @@
 #include "../bt_settings_app.h"
 #include "furi_hal_bt.h"
-#include "../../xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"
 #include <furi_hal_bt.h>
 
 void bt_settings_app_scene_forget_dev_success_popup_callback(void* context) {
diff --git a/applications/settings/desktop_settings/scenes/desktop_settings_scene_pin_disable.c b/applications/settings/desktop_settings/scenes/desktop_settings_scene_pin_disable.c
index cdafbb828..cad5f43f4 100644
--- a/applications/settings/desktop_settings/scenes/desktop_settings_scene_pin_disable.c
+++ b/applications/settings/desktop_settings/scenes/desktop_settings_scene_pin_disable.c
@@ -6,7 +6,7 @@
 #include "../desktop_settings_app.h"
 #include <desktop/desktop_settings.h>
 #include "desktop_settings_scene.h"
-#include "../../xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"
 
 #define SCENE_EVENT_EXIT (0U)
 
diff --git a/applications/settings/dolphin_passport/passport.c b/applications/settings/dolphin_passport/passport.c
index 450c5af23..d6474b4cf 100644
--- a/applications/settings/dolphin_passport/passport.c
+++ b/applications/settings/dolphin_passport/passport.c
@@ -6,7 +6,7 @@
 #include <gui/gui.h>
 #include <furi_hal_version.h>
 #include "dolphin/dolphin.h"
-#include "../xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"
 #include "math.h"
 
 typedef struct {
diff --git a/applications/settings/power_settings_app/scenes/power_settings_scene_power_off.c b/applications/settings/power_settings_app/scenes/power_settings_scene_power_off.c
index 6fd26138b..afcc6f950 100644
--- a/applications/settings/power_settings_app/scenes/power_settings_scene_power_off.c
+++ b/applications/settings/power_settings_app/scenes/power_settings_scene_power_off.c
@@ -1,5 +1,5 @@
 #include "../power_settings_app.h"
-#include "../../xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"
 
 void power_settings_scene_power_off_dialog_callback(DialogExResult result, void* context) {
     furi_assert(context);
diff --git a/applications/settings/storage_settings/scenes/storage_settings_scene_unmounted.c b/applications/settings/storage_settings/scenes/storage_settings_scene_unmounted.c
index 455cbaa78..13f53acd1 100644
--- a/applications/settings/storage_settings/scenes/storage_settings_scene_unmounted.c
+++ b/applications/settings/storage_settings/scenes/storage_settings_scene_unmounted.c
@@ -1,5 +1,5 @@
 #include "../storage_settings.h"
-#include "../../xtreme_settings/xtreme_assets.h"
+#include "xtreme/assets.h"
 
 static void
     storage_settings_scene_unmounted_dialog_callback(DialogExResult result, void* context) {
diff --git a/applications/settings/xtreme_settings/application.fam b/applications/settings/xtreme_app/application.fam
similarity index 54%
rename from applications/settings/xtreme_settings/application.fam
rename to applications/settings/xtreme_app/application.fam
index 79c0f62b4..e1b7fc964 100644
--- a/applications/settings/xtreme_settings/application.fam
+++ b/applications/settings/xtreme_app/application.fam
@@ -1,14 +1,12 @@
 App(
-    appid="xtreme_settings",
+    appid="xtreme_app",
     name="Xtreme FW",
     apptype=FlipperAppType.SETTINGS,
-    entry_point="xtreme_settings_app",
+    entry_point="xtreme_app",
     stack_size=2 * 1024,
     requires=[
         "gui",
+        "xtreme",
     ],
     order=90,
-    provides=[
-        "xtreme_settings",
-    ],
 )
diff --git a/applications/settings/xtreme_app/scenes/xtreme_app_scene.c b/applications/settings/xtreme_app/scenes/xtreme_app_scene.c
new file mode 100644
index 000000000..5448bb85a
--- /dev/null
+++ b/applications/settings/xtreme_app/scenes/xtreme_app_scene.c
@@ -0,0 +1,30 @@
+#include "xtreme_app_scene.h"
+
+// Generate scene on_enter handlers array
+#define ADD_SCENE(prefix, name, id) prefix##_scene_##name##_on_enter,
+void (*const xtreme_app_on_enter_handlers[])(void*) = {
+#include "xtreme_app_scene_config.h"
+};
+#undef ADD_SCENE
+
+// Generate scene on_event handlers array
+#define ADD_SCENE(prefix, name, id) prefix##_scene_##name##_on_event,
+bool (*const xtreme_app_on_event_handlers[])(void* context, SceneManagerEvent event) = {
+#include "xtreme_app_scene_config.h"
+};
+#undef ADD_SCENE
+
+// Generate scene on_exit handlers array
+#define ADD_SCENE(prefix, name, id) prefix##_scene_##name##_on_exit,
+void (*const xtreme_app_on_exit_handlers[])(void* context) = {
+#include "xtreme_app_scene_config.h"
+};
+#undef ADD_SCENE
+
+// Initialize scene handlers configuration structure
+const SceneManagerHandlers xtreme_app_scene_handlers = {
+    .on_enter_handlers = xtreme_app_on_enter_handlers,
+    .on_event_handlers = xtreme_app_on_event_handlers,
+    .on_exit_handlers = xtreme_app_on_exit_handlers,
+    .scene_num = XtremeAppSceneNum,
+};
diff --git a/applications/settings/xtreme_settings/scenes/xtreme_settings_scene.h b/applications/settings/xtreme_app/scenes/xtreme_app_scene.h
similarity index 63%
rename from applications/settings/xtreme_settings/scenes/xtreme_settings_scene.h
rename to applications/settings/xtreme_app/scenes/xtreme_app_scene.h
index 70abf4f77..d7f19abac 100644
--- a/applications/settings/xtreme_settings/scenes/xtreme_settings_scene.h
+++ b/applications/settings/xtreme_app/scenes/xtreme_app_scene.h
@@ -3,27 +3,27 @@
 #include <gui/scene_manager.h>
 
 // Generate scene id and total number
-#define ADD_SCENE(prefix, name, id) XtremeSettingsAppScene##id,
+#define ADD_SCENE(prefix, name, id) XtremeAppScene##id,
 typedef enum {
-#include "xtreme_settings_scene_config.h"
-    XtremeSettingsAppSceneNum,
-} XtremeSettingsAppScene;
+#include "xtreme_app_scene_config.h"
+    XtremeAppSceneNum,
+} XtremeAppScene;
 #undef ADD_SCENE
 
-extern const SceneManagerHandlers xtreme_settings_scene_handlers;
+extern const SceneManagerHandlers xtreme_app_scene_handlers;
 
 // Generate scene on_enter handlers declaration
 #define ADD_SCENE(prefix, name, id) void prefix##_scene_##name##_on_enter(void*);
-#include "xtreme_settings_scene_config.h"
+#include "xtreme_app_scene_config.h"
 #undef ADD_SCENE
 
 // Generate scene on_event handlers declaration
 #define ADD_SCENE(prefix, name, id) \
     bool prefix##_scene_##name##_on_event(void* context, SceneManagerEvent event);
-#include "xtreme_settings_scene_config.h"
+#include "xtreme_app_scene_config.h"
 #undef ADD_SCENE
 
 // Generate scene on_exit handlers declaration
 #define ADD_SCENE(prefix, name, id) void prefix##_scene_##name##_on_exit(void* context);
-#include "xtreme_settings_scene_config.h"
+#include "xtreme_app_scene_config.h"
 #undef ADD_SCENE
diff --git a/applications/settings/xtreme_app/scenes/xtreme_app_scene_config.h b/applications/settings/xtreme_app/scenes/xtreme_app_scene_config.h
new file mode 100644
index 000000000..9eed63575
--- /dev/null
+++ b/applications/settings/xtreme_app/scenes/xtreme_app_scene_config.h
@@ -0,0 +1 @@
+ADD_SCENE(xtreme_app, main, Main)
diff --git a/applications/settings/xtreme_settings/scenes/xtreme_settings_scene_start.c b/applications/settings/xtreme_app/scenes/xtreme_app_scene_main.c
similarity index 78%
rename from applications/settings/xtreme_settings/scenes/xtreme_settings_scene_start.c
rename to applications/settings/xtreme_app/scenes/xtreme_app_scene_main.c
index 40972a31a..b645c0d64 100644
--- a/applications/settings/xtreme_settings/scenes/xtreme_settings_scene_start.c
+++ b/applications/settings/xtreme_app/scenes/xtreme_app_scene_main.c
@@ -1,10 +1,10 @@
-#include "../xtreme_settings_app.h"
+#include "../xtreme_app.h"
 #include <lib/toolbox/value_index.h>
 #include <power/power_service/power.h>
 #include <lib/toolbox/version.h>
 
-static void xtreme_settings_scene_start_asset_pack_changed(VariableItem* item) {
-    XtremeSettingsApp* app = variable_item_get_context(item);
+static void xtreme_app_scene_main_asset_pack_changed(VariableItem* item) {
+    XtremeApp* app = variable_item_get_context(item);
     uint8_t index = variable_item_get_current_value_index(item);
     variable_item_set_current_value_text(
         item, index == 0 ? "SFW" : *asset_packs_get(app->asset_packs, index - 1));
@@ -20,8 +20,8 @@ const char* const anim_speed_names[] =
     {"25%", "50%", "75%", "100%", "125%", "150%", "175%", "200%", "225%", "250%", "275%", "300%"};
 const int32_t anim_speed_values[COUNT_OF(anim_speed_names)] =
     {25, 50, 75, 0, 125, 150, 175, 200, 225, 250, 275, 300};
-static void xtreme_settings_scene_start_anim_speed_changed(VariableItem* item) {
-    XtremeSettingsApp* app = variable_item_get_context(item);
+static void xtreme_app_scene_main_anim_speed_changed(VariableItem* item) {
+    XtremeApp* app = variable_item_get_context(item);
     uint8_t index = variable_item_get_current_value_index(item);
     variable_item_set_current_value_text(item, anim_speed_names[index]);
     XTREME_SETTINGS()->anim_speed = anim_speed_values[index];
@@ -44,16 +44,16 @@ const char* const cycle_anims_names[] = {
     "24 H"};
 const int32_t cycle_anims_values[COUNT_OF(cycle_anims_names)] =
     {-1, 0, 30, 60, 300, 600, 900, 1800, 3600, 7200, 21600, 43200, 86400};
-static void xtreme_settings_scene_start_cycle_anims_changed(VariableItem* item) {
-    XtremeSettingsApp* app = variable_item_get_context(item);
+static void xtreme_app_scene_main_cycle_anims_changed(VariableItem* item) {
+    XtremeApp* app = variable_item_get_context(item);
     uint8_t index = variable_item_get_current_value_index(item);
     variable_item_set_current_value_text(item, cycle_anims_names[index]);
     XTREME_SETTINGS()->cycle_anims = cycle_anims_values[index];
     app->settings_changed = true;
 }
 
-static void xtreme_settings_scene_start_unlock_anims_changed(VariableItem* item) {
-    XtremeSettingsApp* app = variable_item_get_context(item);
+static void xtreme_app_scene_main_unlock_anims_changed(VariableItem* item) {
+    XtremeApp* app = variable_item_get_context(item);
     bool value = variable_item_get_current_value_index(item);
     variable_item_set_current_value_text(item, value ? "ON" : "OFF");
     XTREME_SETTINGS()->unlock_anims = value;
@@ -70,32 +70,32 @@ const int32_t battery_style_values[COUNT_OF(battery_style_names)] = {
     BatteryStyleRetro3,
     BatteryStyleRetro5,
     BatteryStyleBarPercent};
-static void xtreme_settings_scene_start_battery_style_changed(VariableItem* item) {
-    XtremeSettingsApp* app = variable_item_get_context(item);
+static void xtreme_app_scene_main_battery_style_changed(VariableItem* item) {
+    XtremeApp* app = variable_item_get_context(item);
     uint8_t index = variable_item_get_current_value_index(item);
     variable_item_set_current_value_text(item, battery_style_names[index]);
     XTREME_SETTINGS()->battery_style = battery_style_values[index];
     app->settings_changed = true;
 }
 
-static void xtreme_settings_scene_start_status_bar_changed(VariableItem* item) {
-    XtremeSettingsApp* app = variable_item_get_context(item);
+static void xtreme_app_scene_main_status_bar_changed(VariableItem* item) {
+    XtremeApp* app = variable_item_get_context(item);
     bool value = variable_item_get_current_value_index(item);
     variable_item_set_current_value_text(item, value ? "ON" : "OFF");
     XTREME_SETTINGS()->status_bar = value;
     app->settings_changed = true;
 }
 
-static void xtreme_settings_scene_start_sort_folders_before_changed(VariableItem* item) {
-    XtremeSettingsApp* app = variable_item_get_context(item);
+static void xtreme_app_scene_main_sort_folders_before_changed(VariableItem* item) {
+    XtremeApp* app = variable_item_get_context(item);
     bool value = variable_item_get_current_value_index(item);
     variable_item_set_current_value_text(item, value ? "ON" : "OFF");
     XTREME_SETTINGS()->sort_ignore_dirs = !value;
     app->settings_changed = true;
 }
 
-static void xtreme_settings_scene_start_xp_level_changed(VariableItem* item) {
-    XtremeSettingsApp* app = variable_item_get_context(item);
+static void xtreme_app_scene_main_xp_level_changed(VariableItem* item) {
+    XtremeApp* app = variable_item_get_context(item);
     app->dolphin_level = variable_item_get_current_value_index(item) + 1;
     char level_str[4];
     snprintf(level_str, 4, "%i", app->dolphin_level);
@@ -103,22 +103,22 @@ static void xtreme_settings_scene_start_xp_level_changed(VariableItem* item) {
     app->level_changed = true;
 }
 
-static void xtreme_settings_scene_start_subghz_extend_changed(VariableItem* item) {
-    XtremeSettingsApp* app = variable_item_get_context(item);
+static void xtreme_app_scene_main_subghz_extend_changed(VariableItem* item) {
+    XtremeApp* app = variable_item_get_context(item);
     app->subghz_extend = variable_item_get_current_value_index(item);
     variable_item_set_current_value_text(item, app->subghz_extend ? "ON" : "OFF");
     app->subghz_changed = true;
 }
 
-static void xtreme_settings_scene_start_subghz_bypass_changed(VariableItem* item) {
-    XtremeSettingsApp* app = variable_item_get_context(item);
+static void xtreme_app_scene_main_subghz_bypass_changed(VariableItem* item) {
+    XtremeApp* app = variable_item_get_context(item);
     app->subghz_bypass = variable_item_get_current_value_index(item);
     variable_item_set_current_value_text(item, app->subghz_bypass ? "ON" : "OFF");
     app->subghz_changed = true;
 }
 
-void xtreme_settings_scene_start_on_enter(void* context) {
-    XtremeSettingsApp* app = context;
+void xtreme_app_scene_main_on_enter(void* context) {
+    XtremeApp* app = context;
     XtremeSettings* xtreme_settings = XTREME_SETTINGS();
     VariableItemList* var_item_list = app->var_item_list;
     VariableItem* item;
@@ -177,7 +177,7 @@ void xtreme_settings_scene_start_on_enter(void* context) {
         var_item_list,
         "Asset Pack",
         asset_packs_size(app->asset_packs) + 1,
-        xtreme_settings_scene_start_asset_pack_changed,
+        xtreme_app_scene_main_asset_pack_changed,
         app);
     variable_item_set_current_value_index(item, current_pack);
     variable_item_set_current_value_text(
@@ -187,7 +187,7 @@ void xtreme_settings_scene_start_on_enter(void* context) {
         var_item_list,
         "Anim Speed",
         COUNT_OF(anim_speed_names),
-        xtreme_settings_scene_start_anim_speed_changed,
+        xtreme_app_scene_main_anim_speed_changed,
         app);
     value_index = value_index_int32(
         xtreme_settings->anim_speed, anim_speed_values, COUNT_OF(anim_speed_names));
@@ -198,7 +198,7 @@ void xtreme_settings_scene_start_on_enter(void* context) {
         var_item_list,
         "Cycle Anims",
         COUNT_OF(cycle_anims_names),
-        xtreme_settings_scene_start_cycle_anims_changed,
+        xtreme_app_scene_main_cycle_anims_changed,
         app);
     value_index = value_index_int32(
         xtreme_settings->cycle_anims, cycle_anims_values, COUNT_OF(cycle_anims_names));
@@ -206,7 +206,7 @@ void xtreme_settings_scene_start_on_enter(void* context) {
     variable_item_set_current_value_text(item, cycle_anims_names[value_index]);
 
     item = variable_item_list_add(
-        var_item_list, "Unlock Anims", 2, xtreme_settings_scene_start_unlock_anims_changed, app);
+        var_item_list, "Unlock Anims", 2, xtreme_app_scene_main_unlock_anims_changed, app);
     variable_item_set_current_value_index(item, xtreme_settings->unlock_anims);
     variable_item_set_current_value_text(item, xtreme_settings->unlock_anims ? "ON" : "OFF");
 
@@ -214,7 +214,7 @@ void xtreme_settings_scene_start_on_enter(void* context) {
         var_item_list,
         "Battery Style",
         COUNT_OF(battery_style_names),
-        xtreme_settings_scene_start_battery_style_changed,
+        xtreme_app_scene_main_battery_style_changed,
         app);
     value_index = value_index_int32(
         xtreme_settings->battery_style, battery_style_values, COUNT_OF(battery_style_names));
@@ -222,7 +222,7 @@ void xtreme_settings_scene_start_on_enter(void* context) {
     variable_item_set_current_value_text(item, battery_style_names[value_index]);
 
     item = variable_item_list_add(
-        var_item_list, "Status Bar", 2, xtreme_settings_scene_start_status_bar_changed, app);
+        var_item_list, "Status Bar", 2, xtreme_app_scene_main_status_bar_changed, app);
     variable_item_set_current_value_index(item, xtreme_settings->status_bar);
     variable_item_set_current_value_text(item, xtreme_settings->status_bar ? "ON" : "OFF");
 
@@ -230,7 +230,7 @@ void xtreme_settings_scene_start_on_enter(void* context) {
         var_item_list,
         "Sort Dirs Before",
         2,
-        xtreme_settings_scene_start_sort_folders_before_changed,
+        xtreme_app_scene_main_sort_folders_before_changed,
         app);
     variable_item_set_current_value_index(item, !xtreme_settings->sort_ignore_dirs);
     variable_item_set_current_value_text(item, !xtreme_settings->sort_ignore_dirs ? "ON" : "OFF");
@@ -241,18 +241,18 @@ void xtreme_settings_scene_start_on_enter(void* context) {
         var_item_list,
         "XP Level",
         DOLPHIN_LEVEL_COUNT + 1,
-        xtreme_settings_scene_start_xp_level_changed,
+        xtreme_app_scene_main_xp_level_changed,
         app);
     variable_item_set_current_value_index(item, app->dolphin_level - 1);
     variable_item_set_current_value_text(item, level_str);
 
     item = variable_item_list_add(
-        var_item_list, "SubGHz Extend", 2, xtreme_settings_scene_start_subghz_extend_changed, app);
+        var_item_list, "SubGHz Extend", 2, xtreme_app_scene_main_subghz_extend_changed, app);
     variable_item_set_current_value_index(item, app->subghz_extend);
     variable_item_set_current_value_text(item, app->subghz_extend ? "ON" : "OFF");
 
     item = variable_item_list_add(
-        var_item_list, "SubGHz Bypass", 2, xtreme_settings_scene_start_subghz_bypass_changed, app);
+        var_item_list, "SubGHz Bypass", 2, xtreme_app_scene_main_subghz_bypass_changed, app);
     variable_item_set_current_value_index(item, app->subghz_bypass);
     variable_item_set_current_value_text(item, app->subghz_bypass ? "ON" : "OFF");
 
@@ -260,18 +260,18 @@ void xtreme_settings_scene_start_on_enter(void* context) {
         "%s  %s", version_get_gitbranchnum(NULL), version_get_builddate(NULL));
     item = variable_item_list_add(var_item_list, furi_string_get_cstr(version_tag), 0, NULL, app);
 
-    view_dispatcher_switch_to_view(app->view_dispatcher, XtremeSettingsAppViewVarItemList);
+    view_dispatcher_switch_to_view(app->view_dispatcher, XtremeAppViewVarItemList);
 }
 
-bool xtreme_settings_scene_start_on_event(void* context, SceneManagerEvent event) {
+bool xtreme_app_scene_main_on_event(void* context, SceneManagerEvent event) {
     UNUSED(context);
     UNUSED(event);
     bool consumed = false;
     return consumed;
 }
 
-void xtreme_settings_scene_start_on_exit(void* context) {
-    XtremeSettingsApp* app = context;
+void xtreme_app_scene_main_on_exit(void* context) {
+    XtremeApp* app = context;
     asset_packs_it_t it;
     for(asset_packs_it(it, app->asset_packs); !asset_packs_end_p(it); asset_packs_next(it)) {
         free(*asset_packs_cref(it));
diff --git a/applications/settings/xtreme_settings/xtreme_settings_app.c b/applications/settings/xtreme_app/xtreme_app.c
similarity index 69%
rename from applications/settings/xtreme_settings/xtreme_settings_app.c
rename to applications/settings/xtreme_app/xtreme_app.c
index 6b0a12f1c..cdacf6cca 100644
--- a/applications/settings/xtreme_settings/xtreme_settings_app.c
+++ b/applications/settings/xtreme_app/xtreme_app.c
@@ -1,19 +1,19 @@
-#include "xtreme_settings_app.h"
+#include "xtreme_app.h"
 
-static bool xtreme_settings_custom_event_callback(void* context, uint32_t event) {
+static bool xtreme_app_custom_event_callback(void* context, uint32_t event) {
     furi_assert(context);
-    XtremeSettingsApp* app = context;
+    XtremeApp* app = context;
     return scene_manager_handle_custom_event(app->scene_manager, event);
 }
 
-void xtreme_settings_reboot(void* context) {
+void xtreme_app_reboot(void* context) {
     UNUSED(context);
     power_reboot(PowerBootModeNormal);
 }
 
-static bool xtreme_settings_back_event_callback(void* context) {
+static bool xtreme_app_back_event_callback(void* context) {
     furi_assert(context);
-    XtremeSettingsApp* app = context;
+    XtremeApp* app = context;
 
     if(app->level_changed) {
         Dolphin* dolphin = furi_record_open(RECORD_DOLPHIN);
@@ -45,11 +45,11 @@ static bool xtreme_settings_back_event_callback(void* context) {
         if(app->assets_changed) {
             popup_set_header(app->popup, "Rebooting...", 64, 26, AlignCenter, AlignCenter);
             popup_set_text(app->popup, "Swapping assets...", 64, 40, AlignCenter, AlignCenter);
-            popup_set_callback(app->popup, xtreme_settings_reboot);
+            popup_set_callback(app->popup, xtreme_app_reboot);
             popup_set_context(app->popup, app);
             popup_set_timeout(app->popup, 1000);
             popup_enable_timeout(app->popup);
-            view_dispatcher_switch_to_view(app->view_dispatcher, XtremeSettingsAppViewPopup);
+            view_dispatcher_switch_to_view(app->view_dispatcher, XtremeAppViewPopup);
             return true;
         }
     }
@@ -57,20 +57,20 @@ static bool xtreme_settings_back_event_callback(void* context) {
     return scene_manager_handle_back_event(app->scene_manager);
 }
 
-XtremeSettingsApp* xtreme_settings_app_alloc() {
-    XtremeSettingsApp* app = malloc(sizeof(XtremeSettingsApp));
+XtremeApp* xtreme_app_alloc() {
+    XtremeApp* app = malloc(sizeof(XtremeApp));
     app->gui = furi_record_open(RECORD_GUI);
 
     // View Dispatcher and Scene Manager
     app->view_dispatcher = view_dispatcher_alloc();
-    app->scene_manager = scene_manager_alloc(&xtreme_settings_scene_handlers, app);
+    app->scene_manager = scene_manager_alloc(&xtreme_app_scene_handlers, app);
     view_dispatcher_enable_queue(app->view_dispatcher);
     view_dispatcher_set_event_callback_context(app->view_dispatcher, app);
 
     view_dispatcher_set_custom_event_callback(
-        app->view_dispatcher, xtreme_settings_custom_event_callback);
+        app->view_dispatcher, xtreme_app_custom_event_callback);
     view_dispatcher_set_navigation_event_callback(
-        app->view_dispatcher, xtreme_settings_back_event_callback);
+        app->view_dispatcher, xtreme_app_back_event_callback);
 
     view_dispatcher_attach_to_gui(app->view_dispatcher, app->gui, ViewDispatcherTypeFullscreen);
 
@@ -78,25 +78,23 @@ XtremeSettingsApp* xtreme_settings_app_alloc() {
     app->var_item_list = variable_item_list_alloc();
     view_dispatcher_add_view(
         app->view_dispatcher,
-        XtremeSettingsAppViewVarItemList,
+        XtremeAppViewVarItemList,
         variable_item_list_get_view(app->var_item_list));
 
     app->popup = popup_alloc();
     view_dispatcher_add_view(
-        app->view_dispatcher, XtremeSettingsAppViewPopup, popup_get_view(app->popup));
+        app->view_dispatcher, XtremeAppViewPopup, popup_get_view(app->popup));
 
-    // Set first scene
-    scene_manager_next_scene(app->scene_manager, XtremeSettingsAppSceneStart);
     return app;
 }
 
-void xtreme_settings_app_free(XtremeSettingsApp* app) {
+void xtreme_app_free(XtremeApp* app) {
     furi_assert(app);
 
     // Gui modules
-    view_dispatcher_remove_view(app->view_dispatcher, XtremeSettingsAppViewVarItemList);
+    view_dispatcher_remove_view(app->view_dispatcher, XtremeAppViewVarItemList);
     variable_item_list_free(app->var_item_list);
-    view_dispatcher_remove_view(app->view_dispatcher, XtremeSettingsAppViewPopup);
+    view_dispatcher_remove_view(app->view_dispatcher, XtremeAppViewPopup);
     popup_free(app->popup);
 
     // View Dispatcher and Scene Manager
@@ -108,10 +106,11 @@ void xtreme_settings_app_free(XtremeSettingsApp* app) {
     free(app);
 }
 
-extern int32_t xtreme_settings_app(void* p) {
+extern int32_t xtreme_app(void* p) {
     UNUSED(p);
-    XtremeSettingsApp* app = xtreme_settings_app_alloc();
+    XtremeApp* app = xtreme_app_alloc();
+    scene_manager_next_scene(app->scene_manager, XtremeAppSceneMain);
     view_dispatcher_run(app->view_dispatcher);
-    xtreme_settings_app_free(app);
+    xtreme_app_free(app);
     return 0;
 }
diff --git a/applications/settings/xtreme_settings/xtreme_settings_app.h b/applications/settings/xtreme_app/xtreme_app.h
similarity index 79%
rename from applications/settings/xtreme_settings/xtreme_settings_app.h
rename to applications/settings/xtreme_app/xtreme_app.h
index 7265da078..23adbf5ac 100644
--- a/applications/settings/xtreme_settings/xtreme_settings_app.h
+++ b/applications/settings/xtreme_app/xtreme_app.h
@@ -8,14 +8,14 @@
 #include <assets_icons.h>
 #include <gui/modules/variable_item_list.h>
 #include <gui/modules/popup.h>
-#include "xtreme_settings.h"
-#include "xtreme_assets.h"
-#include "scenes/xtreme_settings_scene.h"
+#include "scenes/xtreme_app_scene.h"
 #include "dolphin/helpers/dolphin_state.h"
 #include "dolphin/dolphin.h"
 #include "dolphin/dolphin_i.h"
 #include <lib/flipper_format/flipper_format.h>
 #include <m-array.h>
+#include "xtreme/settings.h"
+#include "xtreme/assets.h"
 
 ARRAY_DEF(asset_packs, char*)
 
@@ -33,9 +33,9 @@ typedef struct {
     bool subghz_changed;
     bool level_changed;
     asset_packs_t asset_packs;
-} XtremeSettingsApp;
+} XtremeApp;
 
 typedef enum {
-    XtremeSettingsAppViewVarItemList,
-    XtremeSettingsAppViewPopup,
-} XtremeSettingsAppView;
+    XtremeAppViewVarItemList,
+    XtremeAppViewPopup,
+} XtremeAppView;
diff --git a/applications/settings/xtreme_settings/scenes/xtreme_settings_scene.c b/applications/settings/xtreme_settings/scenes/xtreme_settings_scene.c
deleted file mode 100644
index 3d97ed979..000000000
--- a/applications/settings/xtreme_settings/scenes/xtreme_settings_scene.c
+++ /dev/null
@@ -1,30 +0,0 @@
-#include "xtreme_settings_scene.h"
-
-// Generate scene on_enter handlers array
-#define ADD_SCENE(prefix, name, id) prefix##_scene_##name##_on_enter,
-void (*const xtreme_settings_on_enter_handlers[])(void*) = {
-#include "xtreme_settings_scene_config.h"
-};
-#undef ADD_SCENE
-
-// Generate scene on_event handlers array
-#define ADD_SCENE(prefix, name, id) prefix##_scene_##name##_on_event,
-bool (*const xtreme_settings_on_event_handlers[])(void* context, SceneManagerEvent event) = {
-#include "xtreme_settings_scene_config.h"
-};
-#undef ADD_SCENE
-
-// Generate scene on_exit handlers array
-#define ADD_SCENE(prefix, name, id) prefix##_scene_##name##_on_exit,
-void (*const xtreme_settings_on_exit_handlers[])(void* context) = {
-#include "xtreme_settings_scene_config.h"
-};
-#undef ADD_SCENE
-
-// Initialize scene handlers configuration structure
-const SceneManagerHandlers xtreme_settings_scene_handlers = {
-    .on_enter_handlers = xtreme_settings_on_enter_handlers,
-    .on_event_handlers = xtreme_settings_on_event_handlers,
-    .on_exit_handlers = xtreme_settings_on_exit_handlers,
-    .scene_num = XtremeSettingsAppSceneNum,
-};
diff --git a/applications/settings/xtreme_settings/scenes/xtreme_settings_scene_config.h b/applications/settings/xtreme_settings/scenes/xtreme_settings_scene_config.h
deleted file mode 100644
index eddd4f82f..000000000
--- a/applications/settings/xtreme_settings/scenes/xtreme_settings_scene_config.h
+++ /dev/null
@@ -1 +0,0 @@
-ADD_SCENE(xtreme_settings, start, Start)