diff --git a/Applications/Official/Games/Blackjack.fap b/Applications/Official/Games/Blackjack.fap
deleted file mode 100644
index cf56b631..00000000
Binary files a/Applications/Official/Games/Blackjack.fap and /dev/null differ
diff --git a/Applications/Official/Games/Minesweeper.fap b/Applications/Official/Games/Minesweeper.fap
deleted file mode 100644
index 80aad4d5..00000000
Binary files a/Applications/Official/Games/Minesweeper.fap and /dev/null differ
diff --git a/Applications/Official/Games/game15.fap b/Applications/Official/Games/game15.fap
deleted file mode 100644
index 2348c1fb..00000000
Binary files a/Applications/Official/Games/game15.fap and /dev/null differ
diff --git a/Applications/Official/Games/scorched_tanks.fap b/Applications/Official/Games/scorched_tanks.fap
deleted file mode 100644
index 110a1c57..00000000
Binary files a/Applications/Official/Games/scorched_tanks.fap and /dev/null differ
diff --git a/Applications/Official/Games/snake_game.fap b/Applications/Official/Games/snake_game.fap
new file mode 100644
index 00000000..a9cfe0f7
Binary files /dev/null and b/Applications/Official/Games/snake_game.fap differ
diff --git a/Applications/Official/Games/tamagotchi_p1.fap b/Applications/Official/Games/tamagotchi_p1.fap
deleted file mode 100644
index 919b22fb..00000000
Binary files a/Applications/Official/Games/tamagotchi_p1.fap and /dev/null differ
diff --git a/Applications/Official/Misc/ay_music_player.fap b/Applications/Official/Misc/ay_music_player.fap
deleted file mode 100644
index bf0bd7c1..00000000
Binary files a/Applications/Official/Misc/ay_music_player.fap and /dev/null differ
diff --git a/Applications/Official/Misc/dtmf_dolphin.fap b/Applications/Official/Misc/dtmf_dolphin.fap
deleted file mode 100644
index 650f7234..00000000
Binary files a/Applications/Official/Misc/dtmf_dolphin.fap and /dev/null differ
diff --git a/Applications/Official/Misc/mandelbrot.fap b/Applications/Official/Misc/mandelbrot.fap
deleted file mode 100644
index 6cc79340..00000000
Binary files a/Applications/Official/Misc/mandelbrot.fap and /dev/null differ
diff --git a/Applications/Official/Misc/music_player.fap b/Applications/Official/Misc/music_player.fap
index df094c00..33d06c7a 100644
Binary files a/Applications/Official/Misc/music_player.fap and b/Applications/Official/Misc/music_player.fap differ
diff --git a/Applications/Official/Misc/temperature_sensor.fap b/Applications/Official/Misc/temperature_sensor.fap
deleted file mode 100644
index 54a9c800..00000000
Binary files a/Applications/Official/Misc/temperature_sensor.fap and /dev/null differ
diff --git a/Applications/Official/Misc/tuning_fork.fap b/Applications/Official/Misc/tuning_fork.fap
deleted file mode 100644
index 892e88fb..00000000
Binary files a/Applications/Official/Misc/tuning_fork.fap and /dev/null differ
diff --git a/Applications/Official/Tools/barcode_generator.fap b/Applications/Official/Tools/barcode_generator.fap
deleted file mode 100644
index 9f8708af..00000000
Binary files a/Applications/Official/Tools/barcode_generator.fap and /dev/null differ
diff --git a/Applications/Official/Tools/bt_hid.fap b/Applications/Official/Tools/bt_hid.fap
index 8a97355b..73262016 100644
Binary files a/Applications/Official/Tools/bt_hid.fap and b/Applications/Official/Tools/bt_hid.fap differ
diff --git a/Applications/Official/Tools/clock.fap b/Applications/Official/Tools/clock.fap
deleted file mode 100644
index a4c3d5d1..00000000
Binary files a/Applications/Official/Tools/clock.fap and /dev/null differ
diff --git a/Applications/Official/Tools/dap_link.fap b/Applications/Official/Tools/dap_link.fap
new file mode 100644
index 00000000..30e56f81
Binary files /dev/null and b/Applications/Official/Tools/dap_link.fap differ
diff --git a/Applications/Official/Tools/dec_hex_converter.fap b/Applications/Official/Tools/dec_hex_converter.fap
deleted file mode 100644
index 0c106c27..00000000
Binary files a/Applications/Official/Tools/dec_hex_converter.fap and /dev/null differ
diff --git a/Applications/Official/Tools/mousejiggler.fap b/Applications/Official/Tools/mousejiggler.fap
deleted file mode 100644
index 924b9a6b..00000000
Binary files a/Applications/Official/Tools/mousejiggler.fap and /dev/null differ
diff --git a/Applications/Official/Tools/multi_converter.fap b/Applications/Official/Tools/multi_converter.fap
deleted file mode 100644
index 635e7bc9..00000000
Binary files a/Applications/Official/Tools/multi_converter.fap and /dev/null differ
diff --git a/Applications/Official/Tools/picopass.fap b/Applications/Official/Tools/picopass.fap
index 09f1f2ee..62befe02 100644
Binary files a/Applications/Official/Tools/picopass.fap and b/Applications/Official/Tools/picopass.fap differ
diff --git a/Applications/Official/Tools/sentry_safe.fap b/Applications/Official/Tools/sentry_safe.fap
deleted file mode 100644
index 41010c6e..00000000
Binary files a/Applications/Official/Tools/sentry_safe.fap and /dev/null differ
diff --git a/Applications/Official/Tools/signal_generator.fap b/Applications/Official/Tools/signal_generator.fap
new file mode 100644
index 00000000..f1ddab7e
Binary files /dev/null and b/Applications/Official/Tools/signal_generator.fap differ
diff --git a/Applications/Official/Tools/spectrum_analyzer.fap b/Applications/Official/Tools/spectrum_analyzer.fap
deleted file mode 100644
index 24c94c20..00000000
Binary files a/Applications/Official/Tools/spectrum_analyzer.fap and /dev/null differ
diff --git a/Applications/Official/Tools/totp.fap b/Applications/Official/Tools/totp.fap
deleted file mode 100644
index 12e88ced..00000000
Binary files a/Applications/Official/Tools/totp.fap and /dev/null differ
diff --git a/Applications/Official/Tools/touchtunes.fap b/Applications/Official/Tools/touchtunes.fap
deleted file mode 100644
index ebdf9966..00000000
Binary files a/Applications/Official/Tools/touchtunes.fap and /dev/null differ
diff --git a/Applications/Official/Tools/wav_player.fap b/Applications/Official/Tools/wav_player.fap
deleted file mode 100644
index e6dfa95f..00000000
Binary files a/Applications/Official/Tools/wav_player.fap and /dev/null differ
diff --git a/Applications/Official/Tools/weather_station.fap b/Applications/Official/Tools/weather_station.fap
new file mode 100644
index 00000000..8c953d6c
Binary files /dev/null and b/Applications/Official/Tools/weather_station.fap differ