diff --git a/armsrc/Standalone/Makefile.hal b/armsrc/Standalone/Makefile.hal
index 5d6ff0e87..c71fc7f82 100644
--- a/armsrc/Standalone/Makefile.hal
+++ b/armsrc/Standalone/Makefile.hal
@@ -1,5 +1,5 @@
 # Default standalone if no standalone specified
-DEFAULT_STANDALONE=LF_SAMYRUN
+DEFAULT_STANDALONE=HF_MSDSAL
 HELP_EXAMPLE_STANDALONE=HF_YOUNG 
 # (you can set explicitly STANDALONE= to disable standalone modes)
 STANDALONE?=$(DEFAULT_STANDALONE)
diff --git a/armsrc/Standalone/readme.md b/armsrc/Standalone/readme.md
index 6ddd9e783..386addc60 100644
--- a/armsrc/Standalone/readme.md
+++ b/armsrc/Standalone/readme.md
@@ -68,15 +68,15 @@ Add your mode to the `Makefile.hal` help and modes list:
 | LF_FOO          | My foobar mode will make you coffee    |
 +----------------------------------------------------------+
 
-STANDALONE_MODES := LF_SAMYRUN LF_ICERUN LF_PROXBRUTE LF_HIDBRUTE LF_FOO
-STANDALONE_MODES += HF_YOUNG HF_MATTYRUN HF_COLIN HF_BOG
+STANDALONE_MODES := LF_... LF_FOO
+STANDALONE_MODES += HF_...
 ```
 
 If your mode is using one of the unique features of the RDV4, add it to the proper list:
 
 ```
 STANDALONE_MODES_REQ_SMARTCARD :=
-STANDALONE_MODES_REQ_FLASH := HF_COLIN HF_BOG
+STANDALONE_MODES_REQ_FLASH :=
 ```
 
 ## Update MAKEFILE.INC
diff --git a/doc/md/Use_of_Proxmark/4_Advanced-compilation-parameters.md b/doc/md/Use_of_Proxmark/4_Advanced-compilation-parameters.md
index af1e9cbd5..00de832be 100644
--- a/doc/md/Use_of_Proxmark/4_Advanced-compilation-parameters.md
+++ b/doc/md/Use_of_Proxmark/4_Advanced-compilation-parameters.md
@@ -72,22 +72,22 @@ Here are the supported values you can assign to `STANDALONE` in `Makefile.platfo
 | STANDALONE      | DESCRIPTION                            |
 |-----------------|----------------------------------------|
 |                 | No standalone mode
-| LF_SAMYRUN (def)| HID26 read/clone/sim - Samy Kamkar
 | LF_ICERUN       | standalone mode skeleton - Iceman
-| LF_PROXBRUTE    | HID ProxII bruteforce - Brad Antoniewicz
-| LF_HIDBRUTE     | HID corporate 1000 bruteforce - Federico dotta & Maurizio Agazzini
-| HF_YOUNG        | Mifare sniff/simulation - Craig Young
-| HF_MATTYRUN     | Mifare sniff/clone - Matías A. Ré Medina
-| HF_COLIN        | Mifare ultra fast sniff/sim/clone - Colin Brigato
-| HF_BOG          | 14a sniff with ULC/ULEV1/NTAG auth storing in flashmem - Bogito
-| HF_14ASNIFF     | 14a sniff storing to flashmem - Micolous
-| LF_ICEHID       | LF HID collector to flashmem - Iceman
-| LF_EM4100EMUL   | LF EM4100 simulator standalone mode - temskiy 
+| LF_EM4100EMUL   | LF EM4100 simulator standalone mode - temskiy
 | LF_EM4100RWC    | LF EM4100 read/write/clone mode - temskiy
+| LF_HIDBRUTE     | HID corporate 1000 bruteforce - Federico dotta & Maurizio Agazzini
+| LF_ICEHID       | LF HID collector to flashmem - Iceman
+| LF_SAMYRUN      | HID26 read/clone/sim - Samy Kamkar
+| LF_PROXBRUTE    | HID ProxII bruteforce - Brad Antoniewicz
+| HF_14ASNIFF     | 14a sniff storing to flashmem - Micolous
+| HF_BOG          | 14a sniff with ULC/ULEV1/NTAG auth storing in flashmem - Bogito
+| HF_COLIN        | Mifare ultra fast sniff/sim/clone - Colin Brigato
 | HF_LEGIC        | HF Legic Prime standalone - uhei
-| HF_MSDSAL       | EMV Read and emulation - Salvador Mendoza
+| HF_MATTYRUN     | Mifare sniff/clone - Matías A. Ré Medina
+| HF_MSDSAL  (def)| EMV Read and emulation - Salvador Mendoza
+| HF_YOUNG        | Mifare sniff/simulation - Craig Young
 
-By default `STANDALONE=LF_SAMYRUN`.
+By default `STANDALONE=HF_MSDSAL`.
 
 ## Next step