diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index eefe97f1f..ae57ef03a 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -33,6 +33,7 @@
 #include "em4x50.h"
 #include "iclass.h"
 #include "legicrfsim.h"
+//#include "cryptorfsim.h"
 #include "epa.h"
 #include "hfsnoop.h"
 #include "lfops.h"
@@ -237,7 +238,7 @@ static void SendVersion(void) {
      */
     char *bootrom_version = *(char **)&_bootphase1_version_pointer;
 
-    strncat(VersionString, " "_YELLOW_("[ ARM ]")"\n", sizeof(VersionString) - strlen(VersionString) - 1);
+    strncat(VersionString, " [ "_YELLOW_("ARM")" ]\n", sizeof(VersionString) - strlen(VersionString) - 1);
 
     if (bootrom_version < &_flash_start || bootrom_version >= &_flash_end) {
         strcat(VersionString, "bootrom version information appears invalid\n");
@@ -257,7 +258,7 @@ static void SendVersion(void) {
     strncat(VersionString, "  compiled with GCC "__VERSION__"\n", sizeof(VersionString) - strlen(VersionString) - 1);
 #endif
 
-    strncat(VersionString, "\n "_YELLOW_("[ FPGA ]")"\n ", sizeof(VersionString) - strlen(VersionString) - 1);
+    strncat(VersionString, "\n [ "_YELLOW_("FPGA")" ] \n ", sizeof(VersionString) - strlen(VersionString) - 1);
 
     for (int i = 0; i < g_fpga_bitstream_num; i++) {
         strncat(VersionString, g_fpga_version_information[i], sizeof(VersionString) - strlen(VersionString) - 1);
@@ -1108,6 +1109,10 @@ static void PacketReceived(PacketCommandNG *packet) {
             SendRawCommand14443B_Ex(packet);
             break;
         }
+        case CMD_HF_CRYPTORF_SIM : {
+//            simulate_crf_tag();
+            break;
+        }
 #endif
 
 #ifdef WITH_FELICA
diff --git a/client/src/cmdhw.c b/client/src/cmdhw.c
index 6b83bd0cc..64518c3ae 100644
--- a/client/src/cmdhw.c
+++ b/client/src/cmdhw.c
@@ -87,7 +87,7 @@ static void lookupChipID(uint32_t iChipID, uint32_t mem_used) {
     char asBuff[120];
     memset(asBuff, 0, sizeof(asBuff));
     uint32_t mem_avail = 0;
-    PrintAndLogEx(NORMAL, "\n " _YELLOW_("[ Hardware ]"));
+    PrintAndLogEx(NORMAL, "\n [ " _YELLOW_("Hardware") " ]");
 
     switch (iChipID) {
         case 0x270B0A40:
@@ -710,19 +710,19 @@ void pm3_version(bool verbose, bool oneliner) {
 
     if (WaitForResponseTimeout(CMD_VERSION, &resp, 1000)) {
         char temp[PM3_CMD_DATA_SIZE - 12]; // same limit as for ARM image
-        PrintAndLogEx(NORMAL, "\n " _YELLOW_("[ Proxmark3 RFID instrument ]"));
-        PrintAndLogEx(NORMAL, "\n " _YELLOW_("[ CLIENT ]"));
+        PrintAndLogEx(NORMAL, "\n [ " _CYAN_("Proxmark3 RFID instrument") " ]");
+        PrintAndLogEx(NORMAL, "\n [ " _YELLOW_("CLIENT") " ]");
         FormatVersionInformation(temp, sizeof(temp), "  client: ", &version_information);
         PrintAndLogEx(NORMAL, "%s", temp);
         PrintAndLogEx(NORMAL, "  compiled with " PM3CLIENTCOMPILER __VERSION__ PM3HOSTOS PM3HOSTARCH);
 
         if (IfPm3Flash() == false && IfPm3Smartcard() == false && IfPm3FpcUsartHost() == false) {
-            PrintAndLogEx(NORMAL, "\n " _YELLOW_("[ PROXMARK3 ]"));
+            PrintAndLogEx(NORMAL, "\n [ " _YELLOW_("PROXMARK3") " ]");
         } else {
-            PrintAndLogEx(NORMAL, "\n " _YELLOW_("[ PROXMARK3 RDV4 ]"));
+            PrintAndLogEx(NORMAL, "\n [ " _YELLOW_("PROXMARK3 RDV4") " ]");
             PrintAndLogEx(NORMAL, "  external flash:                  %s", IfPm3Flash() ? _GREEN_("present") : _YELLOW_("absent"));
             PrintAndLogEx(NORMAL, "  smartcard reader:                %s", IfPm3Smartcard() ? _GREEN_("present") : _YELLOW_("absent"));
-            PrintAndLogEx(NORMAL, "\n " _YELLOW_("[ PROXMARK3 RDV4 Extras ]"));
+            PrintAndLogEx(NORMAL, "\n [ " _YELLOW_("PROXMARK3 RDV4 Extras") " ]");
             PrintAndLogEx(NORMAL, "  FPC USART for BT add-on support: %s", IfPm3FpcUsartHost() ? _GREEN_("present") : _YELLOW_("absent"));
 
             if (IfPm3FpcUsartDevFromUsb()) {
diff --git a/client/src/proxmark3.c b/client/src/proxmark3.c
index d04008c03..a6ac33bd4 100644
--- a/client/src/proxmark3.c
+++ b/client/src/proxmark3.c
@@ -34,8 +34,8 @@
 #include "flash.h"
 #include "preferences.h"
 
-#define BANNERMSG1 "    :snowflake:  iceman@icesql.net"
-#define BANNERMSG2 "  bleeding edge :coffee:"
+#define BANNERMSG1 ""
+#define BANNERMSG2 "  :snowflake: bleeding edge :coffee:"
 #define BANNERMSG3 "  https://github.com/rfidresearchgroup/proxmark3/"
 
 typedef enum LogoMode { UTF8, ANSI, ASCII } LogoMode;