diff --git a/client/dictionaries/mfc_default_keys.dic b/client/dictionaries/mfc_default_keys.dic
index 881c72df0..a522b001b 100644
--- a/client/dictionaries/mfc_default_keys.dic
+++ b/client/dictionaries/mfc_default_keys.dic
@@ -3,36 +3,46 @@
 #   -- iceman fork version --
 #   -- contribute to this list, sharing is caring --
 #
-# Defaultkey(firstkeyusedbyprogramifnouserdefinedkey)
+# Default key
 FFFFFFFFFFFF
-# Blankkey
+#
+# Blank key
 000000000000
+#
 # NFC Forum MADkey
 A0A1A2A3A4A5
+#
 # MAD access key A (reversed)
 A5A4A3A2A1A0
+#
 # MAD access key B
 89ECA97F8C2A
 #
+#
 B0B1B2B3B4B5
 C0C1C2C3C4C5
 D0D1D2D3D4D5
 AABBCCDDEEFF
 4D3A99C351DD
 1A982C7E459A
+#
 # key A Wien
 D3F7D3F7D3F7
+#
 # key B Wien
 5A1B85FCE20A
 #
+#
 714C5C886E97
 587EE5F9350F
 A0478CC39091
 533CB6C723F6
 8FD0A4F256E9
+#
 # iCopy-X
 E00000000000
 #
+#
 E7D6064C5860
 B27CCAB30DBD
 #
@@ -40,6 +50,9 @@ B27CCAB30DBD
 D2ECE8B9395E
 # NSCP default key
 1494E81663D7
+# 
+# NFC tools 
+7c9fb8474242
 #
 # Kiev keys
 569369C5A0E5
@@ -54,31 +67,41 @@ F14EE7CAE863
 # RKF
 # Västtrafiken KeyA, RKF ÖstgötaTrafiken KeyA
 FC00018778F7
+#
 # Västtrafiken KeyA
 0297927C0F77
 54726176656C
+#
 # Västtrafiken KeyB
 00000FFE2488
 776974687573
 EE0042F88840
+#
 # RKF SLKeyA
 26940B21FF5D
 A64598A77478
+#
 # RKF SLKeyB
 5C598C9C58B5
 E4D2770A89BE
-# RKF RejskortDanmark KeyA
+#
+# RKF Rejskort Danmark KeyA
 722BFCC5375F
-# RKF RejskortDanmark KeyB
+#
+# RKF Rejskort Danmark KeyB
 F1D83F964314
-# RKF JOJOPRIVAKeyA
+#
+# RKF JOJOPRIVA KeyA
 505249564141
-# RKF JOJOPRIVAKeyB
+#
+# RKF JOJOPRIVA KeyB
 505249564142
-# RKF JOJOGROUPKeyA
+#
+# RKF JOJOGROUP KeyA
 47524F555041
 434F4D4D4F41
-# RKF JOJOGROUPKeyB
+#
+# RKF JOJOGROUP KeyB
 47524F555042
 434F4D4D4F42
 #
@@ -108,11 +131,14 @@ F1D83F964314
 200000000000
 222222222222
 27DD91F1FCF1
-# DirectoryandeventlogKeyB
+#
+# Directory and eventlog KeyB
 2BA9621E0A36
-# DirectoryandeventlogKeyA
+#
+# Directory and eventlog KeyA
 4AF9D7ADEBE4
 #
+#
 333333333333
 33F974B42769
 34D1DF9934C5
@@ -131,9 +157,11 @@ A00000000000
 A053A292A4AF
 A94133013401
 AAAAAAAAAAAA
-# Keyfromladyada.net
+#
+# Key from ladyada.net
 ABCDEF123456
 #
+#
 B00000000000
 B127C6F41436
 BBBBBBBBBBBB
@@ -147,7 +175,9 @@ EEEEEEEEEEEE
 # data from forum
 FFFFFF545846
 #
+#
 F1A97341A9FC
+#
 # hotel system
 44AB09010845
 85FED980EA5A
@@ -157,7 +187,9 @@ F1A97341A9FC
 # ARD (fr) key B
 4A2B29111213
 #
+#
 4143414F5250
+#
 # Tehran Railway
 A9B43414F585
 1FB235AC1388
@@ -169,13 +201,17 @@ F4A9EF2AFC6D
 #
 # S0 B
 89EAC97F8C2A
+#
 # S4 A
 43C7600DEE6B
+#
 # S6 A
 0120BF672A64
+#
 # S6 B
 FB0B20DF1F34
 #
+#
 A9F953DEF0A3
 #
 # Data from forum
@@ -233,14 +269,17 @@ AAFB06045877
 # gym
 # Fysiken A
 3E65E4FB65B3
+#
 # Fysiken B
 25094DF6F148
+#
 # CleverFit
 A05DBD98E0FC
 #
 # Hotel KeyCard
 D3B595E9DD63
 AFBECD121004
+#
 # SimonsVoss
 6471A5EF2D1A
 #
@@ -396,9 +435,11 @@ C52876869800
 # Data from mall
 # playland balikesir
 ABBA1234FCB0
+#
 # A trio bowling bahcelievler
 314F495254FF
 4152414B4E41
+#
 # karinca park nigde
 4E474434FFFF
 #
@@ -477,18 +518,21 @@ D9A37831DCE5
 C5CFE06D9EA3
 C0DECE673829
 #
+#
 A56C2DF9A26D
 #
 # Data from https://pastebin.com/vbwast74
-#
 68D3F7307C89
+#
 # Smart Rider. Western Australian Public Transport Cards
 568C9083F71C
 #
 # Bangkok metro key
 97F5DA640B18
+#
 # Metro Valencia key
 A8844B0BCA06
+#
 # HTC Eindhoven key
 857464D3AAD1
 #
@@ -501,6 +545,7 @@ A8844B0BCA06
 # French VIGIK
 # VIGIK1 A
 314B49474956
+#
 # VIGIK1 B
 564C505F4D41
 BA5B895DA162
@@ -508,16 +553,20 @@ BA5B895DA162
 # Vigik mystery Keys Mifare 1k EV1 (S50)
 # 16 A
 5C8FF9990DA2
+#
 # 17 A
 75CCB59C9BED
+#
 # 16 B
 D01AFEEB890A
+#
 # 17 B
 4B791BEA7BCC
 #
 # BTCINO UNDETERMINED SPREAKD 0x01->0x13 key
 021209197591
 #
+#
 2EF720F2AF76
 414C41524F4E
 424C41524F4E
@@ -676,6 +725,7 @@ F7A39753D018
 410B9B40B872
 2CB1A90071C8
 #
+#
 8697389ACA26
 1AB23CD45EF6
 013889343891
@@ -691,6 +741,7 @@ EC0A9B1A9E06
 0F230695923F
 0000014B5C31
 #
+#
 BEDB604CC9D1
 B8A1F613CF3D
 B578F38A5C61
@@ -699,12 +750,15 @@ B66AC040203A
 2E641D99AD5B
 AD4FB33388BF
 69FB7B7CD8EE
+#
 # Hotel
 2A6D9205E7CA
 13B91C226E56
+#
 # KABA Hotel Locks
 2A2C13CC242A
 #
+#
 27FBC86A00D0
 01FA3FC68349
 #
@@ -761,8 +815,10 @@ D58023BA2BDC
 2ED3B15E7C0F
 F66224EE1E89
 #
+#
 60012E9BA3FA
 #
+#
 DE1FCBEC764B
 81BFBE8CACBA
 BFF123126C9B
@@ -775,11 +831,13 @@ D80511FC2AB4
 BB467463ACD6
 E67C8010502D
 FF58BA1B4478
+#
 # Data from https://pastebin.com/Kz8xp4ev
 FBF225DC5D58
 #
 # Data  https://pastebin.com/BEm6bdAE
 # vingcard.txt
+# Note: most likely diversified
 4708111C8604
 3D50D902EA48
 96A301BCE267
@@ -801,10 +859,12 @@ D58660D1ACDE
 50A11381502C
 C01FC822C6E5
 0854BF31111E
-# More keys:
+#
+# More keys
 8A19D40CF2B5
 AE8587108640
-# SafLock standalone door locks.
+#
+# SafLock standalone door locks
 135B88A94B8B
 #
 # Russian Troika card
@@ -863,7 +923,7 @@ F8493407799D
 6B8BD9860763
 D3A297DC2698
 #
-# Keys from MifareClassicTool project
+# Keys from Mifare Classic Tool project
 044CE1872BC3
 045CECA15535
 0BE5FAC8B06A
@@ -918,7 +978,6 @@ FD8705E721B0
 00ADA2CD516D
 #
 #
-##
 237A4D0D9119
 0ED7846C2BC9
 FFFFD06F83E3
@@ -965,12 +1024,13 @@ A2B2C9D187FB
 # Hotel Adina
 9EBC3EB37130
 #
-# most likely diversed individual keys.
+# most likely diversifed individual keys.
 # data from https://github.com/korsehindi/proxmark3/commit/24fdbfa9a1d5c996aaa5c192bc07e4ab28db4c5c
 491CDC863104
 A2F63A485632
 98631ED2B229
 19F1FFE02563
+#
 # Argentina
 563A22C01FC8
 43CA22C13091
@@ -983,7 +1043,6 @@ AFBECD120454
 842146108088
 #
 # TAPCARD PUBLIC TRANSPORT LA
-#
 EA1B88DF0A76
 D1991E71E2C5
 05F89678CFCF
@@ -1018,7 +1077,6 @@ E3AD9E9BA5D4
 6C9EC046C1A4
 #
 # ROC HIGHSCHOOL ACCESSCARD
-#
 B021669B44BB
 B18CDCDE52B7
 A22647F422AE
@@ -1050,8 +1108,7 @@ BE7C4F6C7A9A
 5EC7938F140A
 82D58AA49CCB
 #
-# MELONCARD
-#
+# MELON CARD
 323334353637
 #
 #
@@ -1071,7 +1128,6 @@ A7FB4824ACBF
 10F3BEBC01DF
 #
 # Transportes Insular La Palma
-#
 0172066B2F03
 0000085F0000
 1A80B93F7107
@@ -1106,7 +1162,6 @@ B1A862985913
 F3F0172066B2
 #
 # Tehran ezpay
-#
 38A88AEC1C43
 CBD2568BC7C6
 7BCB4774EC8F
@@ -1124,7 +1179,6 @@ D3B1C7EA5C53
 BB3D7B11D224
 #
 # Chaco
-#
 B210CFA436D2
 B8B1CFA646A8
 A9F95891F0A4
@@ -1147,11 +1201,11 @@ A0004A000036
 4243414F5250
 DFE73BE48AC6
 #
+#
 B069D0D03D17
 000131B93F28
 #
 # From the DFW Area, TX, USA
-#
 A506370E7C0F
 26396F2042E7
 70758FDD31E0
@@ -1169,7 +1223,6 @@ B47058139187
 67CC03B7D577
 #
 # From the HTL Mödling, NÖ, AT
-#
 A5524645CD91
 D964406E67B4
 99858A49C119
@@ -1179,7 +1232,6 @@ C27D999912EA
 4C60F4B15BA8
 #
 # CAFE + CO, AT
-#
 35D850D10A24
 4B511F4D28DD
 E45230E7A9E8
@@ -1187,27 +1239,25 @@ E45230E7A9E8
 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
 #
@@ -1215,6 +1265,7 @@ BB2C0007D022
 58AC17BF3629
 B62307B62307
 #
+#
 A2A3CCA2A3CC
 #
 # Granada, ES Transport Card
@@ -1260,6 +1311,7 @@ B8937130B6BA
 D7744A1A0C44
 82908B57EF4F
 FE04ECFE5577
+#
 # comfort inn hotel
 4D57414C5648
 4D48414C5648
@@ -1306,13 +1358,11 @@ A82045A10949
 #
 # funnivarium
 # forum ankara
-#
 2602FFFFFFFF
 #
 # macera adasi
 # ankara kentpark
 # INACTIVE
-#
 0A4600FF00FF
 DFF293979FA7
 4D6F62692E45
@@ -1321,21 +1371,17 @@ DFF293979FA7
 # petrol ofisi
 # positive card
 # ode-gec
-#
 0406080A0C0E
 #
 # konya elkart
-#
 988ACDECDFB0
 120D00FFFFFF
 #
 # bowlingo
 # serdivan avym
-#
 4AE23A562A80
 #
-#  kart54
-#
+#  kart 54
 2AFFD6F88B97
 A9F3F289B70C
 DB6819558A25
@@ -1346,20 +1392,16 @@ B16B2E573235
 #
 # crazy park
 # kizilay avm
-#
 00DD300F4F10
 #
 # kartsistem B
-#
 FEE2A3FBC5B6
 #
 # toru ent
 # taurus avm
-#
 005078565703
 #
 # Ving?
-#
 0602721E8F06
 FC0B50AF8700
 F7BA51A9434E
@@ -1407,7 +1449,6 @@ D0DDDF2933EC
 #
 # bursakart
 # bursa transport card
-#
 755D49191A78
 DAC7E0CBA8FD
 68D3263A8CD6
@@ -1418,30 +1459,29 @@ 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
+# key-gen algo, these keys are for one card (keys diversified)
 FF9A84635BD2
 6F30126EE7E4
 6039ABB101BB
 F1A1239A4487
 #
+#
 B882FD4A9F78
 CD7FFFF81C4A
 AA0857C641A3
@@ -1524,9 +1564,10 @@ ABFEDC124578
 5E594208EF02
 AF9E38D36582
 #
-#Norwegian building site identication card. (HMS KORT)
+# Norwegian building site identication card. (HMS KORT)
 # Key a
 10DF4D1859C8
+#
 # Key B
 B5244E79B0C8
 #
@@ -1594,7 +1635,6 @@ F53E9F4114A9
 AD38C17DE7D2
 #
 # SUBE cards keys (new)
-#
 2DEB57A3EA8F
 32C1BB023F87
 70E3AD3F2D29
@@ -1623,7 +1663,6 @@ F5C1B3F62FDA
 7E6545076619
 #
 # SUBE cards keys (old)
-#
 4C5A766DFE3A
 32C6768847F5
 F68930789631
@@ -1651,7 +1690,9 @@ BFE25035B0C8
 D5C172325DD3
 992B152E834A
 CE75D7EADEAF
-# Russian Podorozhnik card (Saint-Petersburg transport, may be combined with Troika)
+#
+# Russian Podorozhnik card (Saint-Petersburg transport)
+# may be combined with Troika
 038B5F9B5A2A
 04DC35277635
 0C420A20E056
@@ -1681,11 +1722,12 @@ D27058C6E2C7
 E19504C39461
 FA1FBB3F0F1F
 FF16014FEFC7
-##################################
-# Keys from Flipper Zero Community
 #
+# Keys from Flipper Zero Community
 # Last update: Aug 13, 2022
 #
+# unknown if keys are diversified or static default
+#
 # Strelka Extension
 5C83859F2224
 66B504430416
@@ -1771,7 +1813,7 @@ CB9D507CE56D
 # Armenian Underground Ticket
 A0A1A2A8A4A5
 #
-# BadgeMaker Leaked from https://github.com/UberGuidoZ
+# Badge Maker Leaked from https://github.com/UberGuidoZ
 1A1B1C1D1E1F
 1665FE2AE945
 158B51947A8E
@@ -1813,7 +1855,7 @@ D10008074A6F
 6F6674776172
 6520446F7665
 #
-# Apartment keyfobs (USA) from Corvette830
+# Apartment keyfobs (USA) (Corvette830)
 E60F8387F0B9
 FFD46FF6C5EE
 4F9661ED2E70
@@ -1822,8 +1864,8 @@ FFD46FF6C5EE
 16CA203B811B
 11AC8C8F3AF2
 #
-# The Westin Jakarta Indonesia from D4DB0D
-# Peppers Hotel Unknown location from D4DB0D
+# The Westin Jakarta Indonesia (D4DB0D)
+# Peppers Hotel Unknown location (D4D0D)
 6E0DD4136B0A
 141940E9B71B
 3B1D3AAC866E
@@ -1836,12 +1878,12 @@ F09BB8DD142D
 B4B3FFEDBE0A
 540E0D2D1D08
 #
-# Schlage 9691T Keyfob from seasnaill
+# Schlage 9691T Keyfob (seasnaill)
 7579B671051A
 4F4553746B41
 #
 # Vigik ScanBadge App (fr.badgevigik.scanbadge)
-# Website https://badge-vigik.fr/ - By Alex`
+# Website https://badge-vigik.fr/  (Alex)
 0000A2B3C86F
 021200C20307
 021209197507
@@ -1868,6 +1910,7 @@ B4B3FFEDBE0A
 9EB7C8A6D4E3
 A22AE12C9013
 AFC984A3576E
+#
 # Vigik verified by quantum-x
 # https://github.com/RfidResearchGroup/proxmark3/pull/1742#issuecomment-1206113976
 A00027000099
@@ -1892,8 +1935,8 @@ A00003000057
 # iGuard Simple (and reverse) keys
 AAAAAAFFFFFF
 FFFFFFAAAAAA
-# Added by VideoMan.
-# Random Hotel A Key Sec 0 Blk 3 - KABA Lock
+#
+# Random Hotel A Key Sec 0 Blk 3 - KABA Lock (VideoMan)
 3111A3A303EB
 # Transport system Uruguay - STM
 # Shared key - sec 0 blk 3
@@ -1910,9 +1953,9 @@ D144BD193063
 8627C10A7014
 453857395635
 #
-##########################################
-# added by colonelborkmundus
-# "the more, the marriott" mifare project
+# Data from "the more, the marriott" mifare project (colonel borkmundus)
+#
+# Isn't theirs Saflok ?
 #
 # 1k - graduate hotel
 C49DAE1C6049
@@ -1984,4 +2027,4 @@ F72CD208FDF9
 2158E314C3DF
 #
 # 1k - waldorf astoria
-011C6CF459E8
\ No newline at end of file
+011C6CF459E8