diff --git a/CHANGELOG.md b/CHANGELOG.md
index c896911bb..da06a033c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 - Apps:
   - Games: Pinball0 (by @rdefeo)
   - NFC: Metroflip (by @luu176)
+- UL: Sub-GHz: Jolly Motors support with add manually (by @pkooiman & @xMasterX)
+- OFW: Add VCP break support (by @gsurkov)
 
 ### Updated:
 - Apps:
@@ -20,10 +22,17 @@
   - WebCrawler: Improved progress display, added connectivity check on startup (by @jamisonderek)
   - UL: NFC Magic: Added possibility to write 7b MFC to Gen1 tags (by @mishamyte)
   - UL: Fixed apps for firmware USB CDC callback changes (by @xMasterX)
+- NFC:
+  - OFW: Replace mf_classic_dict.nfc with Proxmark3 version (by @onovy)
+  - OFW: More station IDs for Clipper plugin (by @ted-logan)
+- OFW: Infrared: Add IR command for NAD DR2 D7050 D3020 (by @nikos9742)
 
 ### Fixed:
 - Desktop: Fixed Wardriving animation design (by @Davim09)
-- OFW: GPIO: Merged gsurkov/vcp_break_support branch for usb uart bridge (WIP!!!)
+- OFW: GPIO: Fix USB UART Bridge Crash by increasing system stack size (by @Astrrra)
+- NFC:
+  - OFW: Plantain parser Last payment amount fix (by @mxcdoam)
+  - OFW: Fix typo for mf_classic_key_cahce_get_next_key() function (by @luu176)
 
 ### Removed:
 - Nothing
diff --git a/applications/main/infrared/resources/infrared/assets/audio.ir b/applications/main/infrared/resources/infrared/assets/audio.ir
index dafe66fce..271dcd217 100644
--- a/applications/main/infrared/resources/infrared/assets/audio.ir
+++ b/applications/main/infrared/resources/infrared/assets/audio.ir
@@ -5810,3 +5810,16 @@ type: parsed
 protocol: NECext
 address: 7F 01 00 00
 command: 69 96 00 00
+#
+name: Next
+type: parsed
+protocol: NECext
+address: 87 7C 00 00
+command: 1A E5 00 00
+#
+name: Prev
+type: parsed
+protocol: NECext
+address: 87 7C 00 00
+command: 1D E2 00 00
+#
diff --git a/applications/main/nfc/helpers/mf_classic_key_cache.c b/applications/main/nfc/helpers/mf_classic_key_cache.c
index 1b945660c..763c4dea7 100644
--- a/applications/main/nfc/helpers/mf_classic_key_cache.c
+++ b/applications/main/nfc/helpers/mf_classic_key_cache.c
@@ -166,7 +166,7 @@ void mf_classic_key_cache_load_from_data(MfClassicKeyCache* instance, const MfCl
     }
 }
 
-bool mf_classic_key_cahce_get_next_key(
+bool mf_classic_key_cache_get_next_key(
     MfClassicKeyCache* instance,
     uint8_t* sector_num,
     MfClassicKey* key,
diff --git a/applications/main/nfc/helpers/mf_classic_key_cache.h b/applications/main/nfc/helpers/mf_classic_key_cache.h
index b09f4526b..50a1f5c30 100644
--- a/applications/main/nfc/helpers/mf_classic_key_cache.h
+++ b/applications/main/nfc/helpers/mf_classic_key_cache.h
@@ -16,7 +16,7 @@ bool mf_classic_key_cache_load(MfClassicKeyCache* instance, const uint8_t* uid,
 
 void mf_classic_key_cache_load_from_data(MfClassicKeyCache* instance, const MfClassicData* data);
 
-bool mf_classic_key_cahce_get_next_key(
+bool mf_classic_key_cache_get_next_key(
     MfClassicKeyCache* instance,
     uint8_t* sector_num,
     MfClassicKey* key,
diff --git a/applications/main/nfc/helpers/protocol_support/mf_classic/mf_classic.c b/applications/main/nfc/helpers/protocol_support/mf_classic/mf_classic.c
index 5f3592c4b..27e9a60f5 100644
--- a/applications/main/nfc/helpers/protocol_support/mf_classic/mf_classic.c
+++ b/applications/main/nfc/helpers/protocol_support/mf_classic/mf_classic.c
@@ -72,7 +72,7 @@ static NfcCommand nfc_scene_read_poller_callback_mf_classic(NfcGenericEvent even
         uint8_t sector_num = 0;
         MfClassicKey key = {};
         MfClassicKeyType key_type = MfClassicKeyTypeA;
-        if(mf_classic_key_cahce_get_next_key(
+        if(mf_classic_key_cache_get_next_key(
                instance->mfc_key_cache, &sector_num, &key, &key_type)) {
             mfc_event->data->read_sector_request_data.sector_num = sector_num;
             mfc_event->data->read_sector_request_data.key = key;
diff --git a/applications/main/nfc/plugins/supported_cards/clipper.c b/applications/main/nfc/plugins/supported_cards/clipper.c
index 3c306c9bc..7dc164a7a 100644
--- a/applications/main/nfc/plugins/supported_cards/clipper.c
+++ b/applications/main/nfc/plugins/supported_cards/clipper.c
@@ -102,7 +102,8 @@ static const IdMapping bart_zones[] = {
     {.id = 0x001d, .name = "Lake Merrit"},
     {.id = 0x001e, .name = "Fruitvale"},
     {.id = 0x001f, .name = "Coliseum"},
-    {.id = 0x0021, .name = "San Leandro"},
+    {.id = 0x0020, .name = "San Leandro"},
+    {.id = 0x0021, .name = "Bay Fair"},
     {.id = 0x0022, .name = "Hayward"},
     {.id = 0x0023, .name = "South Hayward"},
     {.id = 0x0024, .name = "Union City"},
@@ -132,6 +133,9 @@ static const IdMapping muni_zones[] = {
     {.id = 0x000b, .name = "Castro"},
     {.id = 0x000c, .name = "Forest Hill"}, // Guessed
     {.id = 0x000d, .name = "West Portal"},
+    {.id = 0x0019, .name = "Union Square/Market Street"},
+    {.id = 0x001a, .name = "Chinatown - Rose Pak"},
+    {.id = 0x001b, .name = "Yerba Buena/Moscone"},
 };
 static const size_t kNumMUNIZones = COUNT(muni_zones);
 
diff --git a/applications/main/nfc/plugins/supported_cards/plantain.c b/applications/main/nfc/plugins/supported_cards/plantain.c
index d57545957..add7ab560 100644
--- a/applications/main/nfc/plugins/supported_cards/plantain.c
+++ b/applications/main/nfc/plugins/supported_cards/plantain.c
@@ -310,9 +310,11 @@ static bool plantain_parse(const NfcDevice* device, FuriString* parsed_data) {
                 last_payment_date.year,
                 last_payment_date.hour,
                 last_payment_date.minute);
-            //payment amount. This needs to be investigated more, currently it shows incorrect amount on some cards.
-            uint16_t last_payment = (data->block[18].data[9] << 8) | data->block[18].data[8];
-            furi_string_cat_printf(parsed_data, "Amount: %d rub", last_payment / 100);
+            //Last payment amount.
+            uint16_t last_payment = ((data->block[18].data[10] << 16) |
+                                     (data->block[18].data[9] << 8) | (data->block[18].data[8])) /
+                                    100;
+            furi_string_cat_printf(parsed_data, "Amount: %d rub", last_payment);
             furi_string_free(card_number_s);
             furi_string_free(tmp_s);
             //This is for 4K Plantains.
@@ -369,9 +371,11 @@ static bool plantain_parse(const NfcDevice* device, FuriString* parsed_data) {
                 last_payment_date.year,
                 last_payment_date.hour,
                 last_payment_date.minute);
-            //payment amount
-            uint16_t last_payment = (data->block[18].data[9] << 8) | data->block[18].data[8];
-            furi_string_cat_printf(parsed_data, "Amount: %d rub", last_payment / 100);
+            //Last payment amount
+            uint16_t last_payment = ((data->block[18].data[10] << 16) |
+                                     (data->block[18].data[9] << 8) | (data->block[18].data[8])) /
+                                    100;
+            furi_string_cat_printf(parsed_data, "Amount: %d rub", last_payment);
             furi_string_free(card_number_s);
             furi_string_free(tmp_s);
         }
diff --git a/applications/main/nfc/resources/nfc/assets/mf_classic_dict.nfc b/applications/main/nfc/resources/nfc/assets/mf_classic_dict.nfc
index 0e7b62b47..9762732f5 100644
--- a/applications/main/nfc/resources/nfc/assets/mf_classic_dict.nfc
+++ b/applications/main/nfc/resources/nfc/assets/mf_classic_dict.nfc
@@ -1,65 +1,81 @@
-###########################
-#  Do not edit, this file will be overwritten after firmware update
-#  Use the user_dict file for user keys
-# Last updated 22 August 2024
-###########################
-# +-----------------------------------------------------------------------------------------------------+
-# | https://github.com/RfidResearchGroup/proxmark3/blob/master/client/dictionaries/mfc_default_keys.dic |
-# +-----------------------------------------------------------------------------------------------------+
+# Key dictionary from https://github.com/RfidResearchGroup/proxmark3/blob/master/client/dictionaries/mfc_default_keys.dic
+#
 # Mifare Default Keys
 #   -- iceman fork version --
 #   -- contribute to this list, sharing is caring --
+#
 # Default key
 FFFFFFFFFFFF
+#
 # Blank key
 000000000000
+#
 # NFC Forum MADkey
 A0A1A2A3A4A5
+#
 # MAD access key A (reversed)
 A5A4A3A2A1A0
+#
 # MAD access key B
 89ECA97F8C2A
+#
 # Mifare 1k EV1 (S50) hidden blocks, Signature data
 # 16 A
 5C8FF9990DA2
+#
 # 17 A
 75CCB59C9BED
+#
 # 16 B
 D01AFEEB890A
+#
 # 17 B
 4B791BEA7BCC
+#
 # QL88 keys
 # 17 A/B
 2612C6DE84CA
 707B11FC1481
+#
 # QL88 diversifed
 03F9067646AE
 2352C5B56D85
+#
 B0B1B2B3B4B5
 C0C1C2C3C4C5
 D0D1D2D3D4D5
 AABBCCDDEEFF
 4D3A99C351DD
 1A982C7E459A
+#
 # key A Wien
 D3F7D3F7D3F7
+#
 # key B Wien
 5A1B85FCE20A
+#
+#
 714C5C886E97
 587EE5F9350F
 A0478CC39091
 533CB6C723F6
 8FD0A4F256E9
+#
 # iCopy-X
 E00000000000
+#
+#
 E7D6064C5860
 B27CCAB30DBD
+#
 # lib / Nat Bieb
 D2ECE8B9395E
 # NSCP default key
 1494E81663D7
+#
 # NFC tools
-7C9FB8474242
+7c9fb8474242
+#
 # Kiev keys
 569369C5A0E5
 632193BE1C3C
@@ -69,56 +85,75 @@ D2ECE8B9395E
 B5FF67CBA951
 EFF603E1EFE9
 F14EE7CAE863
+#
 # ICT S14 A/B
 9C28A60F7249
 C9826AF02794
+#
 # RKF
-# Vasttrafiken KeyA, RKF OstgotaTrafiken KeyA
+# Västtrafiken KeyA, RKF ÖstgötaTrafiken KeyA
 FC00018778F7
-# Vasttrafiken KeyA
+#
+# Västtrafiken KeyA
 0297927C0F77
 54726176656C
-# Vasttrafiken KeyB
+#
+# Västtrafiken KeyB
 00000FFE2488
 776974687573
 EE0042F88840
+#
 # RKF SLKeyA
 26940B21FF5D
 A64598A77478
+#
 # RKF SLKeyB
 5C598C9C58B5
 E4D2770A89BE
+#
 # RKF Rejskort Danmark KeyA
 722BFCC5375F
+#
 # RKF Rejskort Danmark KeyB
 F1D83F964314
+#
 # RKF JOJOPRIVA KeyA
 505249564141
+#
 # RKF JOJOPRIVA KeyB
 505249564142
+#
 # RKF JOJOGROUP KeyA
 47524F555041
 434F4D4D4F41
+#
 # RKF JOJOGROUP KeyB
 47524F555042
 434F4D4D4F42
+#
 # TNP3xxx
 4B0B20107CCB
+#
 # Access control system
 605F5E5D5C5B
+#
 # NSP Global keys A and B (uk housing access control)
 199404281970
 199404281998
+#
 # Data from http://www.proxmark.org/forum/viewtopic.php?pid=25925#p25925
 # Tengo Cards Key A
 FFF011223358
 FF9F11223358
+#
 # Elevator system Kherson, Ukraine
 AC37E76385F5
 576DCFFF2F25
+#
 # Car wash system
 1EE38419EF39
 26578719DCD9
+#
 # more Keys from mfc_default_keys.lua
 000000000001
 000000000002
@@ -135,12 +170,17 @@ AC37E76385F5
 200000000000
 222222222222
 27DD91F1FCF1
+#
 # Hotel system
 505209016A1F
+#
 # Directory and eventlog KeyB
 2BA9621E0A36
+#
 # Directory and eventlog KeyA
 4AF9D7ADEBE4
+#
+#
 333333333333
 33F974B42769
 34D1DF9934C5
@@ -159,8 +199,11 @@ A00000000000
 A053A292A4AF
 A94133013401
 AAAAAAAAAAAA
+#
 # Key from ladyada.net
 ABCDEF123456
+#
+#
 B00000000000
 B127C6F41436
 BBBBBBBBBBBB
@@ -169,39 +212,57 @@ C934FE34D934
 CCCCCCCCCCCC
 DDDDDDDDDDDD
 EEEEEEEEEEEE
+#
 # elevator
 # data from forum
 FFFFFF545846
+#
+#
 F1A97341A9FC
+#
 # hotel system
 44AB09010845
 85FED980EA5A
+#
 # ARD (fr) key A
 43454952534E
 # ARD (fr) key B
 4A2B29111213
+#
+#
 4143414F5250
+#
 # Tehran Railway
 A9B43414F585
 1FB235AC1388
+#
 # Data from http://irq5.io/2013/04/13/decoding-bcard-conference-badges/
 # BCARD KeyB
 F4A9EF2AFC6D
+#
+#
 # S0 B
 89EAC97F8C2A
+#
 # S4 A
 43C7600DEE6B
+#
 # S6 A
 0120BF672A64
+#
 # S6 B
 FB0B20DF1F34
+#
+#
 A9F953DEF0A3
+#
 # Data from forum
 74A386AD0A6D
 3F7A5C2DBD81
 21EDF95E7433
 C121FF19F681
 3D5D9996359A
+#
 # Here be BIP keys...
 3A42F33AF429
 1FC235AC1309
@@ -235,50 +296,67 @@ D49E2826664F
 51284C3686A6
 3DF14C8000A1
 6A470D54127C
+#
 # Data from http://pastebin.com/AK9Bftpw
-# Lanstrafiken i Vasterbotten
+# Länstrafiken i Västerbotten
 48FFE71294A0
 E3429281EFC1
 16F21A82EC84
 460722122510
+#
 # 3dprinter
 # EPI Envisionte
 AAFB06045877
+#
 # Gyms / Fitness Clubs / Health Clubs / Wellness Centres
+#
 # Fysiken A
 3E65E4FB65B3
+#
 # Fysiken B
 25094DF6F148
+#
+#
 # https://mattionline.de/fitnessstudio-armband-reverse-engineering/
 # https://mattionline.de/milazycracker/
 # Gym Wristband A - Same as Fysiken A
 # Gym Wristband B
 81CC25EBBB6A
 195DC63DB3A3
+#
 # CleverFit
 A05DBD98E0FC
+#
 # GoFit
 AA4DDA458EBB
 EAB8066C7479
+#
 # Nordic Wellness A - Same as Fysiken A
 # Nordic Wellness B
 E5519E1CC92B
+# 
 # Jett's 24 Hour Fitness S0 KA/B
 # 049979614077
 # 829338771705
+#
 # Hotel KeyCard
 D3B595E9DD63
 AFBECD121004
+#
 # SimonsVoss
 6471A5EF2D1A
+#
 # ID06
 4E3552426B32
 22BDACF5A33F
 6E7747394E63
 763958704B78
+#
 # Onity  S1 A/B
 8A19D40CF2B5
+#
 3961EA82C46D
+#
 # 24-7
 D21762B2DE3B
 0E83A374B513
@@ -292,10 +370,13 @@ F101622750B7
 710732200D34
 7C335FB121B5
 B39AE17435DC
+#
 # key A
 454841585443
+#
 # Lift system
 190819842023
+#
 # Data from http://pastebin.com/gQ6nk38G
 D39BB83F5297
 85675B200017
@@ -321,9 +402,11 @@ FEE470A4CB58
 75EDE6A84460
 DF27A8F1CB8E
 B0C9DD55DD4D
+#
 # Data from http://bit.ly/1bdSbJl
 A0B0C0D0E0F0
 A1B1C1D1E1F1
+#
 # Data from msk social
 2735FC181807
 2ABA9519F574
@@ -350,6 +433,7 @@ B20B83CB145C
 9AFA6CB4FC3D
 A229E68AD9E5
 49C2B5296EF4
+#
 # Data from http://pastebin.com/RRJUEDCM
 0D258FE90296
 E55A3CA71826
@@ -363,16 +447,19 @@ EEB420209D0C
 1ACC3189578C
 C2B7EC7D4EB1
 369A4663ACD2
+#
 # Data from https://github.com/zhangjingye03/zxcardumper
 # zxcard Key A/B
 668770666644
 003003003003
+#
 # Data from http://phreakerclub.com/forum/showthread.php?p=41266
 26973EA74321
 71F3A315AD26
 51044EFB5AAB
 AC70CA327A04
 EB0A8FF88ADE
+#
 # Transport system Metromoney
 2803BCB0C7E1
 9C616585E26D
@@ -381,6 +468,7 @@ EB0A8FF88ADE
 A160FCD5EC4C
 112233445566
 361A62F35BC9
+#
 # Transport system Spain
 83F3CB98C258
 070D486BC555
@@ -486,16 +574,21 @@ DEDD7688BC38
 E9AE90885C39
 F0A3C5182007
 F3A524B7A7B3
+#
 # Data from mall
 # playland balikesir
 ABBA1234FCB0
+#
 # A trio bowling bahcelievler
 314F495254FF
 4152414B4E41
+#
 # karinca park nigde
 4E474434FFFF
+#
 # hotel system
 537930363139
+#
 # Data from https://github.com/RadioWar/NFCGUI
 44DD5A385AAF
 21A600056CB0
@@ -533,12 +626,15 @@ CBA6AE869AD5
 A7ABBC77CC9E
 F792C4C76A5C
 BFB6796A11DB
+#
 # Data from Salto A/B
 6A1987C40A21
 7F33625BC129
 6BE9314930D8
+#
 # Data from forum
 2338B4913111
+#
 # Data from stoye
 CB779C50E1BD
 A27D3804C259
@@ -565,9 +661,13 @@ D9A37831DCE5
 0FFBF65B5A14
 C5CFE06D9EA3
 C0DECE673829
+#
+#
 A56C2DF9A26D
+#
 # Data from https://pastebin.com/vbwast74
 68D3F7307C89
+#
 # Smart Rider. Western Australian Public Transport Cards
 568C9083F71C
 117E5C165B10
@@ -576,31 +676,41 @@ A56C2DF9A26D
 41F262D3AB66
 514956AB3142
 863933AE8388
+#
 # Bangkok metro key
 97F5DA640B18
+#
 # Metro Valencia key
 A8844B0BCA06
+#
 # HTC Eindhoven key
 857464D3AAD1
+#
 # Vigik Keys
 # Various sources :
 # * https://github.com/DumpDos/Vigik
 # * http://newffr.com/viewtopic.php?&forum=235&topic=11559
 # * Own dumps
+#
 # French VIGIK
 # VIGIK1 A
 314B49474956
+#
 # VIGIK1 B
 564C505F4D41
 BA5B895DA162
+#
 # BTCINO UNDETERMINED SPREAKD 0x01->0x13 key
 021209197591
+#
+#
 2EF720F2AF76
 414C41524F4E
 424C41524F4E
 4A6352684677
 BF1F4424AF76
 536653644C65
+#
 # Intratone Cogelec
 # Data from http://bouzdeck.com/rfid/32-cloning-a-mifare-classic-1k-tag.html
 484558414354
@@ -619,6 +729,7 @@ E64A986A5D94
 66D2B7DC39EF
 6BC1E1AE547D
 22729A9BD40F
+#
 # Data from https://dfir.lu/blog/cloning-a-mifare-classic-1k-tag.html
 925B158F796F
 FAD63ECB5891
@@ -634,8 +745,10 @@ CC6B3B3CD263
 703140FD6D86
 157C9A513FA5
 E2A5DC8E066F
+#
 # Data from forum,  schlage 9691T fob
 EF1232AB18A0
+#
 # Data from a oyster card
 374BF468607F
 BFC8E353AF63
@@ -666,8 +779,10 @@ A2ABB693CE34
 91F93A5564C9
 E10623E7A016
 B725F9CBF183
+#
 # Data from FDi tag
 8829DA9DAF76
+#
 # Data from GitHub issue
 0A7932DC7E65
 11428B5BCE06
@@ -694,14 +809,18 @@ E241E8AFCBAF
 # Transport system Argentina - SUBE
 # Shared key - sec 3 blk 15
 3FA7217EC575
+#
 # Data from forum post
 123F8888F322
 050908080008
+#
 # Data from hoist
 4F9F59C9C875
+#
 # Data from pastebin
 66F3ED00FED7
 F7A39753D018
+#
 # Data from https://pastebin.com/Z7pEeZif
 386B4D634A65
 666E564F4A44
@@ -733,24 +852,33 @@ F7A39753D018
 6F506F493353
 31646241686C
 77646B633657
+#
 # Data from TransPert
 2031D1E57A3B
 53C11F90822A
 9189449EA24E
+#
 # data from Github
 410B9B40B872
 2CB1A90071C8
+#
+#
 8697389ACA26
 1AB23CD45EF6
 013889343891
+#
+#
 0000000018DE
 16DDCB6B3F24
+#
 # Data from https://pastebin.com/vwDRZW7d
 # Vingcard Mifare 4k Staff card
 EC0A9B1A9E06
 6C94E1CED026
 0F230695923F
 0000014B5C31
+#
+#
 BEDB604CC9D1
 B8A1F613CF3D
 B578F38A5C61
@@ -759,35 +887,48 @@ B66AC040203A
 2E641D99AD5B
 AD4FB33388BF
 69FB7B7CD8EE
+#
 # Hotel
 2A6D9205E7CA
 13B91C226E56
+#
 # KABA Hotel Locks
 2A2C13CC242A
+#
+#
 27FBC86A00D0
 01FA3FC68349
+#
 # Smart Rider. Western Australian Public Transport Cards
 6D44B5AAF464
 1717E34A7A8A
+#
 # RFIDeas
 6B6579737472
+#
 # HID MIFARE Classic 1k Key
 484944204953
 204752454154
 # HID MIFARE SO
 3B7E4FD575AD
 11496F97752A
+#
 # Luxeo/Aztek cashless vending
 415A54454B4D
+#
 # BQT
 321958042333
+#
 # Aperio KEY_A Sector 1, 12, 13, 14, 15 Data Start 0 Length 48
 160A91D29A9C
+#
 # Gallagher
 B7BF0C13066E
+#
 # PIK Comfort Moscow keys (ISBC Mifare Plus SE 1K)
 009FB42D98ED
 002E626E2820
+#
 # Boston, MA, USA Transit - MBTA Charlie Card
 3060206F5B0A
 5EC39B022F2B
@@ -810,7 +951,11 @@ D58023BA2BDC
 2548A443DF28
 2ED3B15E7C0F
 F66224EE1E89
+#
+#
 60012E9BA3FA
+#
+#
 DE1FCBEC764B
 81BFBE8CACBA
 BFF123126C9B
@@ -823,8 +968,10 @@ D80511FC2AB4
 BB467463ACD6
 E67C8010502D
 FF58BA1B4478
+#
 # Data from https://pastebin.com/Kz8xp4ev
 FBF225DC5D58
+#
 # Data  https://pastebin.com/BEm6bdAE
 # vingcard.txt
 # Note: most likely diversified
@@ -842,16 +989,20 @@ FBF225DC5D58
 D9BCDE7FC489
 0C03A720F208
 6018522FAC02
+#
 # Data from https://pastebin.com/4t2yFMgt
-# Mifare technische Universitat Graz TUG
+# Mifare technische Universität Graz TUG
 D58660D1ACDE
 50A11381502C
 C01FC822C6E5
 0854BF31111E
+#
 # More keys - Found 8A at Sebel Hotel in Canberra, Australia
 AE8587108640
+#
 # SafLock standalone door locks
 135B88A94B8B
+#
 # Russian Troika card
 EC29806D9738
 08B386463229
@@ -908,9 +1059,11 @@ EAAC88E5DC99
 F8493407799D
 6B8BD9860763
 D3A297DC2698
+#
 # Data from reddit
 34635A313344
 593367486137
+#
 # Keys from Mifare Classic Tool project
 044CE1872BC3
 045CECA15535
@@ -972,6 +1125,8 @@ B1C4A8F7F6E3
 FF75AFDA5A3C
 FCDDF7767C10
 A6B3F6C8F1D4
+#
+#
 237A4D0D9119
 0ED7846C2BC9
 FFFFD06F83E3
@@ -1014,48 +1169,55 @@ A2B2C9D187FB
 17505586EF02
 022FE48B3072
 013940233313
+#
 # Hotel Adina
 9EBC3EB37130
+#
 # Misc. keys from hotels & library cards in Germany
-914F57280CE3
-324A82200018
-370AEE95CD69
-2E032AD6850D
-1FEDA39D38EC
-288B7A34DBF8
-0965E3193497
-18C628493F7F
-064D9423938A
-995FD2A2351E
-7C7D672BC62E
-217250FB7014
-AE7478CCAEE7
-ABBF6D116EAF
-05862C58EDFB
-E43B7F185460
-6A59AA9A959B
-B79E5B175227
-7BC9EBB8274B
-B2AFBF2331D4
-223E5847DD79
-640524D2A39B
-AEE297CB2FD6
-3DA5DFA54604
-0CF1A2AA1F8D
+914f57280ce3
+324a82200018
+370aee95cd69
+2e032ad6850d
+1feda39d38ec
+288b7a34dbf8
+0965e3193497
+18c628493f7f
+064d9423938a
+995fd2a2351e
+7c7d672bc62e
+217250fb7014
+ae7478ccaee7
+abbf6d116eaf
+05862c58edfb
+e43b7f185460
+6a59aa9a959b
+b79e5b175227
+7bc9ebb8274b
+b2afbf2331d4
+223e5847dd79
+640524d2a39b
+aee297cb2fd6
+3da5dfa54604
+0cf1a2aa1f8d
+#
 # most likely diversifed individual keys.
 # data from https://github.com/korsehindi/proxmark3/commit/24fdbfa9a1d5c996aaa5c192bc07e4ab28db4c5c
 491CDC863104
 A2F63A485632
 98631ED2B229
 19F1FFE02563
+#
 # Argentina
 563A22C01FC8
 43CA22C13091
 25094DF2C1BD
+#
 # OMNITEC.ES HOTEL TIMECARD / MAINTENANCECARD
 AFBECD120454
+#
 # OMNITEC.ES HOTEL EMERGENCYCARD
 842146108088
+#
 # TAPCARD PUBLIC TRANSPORT LA
 EA1B88DF0A76
 D1991E71E2C5
@@ -1089,6 +1251,7 @@ B81846F06EDF
 C6A76CB2F3B5
 E3AD9E9BA5D4
 6C9EC046C1A4
+#
 # ROC HIGHSCHOOL ACCESSCARD
 B021669B44BB
 B18CDCDE52B7
@@ -1120,8 +1283,11 @@ AE43F36C1A9A
 BE7C4F6C7A9A
 5EC7938F140A
 82D58AA49CCB
+#
 # MELON CARD
 323334353637
+#
+#
 CEE3632EEFF5
 827ED62B31A7
 03EA4053C6ED
@@ -1136,6 +1302,7 @@ A7FB4824ACBF
 00F0BD116D70
 4CFF128FA3EF
 10F3BEBC01DF
+#
 # Transportes Insular La Palma
 0172066B2F03
 0000085F0000
@@ -1169,6 +1336,7 @@ B1A862985913
 3B0172066B2F
 3F1A87298691
 F3F0172066B2
+#
 # Tehran ezpay
 38A88AEC1C43
 CBD2568BC7C6
@@ -1185,10 +1353,12 @@ D3B1C7EA5C53
 604AC8D87C7E
 8E7B29460F12
 BB3D7B11D224
+#
 # Chaco
 B210CFA436D2
 B8B1CFA646A8
 A9F95891F0A4
+#
 # Keys from APK application "Scan Badge"
 4A4C474F524D
 444156494442
@@ -1206,8 +1376,11 @@ A0004A000036
 2C9F3D45BA13
 4243414F5250
 DFE73BE48AC6
+#
+#
 B069D0D03D17
 000131B93F28
+#
 # From the DFW Area, TX, USA
 A506370E7C0F
 26396F2042E7
@@ -1224,7 +1397,8 @@ EF4C5A7AC6FC
 B47058139187
 8268046CD154
 67CC03B7D577
-# From the HTL Modling, NO, AT
+#
+# From the HTL Mödling, NÖ, AT
 A5524645CD91
 D964406E67B4
 99858A49C119
@@ -1232,33 +1406,44 @@ D964406E67B4
 C27D999912EA
 66A163BA82B4
 4C60F4B15BA8
+#
 # CAFE + CO, AT
 35D850D10A24
 4B511F4D28DD
 E45230E7A9E8
 535F47D35E39
 FB6C88B7E279
+#
 # Metro Card, AT
 223C3427108A
+#
 # Unknown, AT
 23D4CDFF8DA3
 E6849FCC324B
 12FD3A94DF0E
+#
 # Unknown, AT
 0B83797A9C64
 39AD2963D3D1
+#
 # Hotel Berlin Classic room A KEY
 34B16CD59FF8
+#
 # Hotel Berlin Classic room B KEY
 BB2C0007D022
+#
 # Coinmatic laundry Smart card
 # data from: https://pastebin.com/XZQiLtUf
 0734BFB93DAB
 85A438F72A8A
+#
 # Data from forum, Chinese hotel
 58AC17BF3629
 B62307B62307
+#
+#
 A2A3CCA2A3CC
+#
 # Granada, ES Transport Card
 000000270000
 0F385FFB6529
@@ -1276,6 +1461,7 @@ B385EFA64290
 C9739233861F
 F3864FCCA693
 FC9839273862
+#
 # various hotel keys
 34D3C568B348
 91FF18E63887
@@ -1283,6 +1469,7 @@ FC9839273862
 354A787087F1
 4A306E62E9B6
 B9C874AE63D0
+#
 # Data from official repo
 F00DFEEDD0D0
 0BB31DC123E5
@@ -1300,19 +1487,24 @@ B8937130B6BA
 D7744A1A0C44
 82908B57EF4F
 FE04ECFE5577
+#
 # comfort inn hotel
 4D57414C5648
 4D48414C5648
+#
 # unknown hotel key
 6D9B485A4845
+#
 # Bosch Solution 6000
 5A7A52D5E20D
+#
 # Found in TagInfo app
 # RATB key
 C1E51C63B8F5
 1DB710648A65
 # E-GO card key
 18F34C92A56E
+#
 # Library Card MFP - SL1
 4A832584637D
 CA679D6291B0
@@ -1328,6 +1520,7 @@ AADE86B1F9C1
 C67BEB41FFBF
 B84D52971107
 52B0D3F6116E
+#
 # Data from https://pastebin.com/cLSQQ9xN
 CA3A24669D45
 4087C6A75A96
@@ -1336,10 +1529,13 @@ D73438698EEA
 5F31F6FCD3A0
 A0974382C4C5
 A82045A10949
+#
 # Data from https://pastebin.com/2iV8h93h
+#
 # funnivarium
 # forum ankara
 2602FFFFFFFF
+#
 # macera adasi
 # ankara kentpark
 # INACTIVE
@@ -1347,16 +1543,20 @@ A82045A10949
 DFF293979FA7
 4D6F62692E45
 4118D7EF0902
+#
 # petrol ofisi
 # positive card
 # ode-gec
 0406080A0C0E
+#
 # konya elkart
 988ACDECDFB0
 120D00FFFFFF
+#
 # bowlingo
 # serdivan avym
 4AE23A562A80
+#
 #  kart 54
 2AFFD6F88B97
 A9F3F289B70C
@@ -1365,18 +1565,23 @@ DB6819558A25
 B16B2E573235
 42EF7BF572AB
 274E6101FC5E
+#
 # crazy park
 # kizilay avm
 00DD300F4F10
+#
 # kartsistem B
 FEE2A3FBC5B6
+#
 # toru ent
 # taurus avm
 005078565703
+#
 # Ving?
 0602721E8F06
 FC0B50AF8700
 F7BA51A9434E
+#
 # eskart
 # eskisehir transport card
 E902395C1744
@@ -1385,6 +1590,7 @@ E902395C1744
 D8BA1AA9ABA0
 76939DDD9E97
 3BF391815A8D
+#
 # muzekart
 # museum card for turkey
 7C87013A648A
@@ -1416,6 +1622,7 @@ D0DDDF2933EC
 240F0BB84681
 9E7168064993
 2F8A867B06B4
+#
 # bursakart
 # bursa transport card
 755D49191A78
@@ -1425,24 +1632,32 @@ DAC7E0CBA8FD
 0860318A3A89
 1927A45A83D3
 B2FE3B2875A6
+#
 # playland
 # maltepe park
 ABCC1276FCB0
 AABAFFCC7612
+#
 # lunasan
 # kocaeli fair
 26107E7006A0
+#
 # gamefactory
 # ozdilek
 17D071403C20
+#
+#
 534F4C415249
 534F4C303232
+#
 # Nespresso, smart card
 # key-gen algo, these keys are for one card (keys diversified)
 FF9A84635BD2
 6F30126EE7E4
 6039ABB101BB
 F1A1239A4487
+#
+#
 B882FD4A9F78
 CD7FFFF81C4A
 AA0857C641A3
@@ -1509,23 +1724,32 @@ F678905568C3
 540D5E6355CC
 D1417E431949
 4BF6DE347FB6
+#
+#
 3A471B2192BF
 A297CEB7D34B
 AE76242931F1
+#
+#
 124578ABFEDC
 ABFEDC124578
 4578ABFEDC12
+#
 # Data from
 # premier inn hotel chain
 5E594208EF02
 AF9E38D36582
+#
 # Norwegian building site identication card. (HMS KORT)
 # Key a
 10DF4D1859C8
+#
 # Key B
 B5244E79B0C8
+#
 # Ukraine hotel
 F5C1C4C5DE34
+#
 # Data from Mifare Classic Tool repo
 # Rotterdam University of applied sciences campus card
 BB7923232725
@@ -1550,6 +1774,7 @@ B5ADEFCA46C4
 BF3FE47637EC
 B290401B0CAD
 AD11006B0601
+#
 # Data from Mifare Classic Tool repo
 # Armenian Metro
 E4410EF8ED2D
@@ -1560,6 +1785,7 @@ D3F3B958B8A3
 2196FAD8115B
 7C469FE86855
 CE99FBC8BD26
+#
 # keys from Eurothermes group (Switzerland)
 D66D91829013
 75B691829013
@@ -1575,6 +1801,7 @@ FED791829013
 29A791829013
 668091829013
 00008627C10A
+#
 # easycard
 310D51E539CA
 2CCDA1358323
@@ -1582,6 +1809,7 @@ FED791829013
 562E6EF73DB6
 F53E9F4114A9
 AD38C17DE7D2
+#
 # SUBE cards keys (new)
 2DEB57A3EA8F
 32C1BB023F87
@@ -1609,6 +1837,7 @@ F5C1B3F62FDA
 3E6E5713BA10
 8B75A29D4AB2
 7E6545076619
+#
 # SUBE cards keys (old)
 4C5A766DFE3A
 32C6768847F5
@@ -1637,6 +1866,7 @@ BFE25035B0C8
 D5C172325DD3
 992B152E834A
 CE75D7EADEAF
+#
 # Russian Podorozhnik card (Saint-Petersburg transport)
 # may be combined with Troika
 038B5F9B5A2A
@@ -1668,16 +1898,21 @@ D27058C6E2C7
 E19504C39461
 FA1FBB3F0F1F
 FF16014FEFC7
+#
 # Food GEM
 6686FADE5566
-# Samsung Data Systems (SDS) - Electronic Locks
+#
+# Samsung Data Systems (SDS) — Electronic Locks
 # Gen 1 S10 KA/KB is FFFFFFFFFFFF, incompatible with Gen 2 locks
+#
 # SDS Gen 2 S10 KB
 C22E04247D9A
+#
 # Data from Discord, French pool
 # SDS Gen 2 S10 KA
 9B7C25052FC3
 494446555455
+#
 # Data from Discord, seems to be related to ASSA
 427553754D47
 # Keys found on Edith Cowan University Smart Riders
@@ -1688,7 +1923,8 @@ DDDAA35A9749
 # Mercator Pika Card, Slovenia
 97D77FAE77D3
 5AF445D2B87A
-# Vilniecio/JUDU kortele, Lithuania
+#
+# Vilniečio/JUDU kortelė, Lithuania
 # A
 16901CB400BC
 F0FE56621A42
@@ -1699,9 +1935,12 @@ FE2A42E85CA8
 F4CE4AF888AE
 307448829EBC
 C2A0105EB028
+#
 # Keys from Flipper Zero Community
 # Last update: Aug 13, 2022
+#
 # unknown if keys are diversified or static default
+#
 # Strelka Extension
 5C83859F2224
 66B504430416
@@ -1711,6 +1950,7 @@ C4D3911AD1B3
 CAD7D4A6A996
 DA898ACBB854
 FEA1295774F9
+#
 # Moscow Public Toilets Card
 807119F81418
 22C8BCD10AAA
@@ -1720,6 +1960,7 @@ DBF9F79AB7A2
 34EDE51B4C22
 C8BCD10AAABA
 BCD10AAABA42
+#
 # Moscow Social Card
 2F87F74090D1
 E53EAEFE478F
@@ -1762,6 +2003,7 @@ F750C0095199
 82DA4B93DB1C
 9CF46DB5FD46
 93EB64ACF43D
+#
 # Iron Logic RU
 A3A26EF4C6B0
 2C3FEAAE99FC
@@ -1780,8 +2022,10 @@ DEC0CEB0CE24
 413BED2AE45B
 D6261A9A4B3F
 CB9D507CE56D
+#
 # Armenian Underground Ticket
 A0A1A2A8A4A5
+#
 # Badge Maker Leaked from https://github.com/UberGuidoZ
 1A1B1C1D1E1F
 1665FE2AE945
@@ -1823,6 +2067,7 @@ D10008074A6F
 446176696453
 6F6674776172
 6520446F7665
+#
 # Apartment keyfobs (USA) (Corvette830)
 E60F8387F0B9
 FFD46FF6C5EE
@@ -1831,6 +2076,7 @@ FFD46FF6C5EE
 1C5179C4A8A1
 16CA203B811B
 11AC8C8F3AF2
+#
 # The Westin Jakarta Indonesia (D4DB0D)
 # Peppers Hotel Unknown location (D4D0D)
 6E0DD4136B0A
@@ -1844,9 +2090,11 @@ FC5AC7678BE3
 F09BB8DD142D
 B4B3FFEDBE0A
 540E0D2D1D08
+#
 # Schlage 9691T Keyfob (seasnaill)
 7579B671051A
 4F4553746B41
+#
 # Vigik ScanBadge App (fr.badgevigik.scanbadge)
 # Website https://badge-vigik.fr/  (Alex)
 0000A2B3C86F
@@ -1875,6 +2123,7 @@ B4B3FFEDBE0A
 9EB7C8A6D4E3
 A22AE12C9013
 AFC984A3576E
+#
 # Vigik verified by quantum-x
 # https://github.com/RfidResearchGroup/proxmark3/pull/1742#issuecomment-1206113976
 A00027000099
@@ -1892,28 +2141,37 @@ A00000043D79
 A00000000064
 A00025000030
 A00003000057
+#
 # BH USA 2013 conference
 012279BAD3E5
+#
 # iGuard Simple (and reverse) keys
 AAAAAAFFFFFF
 FFFFFFAAAAAA
+#
 # Random Hotel A Key Sec 0 Blk 3 - KABA Lock (VideoMan)
 3111A3A303EB
 # Transport system Uruguay - STM
 # Shared key - sec 0 blk 3
 D144BD193063
+#
 # Data from http://www.proxmark.org/forum/viewtopic.php?pid=45659#p45659
 3515AE068CAD
+#
 # Keys Catering
 6A0D531DA1A7
 4BB29463DC29
+#
 # Keys Swim
 8627C10A7014
 453857395635
+#
 # Unknown hotel system Sec 0 / A
 353038383134
+#
 # Brazil transport Sec 8 / A
-50D4C54FCDF5
+50d4c54fcdf5
+#
 # Bandai Namco Passport [fka Banapassport] / Sega Aime Card
 # Dumped on the Flipper Devices Discord Server
 6090D00632F5
@@ -1949,6 +2207,7 @@ E69DD9015A43
 C8382A233993
 7B304F2A12A6
 FC9418BF788B
+#
 # Guest Cashless Prepaid Arcade Payment Cards
 168168168168
 198407157610
@@ -1956,6 +2215,7 @@ FC9418BF788B
 4E4F584D2105
 686B35333376
 861861861861
+#
 # Transport System Cracow / Polen
 B071A76BA2E9
 B3A181BCA5F2
@@ -1967,8 +2227,10 @@ B75C4FA614AE
 42DC568C64F4
 # Data from "the more the marriott" mifare project (colonelborkmundus)
 # aka The Horde
+#
 # These keys seem to be from Vingcard / Saflok system which means they are diversified
 # and not static default keys.  To verify this, the UID from such a card is needed.
+#
 # 20230125-01, Elite Member Marriott Rewards
 43012BD9EB87
 # 20230125-02, Elite Member Marriott Rewards
@@ -2078,6 +2340,7 @@ D201DBB6AB6E
 # 20230413-94, Marriott
 09074A146605
 151F3E85EC46
+#
 # Travelodge by Wyndham Berkeley
 0000FFFFFFFF
 4663ACD2FFFF
@@ -2094,22 +2357,27 @@ EDC317193709
 A1670589B2AF
 # SF Hotel (SoMa area)
 2E0F00700000
+#
 # Unknown PACS from Western Australia
 CA80E51FA52B
 A71E80EA35E1
 05597810D63D
+#
 # Hotel Key from Las Vegas
 EA0CA627FD06
 80BB8436024C
 5044068C5183
+#
 # Key from Hotel M Montreal (probably diversified)
 7E5E05866ED6
 661ABF99AFAD
+#
 # Key from evo Montreal (probably diversified)
 1064BA5D6DF8
 # Hotel key
 CE0F4F15E909
 D60DE9436219
+#
 # ATM Area de Girona, spanish transport card
 A01000000000
 A02000000000
@@ -2141,6 +2409,7 @@ B12000000000
 B13000000000
 B14000000000
 B15000000000
+#
 # Pittsburgh, PA, USA - Pittsburgh Regional Transit ConnectCard
 A7AE4A5A33DC
 6B857B568C10
@@ -2174,11 +2443,14 @@ CE8BFF3728EE
 09938D05DA78
 EACDA4DBE420
 EC2B9FD483CA
+#
 # Hotel Intelier Orange - Benicasim, Spain
 # block 1 - key A
 04256CFE0425
+#
 # InsideWash Membership Card - Portugal
 C18063858BB9
+#
 # An apartment building in Sydney Olympic Park
 13254608D0AB
 24A2971BC0B2
@@ -2212,7 +2484,8 @@ C18063858BB9
 32B0A529CEC0
 22345517DFBA
 33B1A62ACFC1
-# Universidade de Sao Paulo (USP) student card
+#
+# Universidade de São Paulo (USP) student card
 17B50E38F1B0
 24E311F594CE
 3794FBFB1A54
@@ -2228,40 +2501,42 @@ D33673C19243
 D89A506542F2
 E5813CD228F1
 FAB943906E9C
+#
 # R.A.T.T transport card key A/B
 AA034F342A55
 456776908C48
+
 # BusFacil - Brazilian public transport card for some cities
-FAE9B14365A9
-C567DD4A6004
-C567DD4A6005
-C567DD4A6006
-C567DD4A6007
-C567DD4A6008
-C567DD4A6009
-C567DD4A600A
-C567DD4A600D
-C567DD4A600E
-C567DD4A600F
-5EF014EC5D7F
-5086052022AC
-BD6AF9754C18
-5D67D4732A7D
-17FE45604A04
-17FE45604A05
-17FE45604A06
-17FE45604A07
-17FE45604A08
-17FE45604A09
-17FE45604A0A
-17FE45604A0D
-17FE45604A0E
-17FE45604A0F
-# keys for swimming pool cards in Reykjavik Iceland
+fae9b14365a9
+c567dd4a6004
+c567dd4a6005
+c567dd4a6006
+c567dd4a6007
+c567dd4a6008
+c567dd4a6009
+c567dd4a600a
+c567dd4a600d
+c567dd4a600e
+c567dd4a600f
+5ef014ec5d7f
+5086052022ac
+bd6af9754c18
+5d67d4732a7d
+17fe45604a04
+17fe45604a05
+17fe45604a06
+17fe45604a07
+17fe45604a08
+17fe45604a09
+17fe45604a0a
+17fe45604a0d
+17fe45604a0e
+17fe45604a0f
+# keys for swimming pool cards in Reykjavík Iceland
 28220F14BEF0
 # key for Orkan keyfobs
 300724070486
-# key for Atlantsolia keyfobs
+# key for Atlantsolía keyfobs
 60FCB3C42ABF
 # key for hotel in greece
 722F24F0722F
@@ -2271,107 +2546,108 @@ BD6AF9754C18
 # upgraded to DESFire since January 2024
 # SKGT common
 # Sector 15, key A
-F618B3D7855A
+f618b3d7855a
 # Sector 15, key B
-F1AFA4DA949F
+f1afa4da949f
 # SKGT multi-use ticket
 # Sector 0
-67362DACE527
-633A010FA3C3
+67362dace527
+633a010fa3c3
 # Sector 1
-F93C98655B9C
-67EC0A47B0FB
+f93c98655b9c
+67ec0a47b0fb
 # Sector 2
-54A028818AC7
-B2E87E53C5A0
+54a028818ac7
+b2e87e53c5a0
 # Sector 3
-3E93CF0644B6
-79E12280E219
+3e93cf0644b6
+79e12280e219
 # Sector 4
-2204B9FBF033
-4537FD238C8E
+2204b9fbf033
+4537fd238c8e
 # Sector 5
-D1B44A9DF05F
-CFA526835A1F
+d1b44a9df05f
+cfa526835a1f
 # Sector 6
-21CC007AD81C
-C097D0A85446
+21cc007ad81c
+c097d0a85446
 # Sector 7
-D2268262710F
-730BB7B8B3DE
+d2268262710f
+730bb7b8b3de
 # Sector 8
-9FE7C5BE7DFF
-61AE2D920C79
+9fe7c5be7dff
+61ae2d920c79
 # Sector 9
-78FCD4470C50
-B638CAF7357B
+78fcd4470c50
+b638caf7357b
 # Sector 10
-0DC1DD7C8EA2
-4C6A6866B934
+0dc1dd7c8ea2
+4c6a6866b934
 # Sector 11
-03DE2CEB2EA1
-93E0118B21ED
+03de2ceb2ea1
+93e0118b21ed
 # Sector 12
-8FBCED387BF4
-F57CA95C6EDD
+8fbced387bf4
+f57ca95c6edd
 # Sector 13
-EF24FE3B4CF7
-8B44D303D62F
+ef24fe3b4cf7
+8b44d303d62f
 # Sector 14
-B1EA40B2CAA6
-3ABF8431003B
+b1ea40b2caa6
+3abf8431003b
 # Sector 15 - see above
 # SKGT personalised subscription card
 # Sector 0, 2, 16, key A
 # Sector 8-14, 17-39, key A
 # Sector 1, key A
 # blue
-F1DF0CA8948B
+f1df0ca8948b
 # yellow
-7747B4912984
+7747b4912984
 # Sector 3, key A
 # blue
-09D556D57A4B
+09d556d57a4b
 # yellow
-3ED158C6934E
+3ed158c6934e
 # Sector 4-7, key A
 # blue
-839DEDBFEC0D
+839dedbfec0d
 # yellow
-C694A9ED2F9E
+c694a9ed2f9e
 # Sector 15 - see above
 # Sector 0, 16, key B (blue)
-81D55F4551B9
+81d55f4551b9
 # Sector 0, key B (yellow)
-6E9A040C3C91
+6e9a040c3c91
 # Sector 1, key B
 # blue
-5B72C63FB416
+5b72c63fb416
 # yellow
-A3CDCED46371
+a3cdced46371
 # Sector 2, key B
 # blue
-87A61433D026
+87a61433d026
 # yellow
-9CD3A81F11AB
+9cd3a81f11ab
 # Sector 3, key B
 # blue
-7070D331360C
+7070d331360c
 # yellow
-836C790F6E2C
+836c790f6e2c
 # Sector 4-7, key B
 # blue
-7FE057787C4F
+7fe057787c4f
 # yellow
-FF59C6D13F88
+ff59c6d13f88
 # Sector 8-14, 17-39, key B
-536F6669614D
+536f6669614d
 # Sector 15 - see above
 # End of SKGT
 # Hanoi Bus Rapid Transit - 1/2/3 A
 AAAFBA10FC37
 C61F2C28DADF
 23AACA30CBF2
+#
 # Keys dumped from student ID (AGH Cracow - Poland), may be diversified
 # Need to be verified
 833E4F32589E
@@ -2398,8 +2674,10 @@ F8E385E5A2A0
 B27678B5C4AE
 D68D7EBB9551
 7AB63F082328
+#
 # Payment cards used by Eurest on certain campuses
 7E2BC58168EB
+#
 # Shower cards provided by Seijsener
 291A65CBEA7B
 344A359BBAD9
@@ -2413,12 +2691,39 @@ D68D7EBB9551
 ACD30DFFB434
 D1A27C8EC5DF
 F14D329CBDBE
+#
 # Hotel cards from Austria
 AB287B3B4903
 7B0DEDA7E162
-# +-----------------------------------------------------------------------------------------------------------------------------------+
-# | https://github.com/ikarus23/MifareClassicTool/blob/master/Mifare%20Classic%20Tool/app/src/main/assets/key-files/extended-std.keys |
-# +-----------------------------------------------------------------------------------------------------------------------------------+
+#
+#Metro Q transit cards from Huston, Texas
+373B72D34B80
+BF3FFC245C9b
+7D1D9E7CF8A7
+6A917BF357E6
+B1D461EC62CA
+C6BECABEBE8A
+66026782D435
+4547E34E40D9
+753897b99AAE
+1C36761E8ABD
+6D8FBD8CC524
+5A3274779706
+23F13602CC1A
+511C1C2C9804
+F8B2B926555E
+2593E37D9B2E
+41A1F17EE990
+64DD48AEDE88
+7915ED4D9903
+D139DD71DB92
+216D97D46E88
+D9D1C447E427
+911E789433CB
+93B43D689F85
+525A869053F1
+69B25667E0B4
+6AACA2D97645
 # UK London Office
 435DF6296EC4
 2338B4913222
@@ -2440,61 +2745,6 @@ CCB541598D72
 1988B5D48EC3
 892EEF0D30FB
 0FE5CE5CC640
-# +----------------------------------------------------------------------------------------------+
-# | https://github.com/UberGuidoZ/Flipper/blob/main/NFC/mf_classic_dict/mf_classic_dict_user.nfc |
-# +----------------------------------------------------------------------------------------------+
-# Spackular A/B
-# data from http://www.proxmark.org/forum/viewtopic.php?pid=45100#p45100
-7CB033257498
-1153AABAFF6C
-# Random Hotel A key sec 0 blk 3 - Hoist Group lock
-A2CA48CA4C05
-# Chelsea Harbour Hotel London by Cazagen
-485242F22BE0
-# 8668/RevKillj0y
-164EE10EFFFF
-193DFE0FA18E
-3D6F823FFFFF
-48C8852D15F9
-7213B13D02E0
-7ADD3D735725
-7F796F60FFFF
-8AC04C1A4E15
-9089B668FFFF
-AEF617B3D004
-AEF617B3D040
-C1F6C7B55F5E
-# Metro card Sec 001 Blk 007 key B
-EDA4BF3E7B04
-# Lime Fitness
-113355779933
-# Some employee badges and other interesting things
-4D4946415245
-2B29232D3624
-2D2F182C4024
-BE3C1BF60B37
-D156F66D38EC
-4A1094F378D8
-CB5ED0E57B08
-AE381EA0811B
-40454EE64229
-66A4932816D3
-B54D99618ADC
-08D6A7765640
-3E0557273982
-68C867397AD5
-4427385D72AB
-9B2C3E00B561
-120A7837BB5D
-B19A0664ECA6
-B456E1951216
-E87E3554727E
-8D96A0BA7234
-124F004321D3
-D881B675D881
-# +--------------------------------------------------------------------------------------------------------------------------------+
-# | https://github.com/flipperdevices/flipperzero-firmware/blob/dev/applications/main/nfc/resources/nfc/assets/mf_classic_dict.nfc |
-# +--------------------------------------------------------------------------------------------------------------------------------+
 # Volgograd (Russia) Volna transport cards keys
 2B787A063D5D
 D37C8F1793F7
@@ -2502,263 +2752,286 @@ D37C8F1793F7
 543071543071
 5F01015F0101
 200510241234
-# +----------------------------------------------------------------------------------------------------------------------------+
-# | https://github.com/DarkFlippers/unleashed-firmware/blob/dev/applications/main/nfc/resources/nfc/assets/mf_classic_dict.nfc |
-# +----------------------------------------------------------------------------------------------------------------------------+
-# FOOD REPUBLIC
-30C1DC9DD040
+#
+# Momentum-Firmware  20241201
+AC935925A876
+ADC169F922CB
+AD00EFD353E4
+AEF617B3D004
+AEF617B3D040
+AE381EA0811B
+AE683AC2A232
+AF2BFB44A4A5
+A2CA48CA4C05
+A2D5D7469472
+A23412F92811
+A64536FAC799
+A7127F539A16
+A8700E07A58F
 A9B9C1D0E3F1
-# Transport cards
-E954024EE754
-0CD464CDC100
 BC305FE2DA65
+BE3C1BF60B37
+B0A3212D47A5
+B0D58BF147B7
+B02094F92A71
+B1EEAA640EF6
+B19A0664ECA6
+B4FAE0FAD22E
+B456E1951216
+B48D7E4E508F
+B54D99618ADC
+B6728D9B95BA
+CA22AF33A19B
+CBC83E1548B4
+CB5ED0E57B08
+CC5F59A0CE0A
 CF0EC6ACF2F9
-F7A545095C49
-6862FD600F78
-72A0C485D3F7
-6A530C91F85B
-# RENFE MADRID (TRAIN) Extracted with detect reader
-701AA491A4A5
-12BA20088ED3
-# MISC KEYS FROM MY OLD ACCESS CARDS
+C1F6C7B55F5E
+C290A397F84A
+C34FAA1931CA
+C49C9BF59547
+C497C3BE8273
+C7D1CB6774B0
+C789E4568B99
+C992F85B2DDD
+DCD003CF0EA3
+DD30A13519C3
+DD6E74174648
+DE5865F29C44
+DF7C4EC20B50
+D017A84BB582
+D156F66D38EC
+D3AEB15D410B
+D324152F5BB0
+D3849E31EE4F
+D410EFF9113E
+D51BCA1DFFFF
+D6818C29ED9B
+D7142E0F6D0D
+D881B675D881
+D9762D114AE5
+EA19E58DD046
+EA4987F8D096
+EB9D9C1B03F6
+EDA4BF3E7B04
+EDC9CC9109A2
+EEF144866688
+E10F0E7A8DD5
+E108EA397A9A
+E24359F37FE4
+E3007FA4F781
+E5051FAB4371
+E861FDE1B59F
+E87E3554727E
+E9B376925A00
+E954024EE754
+FA4D2B3BAFEA
+FA8CA10C7D59
+FE98F38F3EE2
 F18D91EE3033
+F3E3F9F977B9
+F4756F7EEAE1
+F654D6C7004F
+F697E87E759D
+F7A545095C49
+F833E24C3F1C
+0CD464CDC100
+0D61BA88789C
 0E726E11CFCC
-1D14130D1A0B
-201106141030
+0FC4B1D2EBBA
 01E2C14F1B18
+02DB253DC0C7
+03A7AAAA28AD
 0380293A9E6D
+0402B44FB679
+050BF33DC217
 08A55BC96DC1
+08D6A7765640
 08ED3F92AA53
-0D61BA88789C
-190E6242CE7B
+09F4EC8D7A66
 1A8CFF2F1BC7
+1C000EB0752F
+1D14130D1A0B
+1E13EFF32CE2
+101209170A13
+11DDA4862A1C
+113355779933
+1153AABAFF6C
+12BA20088ED3
+120A7837BB5D
+1202165D4EAB
+122F595302AA
+124F004321D3
+132F641C948B
+14CD299DC0C7
+141DF3B1C017
+1415FFFED68D
+15B35D0BF715
+156EED7C5F9D
+1581C317B073
+164EE10EFFFF
+16785FD65BA7
+17C06D19E92F
+17E0FA2308FD
+1719EB5DAC66
+19BA6776233F
+190E6242CE7B
+193DFE0FA18E
+2B29232D3624
+2CAD8A83DF28
+2D2F182C4024
+2EAD4DD0F7B0
+2FA9B556A4F6
+201106141030
+202011F918A2
+204C0D3DCD9A
+20525276F443
+215E9DED9DDF
 25FE2B4E4FA9
+251BDBF1C71D
+251780F9FBE6
+25467EB0212F
+280FD37AD407
+280713CBA260
+286A8893AC6F
+3D6F823FFFFF
+3E0557273982
+3F41891454EE
+30C1DC9DD040
+310308EC52EF
 321803E38664
+32774E46C64F
+330075000850
+3333F411AAAA
+334E91BE3377
 381F84DB8134
 38540EEE8B1C
+4A1094F378D8
+4A6E1CAD6D3D
+4C44200BC9C5
+4D4946415245
+40454EE64229
+41CD3CD99DD5
+4149206E9BAE
 42F82DB5C4AF
+4204784B0DC9
+43204334546F
+439FB891279F
+44ACB624CA14
+44B61F116125
+4427385D72AB
+444E4650475A
+45450AC8DCA8
+45524DACC5E9
+45574D373B9D
+475A444E4650
+4752533E1965
+48B390984150
+48C8852D15F9
+4844426F6E69
+485242F22BE0
+49EE8D52AAB6
+49FEE42DDC18
+49414556EF4D
+5AD3FC074A4C
+5A15888F3419
+5A2050DA7E3F
+5A4920FD6F87
+5CD02DAD8ADE
+5C475D2C70C6
+5D819B4BFAF3
+5E696FA0EAD1
+5FA28B8E8BA4
+5F8892561BED
+505209266A1F
 507A6181E4BF
+538BF58687EB
+544954CBB2C4
+54546255CDE9
 549BB4FD70C4
+552049EFF3F4
+55213B4F7328
+555D8BBC2D3E
+56A4B81B3FC3
+5669C363A4A5
+57E39104CC87
+570FB865D650
+5703815494EF
 57059FFD3EE6
-5E696FA0EAD1
+58DBC850A4D5
+585462E190F2
+5990EC1571D7
+6AC79644E0CD
+6A530C91F85B
+6A86C1895A21
+6C4953590463
+6C79548B3FC3
+6D2BF79566A8
+60D53F070572
 6036F9D72D68
+61152534ACEF
+62616E616E61
+66A4932816D3
 6611DFFAAE32
-6AC79644E0CD
-735DD20237A9
-79E8B59A51E0
+68C867397AD5
+6862FD600F78
+7ADD3D735725
+7AEB989A5525
+7BF0BE85080F
 7B6C00CBAC92
+7CB033257498
+7C20975C6EC9
 7C3AF198425F
-81C0BBCE32E9
-8D2B780A148D
-9001D0E23F8C
-A8700E07A58F
-AE683AC2A232
-B6728D9B95BA
-C290A397F84A
-CA22AF33A19B
-CBC83E1548B4
-CC5F59A0CE0A
-D410EFF9113E
-DE5865F29C44
-E108EA397A9A
-E10F0E7A8DD5
-F833E24C3F1C
-FA8CA10C7D59
-FE98F38F3EE2
-# 1k UNKNOWN
+7EDAE7923287
+7F796F60FFFF
+701AA491A4A5
+72A0C485D3F7
+7213B13D02E0
 722538817225
-# 1k FAIRFIELD INN & SUITES MARRIOT
-7AEB989A5525
-215E9DED9DDF
-334E91BE3377
-310308EC52EF
-# 1k millenium hotels
-132F641C948B
-# 1k MOXY HOTELS
-9EE3896C4530
-# 1k HAWAII HOTEL
-2CAD8A83DF28
-555D8BBC2D3E
+7246FCE86427
+735DD20237A9
+746A70C4EF6F
 78DF1176C8FD
-ADC169F922CB
-# iq aparts hotel
-505209266A1F
-# +------------------------------------------------------------------------------------------------------------------------+
-# | https://github.com/Flipper-XFW/Xtreme-Firmware/blob/dev/applications/main/nfc/resources/nfc/assets/mf_classic_dict.nfc |
-# +------------------------------------------------------------------------------------------------------------------------+
-##############################################
-# STB - keys from Bucharest Public Transport
-# Found with FlipperNestedRecovery by Z3r0L1nk
-330075000850
-2FA9B556A4F6
-91B1B62402D5
-9AE05868233F
-6D2BF79566A8
-60D53F070572
-09F4EC8D7A66
-D017A84BB582
-1719EB5DAC66
-96AECCC0F7EB
-A64536FAC799
-7BF0BE85080F
-E9B376925A00
-44B61F116125
-E861FDE1B59F
-5CD02DAD8ADE
-5FA28B8E8BA4
-C497C3BE8273
-B1EEAA640EF6
-1E13EFF32CE2
-D6818C29ED9B
-050BF33DC217
-41CD3CD99DD5
-02DB253DC0C7
-25467EB0212F
-DF7C4EC20B50
-5703815494EF
-9F14D35BAC08
-F697E87E759D
-D9762D114AE5
-AC935925A876
-5AD3FC074A4C
-19BA6776233F
-EEF144866688
-C34FAA1931CA
+79E8B59A51E0
+8AC04C1A4E15
 8A0DFD9B7AEA
-D3AEB15D410B
-251BDBF1C71D
-286A8893AC6F
-6A86C1895A21
-D7142E0F6D0D
-B0A3212D47A5
-1581C317B073
-8EF0AA6432FA
-AD00EFD353E4
-439FB891279F
-141DF3B1C017
-58DBC850A4D5
-14CD299DC0C7
-B48D7E4E508F
-32774E46C64F
-61152534ACEF
-280FD37AD407
-C789E4568B99
-122F595302AA
-84A3FD4BA0C6
-B0D58BF147B7
-15B35D0BF715
-##############################################
-# Metrorex - keys from Subway Bucharest Public Transport
-# Found with FlipperNestedRecovery by Z3r0L1nk
-7246FCE86427
-1415FFFED68D
-8C524B535E1D
-0FC4B1D2EBBA
-280713CBA260
-EDC9CC9109A2
-DCD003CF0EA3
-DD30A13519C3
 8A35039F6CD6
-538BF58687EB
-E3007FA4F781
-F654D6C7004F
-7C20975C6EC9
-C992F85B2DDD
-156EED7C5F9D
-16785FD65BA7
-A2D5D7469472
-585462E190F2
-FA4D2B3BAFEA
-251780F9FBE6
-EA4987F8D096
-48B390984150
-EA19E58DD046
-1C000EB0752F
-96227EDADBCF
-3F41891454EE
-7EDAE7923287
-11DDA4862A1C
-# +------------------------------------------------------------------------------------------------------------------------+
-# | https://github.com/Next-Flip/Momentum-Firmware/blob/dev/applications/main/nfc/resources/nfc/assets/mf_classic_dict.nfc |
-# +------------------------------------------------------------------------------------------------------------------------+
-##############################################
-# BG Hotels - keys from Bulgaria
-# Found with FlipperNestedRecovery by Z3r0L1nk
-8000806B5072
-8430A669558C
-1202165D4EAB
-B02094F92A71
-0402B44FB679
-A23412F92811
-# +---------------------------------------------------------------------+
-# | https://github.com/Stepzor11/NFC_keys/blob/main/mf_classic_dict.nfc |
-# +---------------------------------------------------------------------+
-##############################################################
-# Last update: 01 August 2024
-######################## COMMUNITY ###########################
-570FB865D650
-5669C363A4A5
-03A7AAAA28AD
-101209170A13
-6C79548B3FC3
-AF2BFB44A4A5
-56A4B81B3FC3
-62616E616E61
-3333F411AAAA
-4204784B0DC9
-D324152F5BB0
-A7127F539A16
-D51BCA1DFFFF
-C49C9BF59547
-EB9D9C1B03F6
+8C524B535E1D
 8DF64AB19A16
-57E39104CC87
-93FB38FE585A
-8380ACDC017E
-907E5C641D94
+8D2B780A148D
+8D96A0BA7234
+8EF0AA6432FA
 80003D23C6F5
-5A15888F3419
-4A6E1CAD6D3D
-5990EC1571D7
-49EE8D52AAB6
-5D819B4BFAF3
-DD6E74174648
-17E0FA2308FD
-746A70C4EF6F
-D3849E31EE4F
-F3E3F9F977B9
-55213B4F7328
-44ACB624CA14
-B4FAE0FAD22E
-E5051FAB4371
+8000806B5072
+81C0BBCE32E9
 81D6CC146E50
-6C4953590463
-5C475D2C70C6
-45574D373B9D
-49FEE42DDC18
-F4756F7EEAE1
-E24359F37FE4
+8380ACDC017E
+84A3FD4BA0C6
 840C16869171
-5F8892561BED
-C7D1CB6774B0
-444E4650475A
-475A444E4650
-2EAD4DD0F7B0
-######################## OTHERS ##############################
-45450AC8DCA8
-49414556EF4D
-204C0D3DCD9A
-45524DACC5E9
-202011F918A2
-43204334546F
-5A2050DA7E3F
-4C44200BC9C5
-4844426F6E69
-4149206E9BAE
-54546255CDE9
-552049EFF3F4
-20525276F443
-5A4920FD6F87
-544954CBB2C4
-4752533E1965
-17C06D19E92F
\ No newline at end of file
+8430A669558C
+9AE05868233F
+9B2C3E00B561
+9EE3896C4530
+9F14D35BAC08
+9001D0E23F8C
+907E5C641D94
+9089B668FFFF
+91B1B62402D5
+93FB38FE585A
+96AECCC0F7EB
+96227EDADBCF
+#
+# BW Kantine
+56cf3acd90ca
+542089792be2
+5420aeada758
+#
+# CSC Laundry
+212223242555
+717273747555
+#
+# Hotel cards, BETECH brand, Vietnam
+AAC34D9A4E65
+#
+# Dutch Statistics Agency (CBS)
+DC7B15AA0938
diff --git a/applications/main/nfc/scenes/nfc_scene_mf_classic_update_initial.c b/applications/main/nfc/scenes/nfc_scene_mf_classic_update_initial.c
index 7c76260b4..a477a08b9 100644
--- a/applications/main/nfc/scenes/nfc_scene_mf_classic_update_initial.c
+++ b/applications/main/nfc/scenes/nfc_scene_mf_classic_update_initial.c
@@ -34,7 +34,7 @@ NfcCommand nfc_mf_classic_update_initial_worker_callback(NfcGenericEvent event,
         uint8_t sector_num = 0;
         MfClassicKey key = {};
         MfClassicKeyType key_type = MfClassicKeyTypeA;
-        if(mf_classic_key_cahce_get_next_key(
+        if(mf_classic_key_cache_get_next_key(
                instance->mfc_key_cache, &sector_num, &key, &key_type)) {
             mfc_event->data->read_sector_request_data.sector_num = sector_num;
             mfc_event->data->read_sector_request_data.key = key;
diff --git a/applications/main/subghz/helpers/subghz_custom_event.h b/applications/main/subghz/helpers/subghz_custom_event.h
index a1bc99998..2d2fabd75 100644
--- a/applications/main/subghz/helpers/subghz_custom_event.h
+++ b/applications/main/subghz/helpers/subghz_custom_event.h
@@ -90,6 +90,7 @@ typedef enum {
     SetTypeAllmatic868,
     SetTypeCenturion433,
     SetTypeMonarch433,
+    SetTypeJollyMotors433,
     SetTypeSommer_FM_434,
     SetTypeSommer_FM_868,
     SetTypeSommer_FM238_434,
diff --git a/applications/main/subghz/resources/subghz/assets/keeloq_mfcodes b/applications/main/subghz/resources/subghz/assets/keeloq_mfcodes
index 23b7a031a..97e1aab47 100644
--- a/applications/main/subghz/resources/subghz/assets/keeloq_mfcodes
+++ b/applications/main/subghz/resources/subghz/assets/keeloq_mfcodes
@@ -1,61 +1,62 @@
 Filetype: Flipper SubGhz Keystore File
 Version: 0
 Encryption: 1
-IV: 46 75 72 72 79 20 63 68 65 63 6B 20 3F 3F 21 21
-3FF98B52C38558ECDB26C3E86D118FAC9AF22EDDDE7649CB53726855CEBCCF9E
-06B901C6E36E381B4A83554ED972288977F999C232106D337C3BE4A9A44608F8
-8153E6CAF4B272BA0EA168B9F0F29CF02CEB33E4ABBD4D5C858D1ADBFF474A25
-F61216CE3A7E500E0C9B2173F91C2E7B1BB7D7AA65D4150EAC28169116647DDD
-A3ABC262415035A190447EC9C15CFD1AB1720560AB7C82D7447215342305299732776A9A6DEA4D359C52A23BFCE6B015
-5784D0E77A55E1361F47A1F6CFFBFAF715CFCAD2BD502ED266AA86DC47F98541
-E082BF64C75023F23FB333C53F2590F408FD932EB71DF4ED4D0E0EAF2AEBD488
-EFF328889D57D9F4B9111918F9C9BC641645104223009842FFF7B6F73E24E5B7
-BDCD1DBCBCA789C5A5C3623C0A287D791F1CACCBBD7D144E2EF1F92DA5513D90
-6310362BE6ED7CB5E3F4CA84D3093DF620BABD2C9D419A2BA5AA05F241EE7592
-4C6F97C553276D5403103A6BA6C4DBBE017A9E4159E6E5AC4C28ACD645DB1E8D4551CDC228A0457BEEF49179A081E1FD
-861ECA071AEEF3854005FEC9BF22C7DB76D07B7930968314FFAC70995E28680E473F8A1A7E56E8776EDD1C6E2DD6DD26
-55ADDFBE97BCB0FB43EDEB9CAFF9F32DD788A6306D3702BC2923DA5C69F5F0A5
-AB838DA2B25547AA43DEB7FB40B15E289B9209057BE564E7CB78F0D5DCFC65FD
-21BACE924E522AD0E97F0AAF64A9DB6A5F7BA09B3A1759AAFD4016F3ADD4353D
-4B37D449E44BAE7F377EE5CE52E94882E42617417F77ECE9803D9435892167F2
-E63BA93D98BB3EEEAD34B38C5F271FB777AEABD9E6A05597AE09815E578AA811900AE9F144FBEC7DBFDDEC87D1ED368B
-7DF24DCB7D73F1638FFD22325463B23C101653EE770F086D323BE90868A7E267
-18E533990C408061309323675116429652B3F4D228F00D704310E7AB26F6BAF4
-26042EC21D73490D9E7F968EDCC4CECF3989E6E982427DEB7012478E214CED8797A9BEBC481C81E9646214809A409B4A
-AC4169C26E402720F1E2A0AD690AE2CF708CE203898BC7102178A738C70F361718E794F0D0CB1A2F1938EF35CCA11887
-6962CADB9BD1B86B779DF7F4D7E06E92EB42474C7FD9EA23879F9982D7127357
-23AEC0F6F9FF529DDDCD1CDAA77F7B136CE2CCD3AC8B949954D5D3B2ECFA8CBC
-C6A3A849BC4A8DB438065255BD387DCD77AD7E7FEB3B0E11B6D3A43279AB9087
-CCB71F8BDC8B31F36D6141B3B57BF31B7EDF72B87593B7497871F5738A0B7E00
-345FE0FAD3F60C017D9793406981878EA2226072D624208AC33682793B415C41
-78AF1FCFDB780744708DBB547F7C3F095BA5FAFB34FA83BF4323B32829836ED1
-C2F19F077E71E710D39F5F11C1FE55C2A3CD6F33384CD8603288765F266F1BDF
-084B1A9565AFC88900D0FF25413E659E17AAB649DB2B7A9F0381CB0DF6D2B8E5
-568CECD994676CF3D6B225DEF21D40787DCB41C101F52B0C5AA43ED66709D158
-0742E0AAB6504AC63A9C59FBDD980BD4C4760EFF3E556C8A6241442CDDD23A74
-37BB60EE11BEC7D25A607DE9B0B6D3EAD23321AFEB94995FAB42184A95D1CADA
-42FD71B98A3BEE9CF372B03E158D51181BFAA9CF54F7300A93FE7665402B3D1F
-9346B7D12346E264E84F91145EBF86C53DD0061E0FA6556FAE5F6FBB8CEB799E
-430B0D7FC09C09051AEB667A370E6D9D9BDF0C0C553AD2791682D43CE5DC48B7
-5BBB5129797BC07CDC1D25A8A919A637B9FFF2F920BD42D1721018ABF8D34959AF877AFF450AD91548184E1A0D991CC8
-0BC8D3E1C2D9A8FB445FC55564471007A28C09C9CE602203176F1BFF02AC6328
-1C4CA912791BCD9CB231C64AB479AF240D02EC9F431D7C479B9A172E5B97F5CD
-15A9CDF17E72255DE0942C09E67CD251C3D465246845F9C0B97A7EFEE4AF9110
-F95543395BFF39B0A093AC80D0EF1BEFA218A3769D074250414D1357105A4D34
-138D433824E691C6B67A08CF1DDE55FBCA2D65AC0B7D9320EA1FDCB1742B11BF
-3BE3A385F1C0B8922C4E23EFF6912748DF715A4546CECB5E8972C1D1E47D0D3A
-9ECA2554ED36700326F2E5140C434ADA8DFF55A53382F19541E9AAE45DA5CBF2
-5C75D528678AF199E191C49F310913F401014F97EEA5FA507C7310B48A98FDE3297EA398B08959951FF99EDDB64C5E0D
-22A9C66645B3944925A496D9F2312429CC787B6314948B482EAD9360124F59DA
-DA3A8571664DBBFC1DE97B53E7C141554A2FBCEBA980696D32409CC5ADB7FC41
-20A52AABC518FCC2FC75AE3F5CC7C4838AA4973111DA696B890D884A18098D91
-EBB7163F580A1A5D26F12FBE650A227791193BA9AFCE277584B171F2FE1C77CF
-86369EE5277CB81B9417B6232F8D994FAEAB34D0D5363B143257C62B10CACAFD
-2E2EAB32891E172A3C31D434703480E69793435BB198E6AA06AA066EE8234D85
-745FC576D77C41BAEFF15A822E6B4058A485A2CAA0A3B283928D17AC02299AD9
-1FF8D49F2F7D785D64B6FE365CD9C2BD958E9527F66BB8A85C9AEBC73ECFE064
-3CFB77F3E274C1EB2772CDFA7B5B17255C2554198BE60C058A3405AEC644FABC5AAECC8F9C7F4A4E5B2D5252E8C62628
-AE514C44B55A1A4744E1106FD226C587D1B71CA7B5DCF010265D769E22012866
-2B2D787A4B0F30CAB9CD3DBC7686165637F091B31745CAB53B369A804F76F9EE
-EA4279C80F0B4AC0B32AB9E8B8CFB9C25FF81840BEE65B2160F85E56FA576C48
-E41D853750D68643E929F94F46BCDC050040935883E9A0C45BB238CDE06340DD745BDA7D6C16AE2B028E073EDDC0FC49
+IV: 46 75 72 69 20 63 68 65 63 6B 20 4F 77 4F 21 3F
+796353C129CC2B688FE158D36E82001F7450D58DD763BCF4D6FA1CE6C3D598EA
+1E7DDEB3B54A42B8993C32AF209CBCC9A1137CE334449F016B993D673EB15C69
+F9CB2DDC4E3D45694292C7DE45F1DC0BD74235B36F624AF39E8C3D211A713408
+538F46EF4250801434FEA469EE07E8C8BF71C6179442718A05455BB501D797C4
+F2BF384DBF7F828E025F020E47D1D637B497FB470444F0C6F9DC67C6830EDDE8A26A6EE89A321D3924D9099895AB2EA1
+2CA8A8A4866D5C2B715B520F641B41355A81BA73170842233806D8AA3E3F3D62
+80CF5DEF931CF902EE602319F7CD506D42E5FBC06ABBF9F05D474C8E8A2AAC4E
+15CB465F7A646226C987BB4928E92A61F350ADCDDE355B717730ADDD1B738950
+86B7597ED3EDF6826124ABD7AE419197DC4A93FA064179ACAD853EC670F93995
+28263A286F1ADA0E851E8A27AFD7706CF3513D8A24D41CF7E24A925FE3D86305
+AF29A08AB877F12681706D71B82B8E2447DA18EBF9731EF3CE91FA5ECAC4E98F8FDC817E0F67C3D7348DD2AF128F1E62
+A675C5BB6AC41336B5F5A27FC062FBF30DC39B1E5C498F0FD823261C3177FA58416C5402554742370CB0DAFD2895F6F8
+0073790C26BD0224F5560161A4D4C4F8E05498E995FD2BF12EA9926A5127E9A5
+235ADFE253B51260DCF5C66F9CB9602B91A0C57BE14D1BE1E11EB309643B29DB
+F9C2E3A926AAA108F474075F0B4EDFF3135492B1529EAB150CF78E748BF36E17
+50F442CC9D90B9FF8C786245EC442B911A28A04D829D0E45D7D2D4C5A3F5B864
+9EA00CD21C0BE1BB15A0CAD31097A44CAF42868F259E8ED25F361986C26161514FA85D78F3889B4185D2A1484C1DA88C
+52DFE7D9052F29071922876723C30CF6FE6247D6439590C5C7C0493120ACA096
+D5AF176D59779A92F6EFB34F271D76D60780C3EA83306326E0119CD3B0417687
+C4CC4E589CCCEC609B4DE39F926F83CCFFCC966871B9A998514910A3F59E86FB56C476DFFB4181E3D22E86A760C4C137
+50A64FEDA64B61A5C123906426EF726D98AC70C15F38245A931B5649F0944930679513D9862091275F10A804EBB610DE
+E7938C4F32E571582D73F855ACC40FF0153EFBAB6D184F2DBE8EAC63C4276D92
+7667993F35F1363C0A3AEB5222F07F91904B3F6FA375BF062B269B09706764CB
+9DF764EE4A70D331BA8870F4D27C3E90E811A5E306BC72701A99A0377AC7B189
+324D0FBC096A489983C45E82B2745A83A3725A87D2D2CA676A521075065D5047
+8EA1A30AE08CEBD03A52EB2512C7C69CB824E0B9BE900E25F15FAB17ADBB1188
+CE379182103FC4E0442745F6F202AB6ED8EBC051B5F5537916938D9DB8FCD6BE
+752BD22AA37D030C60E48CB57309AF631682AC4A0D67C3A7D1130EB056717FB6
+9ECFE7D24BF25BD543E1EAE8116D95C110BD4514EE279BCA71234865EB9166BD
+14B3FA8704BA3B284C65F1A6FD114E53B883E12EAFB24B574F84585BD20157DA
+D026E1E2CA70E33291482EEFCE11123540BBF591D400C92CEBB8CAF99A9DE882
+88E618EF5E76D1F5A60926D48D3D58FF67B4A92DE6EECA271EDAFC2419AE787B
+74E14AD8ADE2BC575048325D1B3990669CDB35D840169B913043DAC938862AE4
+BEB5388B6A7D5C9EF65BDD7577D1DD654B7FAECE5A4CF0937BB7D0C0C5494CD0
+761356D494E3C947CBDCA887A30071A675FE1BE6E77FC9016DB9B5659B7FF9E7
+7503725DFC7212F5F719AFC9DF29F07321511BE4896E12D1D10C68BB07C6483A2CE5FFDFD074CFC279E42E6DD860C496
+BD03D78399DE44449AEE9F00EBCABBF419EDEA1701B9979A97D57AECB5139D1E
+E80EB84DF9DA2E34B78F50D6488A30F8EFD11E7C6DBEB7CFEDE83BE5CA86B6DF
+9332A130138F2AC11A12030CF43EFF77E7CABE761EDE14748112E13267496CE9
+E657F3C95EEF0AF92A5C49F66BD9C053A82493C7D6267F1E7C038473AE488116
+6F37491FFE130F90B77D7E5EA4AA75A1DB0CA3644F68B6502DFC302DDB80367B
+3B37C5CCDD510873628D92B352907FEFF0AC2B38C751C2E46C3B97C3E365972B
+A4C845187BEC75669234EE07B839DCFF618678D2EAA5596350F0936A400099A5
+2C961EF4F2454771B2646ECBAA1D0B7DAA2FD8ECC7228037A36E24FE30C43ABAA446C1B5968C0E2DD141C55557A4CCB8
+C4E0D43E9670C2B91F6AF03D60F216625CC19C697331BC443194D2BB88E042DF
+3DC5584F43061AF79907D6342DF3344435B5AA6277B33D7DC56C429D1EB81BC4
+D9186791E907CBB9EF26EDDAEA9F0DBC8D24E213E55942ED5E1790B5A55F8758
+2B54CB727BBFD8567543448D2D24B3865329F89936D3B035ED2185BA88F1DF2E
+A08F0D881AF001E52FF2CF9D232A9A566EB1900B351AFEEFEE666BEC40588F64
+46A11CA89BA1998A247275EEDF504DAFC5F97B41DFF4943F531A9F8F43DF19C5
+EF70A3858E84B13DF606317381B2E9DFFC346E96AF7C1DF0001586B8BF35808F
+38EAF18DB8096C7427EBD36CBC5B0E945A3286278CC0227EB056F7ACB9E450D4
+28278D1DAA263E9A45ED17F67F6B6B0CF00F8C0F58F86C8161F8D4266FE556CB
+0B0C79FDD7C9EA31FAA4AA829EDDD2A3453C05A74F5B53BBEAE83E1F4913FD1C18BD235D14D06D9E567DDB273E4C1F2A
+7D663A93AE1B9A2E00E944B92838DED3376E09C5179C8F3037B2EAE9E7326C2A
+D64EC2C7BD8CFA152368DF6BB75D66EF24EAA9C864A1386184B793C0585D82BC
+51D8EB188E833891CCD15919FAC8FE56ACAB1007699F4FDCB53A6DDAB02E5CAA
+650866D34DECD1D1F3559EFD8D2A4C1DB51C005F5932608CB6062B384D7A1F59C8E3FBF2C0A5AEFFB631D7B88A630AAB
diff --git a/applications/main/subghz/scenes/subghz_scene_set_type.c b/applications/main/subghz/scenes/subghz_scene_set_type.c
index a03c194f8..6c3e44894 100644
--- a/applications/main/subghz/scenes/subghz_scene_set_type.c
+++ b/applications/main/subghz/scenes/subghz_scene_set_type.c
@@ -29,6 +29,7 @@ static const char* submenu_names[SetTypeMAX] = {
     [SetTypeAllmatic868] = "KL: Allmatic 868MHz",
     [SetTypeCenturion433] = "KL: Centurion 433MHz",
     [SetTypeMonarch433] = "KL: Monarch 433MHz",
+    [SetTypeJollyMotors433] = "KL: Jolly Mot. 433MHz",
     [SetTypeSommer_FM_434] = "KL: Sommer 434MHz",
     [SetTypeSommer_FM_868] = "KL: Sommer 868MHz",
     [SetTypeSommer_FM238_434] = "KL: Sommer fm2 434Mhz",
@@ -428,6 +429,16 @@ bool subghz_scene_set_type_on_event(void* context, SceneManagerEvent event) {
                 .keeloq.cnt = 0x03,
                 .keeloq.manuf = "Monarch"};
             break;
+        case SetTypeJollyMotors433:
+            gen_info = (GenInfo){
+                .type = GenKeeloq,
+                .mod = "AM650",
+                .freq = 433920000,
+                .keeloq.serial = (key & 0x000FFFFF),
+                .keeloq.btn = 0x02,
+                .keeloq.cnt = 0x03,
+                .keeloq.manuf = "Jolly_Motors"};
+            break;
         case SetTypeElmesElectronic:
             gen_info = (GenInfo){
                 .type = GenKeeloq,
diff --git a/documentation/doxygen/Doxyfile.cfg b/documentation/doxygen/Doxyfile.cfg
index e01631749..3df12f08f 100644
--- a/documentation/doxygen/Doxyfile.cfg
+++ b/documentation/doxygen/Doxyfile.cfg
@@ -1042,6 +1042,7 @@ EXCLUDE                = $(DOXY_SRC_ROOT)/lib/mlib \
                          $(DOXY_SRC_ROOT)/applications/plugins/dap_link/lib/free-dap \
                          $(DOXY_SRC_ROOT)/applications/debug \
                          $(DOXY_SRC_ROOT)/applications/main \
+                         $(DOXY_SRC_ROOT)/applications/system/js_app/packages \
                          $(DOXY_SRC_ROOT)/applications/settings \
                          $(DOXY_SRC_ROOT)/lib/micro-ecc \
                          $(DOXY_SRC_ROOT)/lib/ReadMe.md \
diff --git a/scripts/fix_mfc_dict.py b/scripts/fix_mfc_dict.py
index f89973d3c..1b2713e1a 100755
--- a/scripts/fix_mfc_dict.py
+++ b/scripts/fix_mfc_dict.py
@@ -2,33 +2,31 @@
 import pathlib
 import string
 
+KEY_LENGTH = 12
+
 file = (
     pathlib.Path(__file__).parent
     / "../applications/main/nfc/resources/nfc/assets/mf_classic_dict.nfc"
 )
-try:
-    lines = file.read_text(encoding="ascii").splitlines()
-except UnicodeDecodeError:
-    print(
-        "Fix non-ASCII characters: https://pteo.paranoiaworks.mobi/diacriticsremover/"
-    )
-    exit()
+lines = file.read_text().split("\n")
 
 total = 0
-for i, line in enumerate(lines):
-    lines[i] = line = line.strip()
+for i, line in reversed(list(enumerate(lines))):
     if line.startswith("#"):
         continue
-    lines[i] = line = line.upper()
     if not line:
         continue
-    if len(line) != 12 or any(char not in string.hexdigits for char in line):
+    key = line[:KEY_LENGTH]
+    if len(key) != KEY_LENGTH or any(char not in string.hexdigits for char in key):
         print(f"Line {i + 1} is not correct: {line}")
-    else:
-        total = total + 1
-    for j in reversed(range(i + 1, len(lines))):
-        if lines[j].upper().strip() == line:
-            del lines[j]
+    for check in lines[:i]:
+        if check.upper()[:KEY_LENGTH] == line.upper()[:KEY_LENGTH]:
+            print(f"Line {i + 1} is a duplicate: {line}")
+            del lines[i]
+            break
+    else:  # Didn't break
+        total += 1
+
 
-file.write_text("\n".join(line for line in lines if line.removeprefix("#")))
+file.write_text("\n".join(lines))
 print(f"Total keys: {total}")
diff --git a/targets/f7/stm32wb55xx_flash.ld b/targets/f7/stm32wb55xx_flash.ld
index 524da6fc3..ef61bb238 100644
--- a/targets/f7/stm32wb55xx_flash.ld
+++ b/targets/f7/stm32wb55xx_flash.ld
@@ -3,7 +3,7 @@ ENTRY(Reset_Handler)
 /* Highest address of the user mode stack */
 _stack_end = 0x20030000;    /* end of RAM */
 /* Generate a link error if heap and stack don't fit into RAM */
-_stack_size = 0x200; /* required amount of stack */
+_stack_size = 0x400; /* required amount of stack */
 
 MEMORY {
     FLASH (rx)  : ORIGIN = 0x08000000, LENGTH = 1024K
diff --git a/targets/f7/stm32wb55xx_ram_fw.ld b/targets/f7/stm32wb55xx_ram_fw.ld
index f0e8ad678..93579788d 100644
--- a/targets/f7/stm32wb55xx_ram_fw.ld
+++ b/targets/f7/stm32wb55xx_ram_fw.ld
@@ -3,7 +3,7 @@ ENTRY(Reset_Handler)
 /* Highest address of the user mode stack */
 _stack_end = 0x20030000;    /* end of RAM */
 /* Generate a link error if heap and stack don't fit into RAM */
-_stack_size = 0x200; /* required amount of stack */
+_stack_size = 0x400; /* required amount of stack */
 
 MEMORY {
     FLASH (rx)  : ORIGIN = 0x08000000, LENGTH = 1024K