diff --git a/.gitignore b/.gitignore
index c4ae56ddd..15e6165e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,3 +63,4 @@ PVS-Studio.log
 
 # Automate files, etc
 automate.py
+fbt_options.py
\ No newline at end of file
diff --git a/applications/plugins/weather_station/application.fam b/applications/plugins/weather_station/application.fam
index 1074fc040..7505900e5 100644
--- a/applications/plugins/weather_station/application.fam
+++ b/applications/plugins/weather_station/application.fam
@@ -1,7 +1,7 @@
 App(
-    appid="weather_station",
+    appid="Weather_Station",
     name="Weather Station",
-    apptype=FlipperAppType.PLUGIN,
+    apptype=FlipperAppType.EXTERNAL,
     entry_point="weather_station_app",
     cdefines=["APP_WEATHER_STATION"],
     requires=["gui"],
diff --git a/applications/plugins/weather_station/views/weather_station_receiver.c b/applications/plugins/weather_station/views/weather_station_receiver.c
index de5d7b1a3..42a90b22d 100644
--- a/applications/plugins/weather_station/views/weather_station_receiver.c
+++ b/applications/plugins/weather_station/views/weather_station_receiver.c
@@ -1,6 +1,6 @@
 #include "weather_station_receiver.h"
 #include "../weather_station_app_i.h"
-#include <weather_station_icons.h>
+#include <Weather_Station_icons.h>
 #include <math.h>
 
 #include <input/input.h>
diff --git a/applications/plugins/weather_station/views/weather_station_receiver_info.c b/applications/plugins/weather_station/views/weather_station_receiver_info.c
index 55d239aad..d189363aa 100644
--- a/applications/plugins/weather_station/views/weather_station_receiver_info.c
+++ b/applications/plugins/weather_station/views/weather_station_receiver_info.c
@@ -1,6 +1,6 @@
 #include "weather_station_receiver.h"
 #include "../weather_station_app_i.h"
-#include "weather_station_icons.h"
+#include "Weather_Station_icons.h"
 #include "../protocols/ws_generic.h"
 #include <input/input.h>
 #include <gui/elements.h>
diff --git a/documentation/CustomFlipperName.md b/documentation/CustomFlipperName.md
new file mode 100644
index 000000000..8e8ab3819
--- /dev/null
+++ b/documentation/CustomFlipperName.md
@@ -0,0 +1,35 @@
+# How to change Flipper name:
+## [Feature & Documentation By Unleashed/xMasterX](https://github.com/DarkFlippers/unleashed-firmware/documentation/CustomFlipperName.md)
+
+## Instruction
+1. Read [How to build](https://github.com/ClaraCrazy/Flipper-Xtreme/blob/main/documentation/HowToBuild.md) and [How to install](https://github.com/RogueMaster/flipperzero-firmware/blob/dev/documentation/HowToInstall.md) to know how to build and install firmware
+2. Follow how to build instructions to prepare all things before continuing
+3. Run release build to verify all is ok - `./fbt COMPACT=1 DEBUG=0 updater_package`
+4. Clear build files - `./fbt COMPACT=1 DEBUG=0 updater_package -c`
+5. Run command with extra environment var before `./fbt` that variable should contain your custom name in alphanumeric characters - max length 8 chars
+ `CUSTOM_FLIPPER_NAME=Name ./fbt COMPACT=1 DEBUG=0 updater_package` - where `Name` write your custom name
+6. Copy `dist/f7-C/f7-update-local` folder to microSD `update/myfw/` and run `update` file on flipper from file manager app (Archive)
+7. Flash from microSD card only!!!! .dfu update from qFlipper will not work properly since name and serial number will be changed
+8. Done, you will have custom name, serial number and bluetooth mac address
+9. Also you can skip 5-7 and flash with `CUSTOM_FLIPPER_NAME=Name ./fbt COMPACT=1 DEBUG=0 FORCE=1 flash_usb_full`
+
+
+## Troubleshooting
+### I'm using Windows and name changing / building firmware doesn't work
+- Use PowerShell or VSCode terminal(powershell by default)
+- Clear build files - `.\fbt.cmd COMPACT=1 DEBUG=0 updater_package -c`
+- Enter this in same terminal `$Env:CUSTOM_FLIPPER_NAME="Name"`
+- Run release build - `.\fbt.cmd COMPACT=1 DEBUG=0 updater_package`
+- Flash as described before (see 6.)
+- If something still not work - Run powershell or VSCode as Admin
+### Name stays same for every new build
+- Clear build files - `./fbt COMPACT=1 DEBUG=0 updater_package -c`
+- Try again
+### I want to return my original name and serial number
+- Flash stock FW or any CFW using microSD card offline update method
+
+Or
+- Clear build files - `./fbt COMPACT=1 DEBUG=0 updater_package -c`
+- Run release build - `./fbt COMPACT=1 DEBUG=0 updater_package`
+- Copy `dist/f7-C/f7-update-local` folder to microSD `update/myfw/` and run `update` file on flipper from file manager app (Archive)
+- Flash from microSD card only, .dfu update from qFlipper will not work properly since name and serial number will be changed
diff --git a/fbt_options.py b/fbt_options.py
index 424775553..e6be374be 100644
--- a/fbt_options.py
+++ b/fbt_options.py
@@ -14,7 +14,7 @@ DEBUG = 0
 
 # Suffix to add to files when building distribution
 # If OS environment has DIST_SUFFIX set, it will be used instead
-DIST_SUFFIX = "XFW-0031_12252022"
+DIST_SUFFIX = "XFW-0030_12252022"
 
 # Coprocessor firmware
 COPRO_OB_DATA = "scripts/ob.data"