diff --git a/platformio.ini b/platformio.ini
index 52cb85dc..60b2e6de 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -30,8 +30,16 @@ build_flags =
 	-DEEPROMSIZE=128
 	-DLH=8
 	-DLW=6
-	-DCONFIG_FILE='"/config.conf"'
+	-DCONFIG_FILE='"/bruce.conf"'
 	-w
+	!echo '-DGIT_COMMIT_HASH=\\"'$(git describe --always --dirty)'\\"'
+	; rtl_433_ESP flags https://github.com/NorthernMan54/rtl_433_ESP/blob/main/example/OOK_Receiver/platformio.ini
+	;-DOOK_MODULATION=true      ; False is FSK, True is OOK
+	;-DRF_CC1101="CC1101"
+	;-DRF_MODULE_GDO0=9   ; CC1101 pin GDO0
+	;-DRF_MODULE_GDO2=14    ; CC1101 pin GDO2
+	;-DRF_MODULE_GDO2=RADIOLIB_NC    ; CC1101 pin GDO2
+	;-DRF_MODULE_INIT_STATUS=true
 
 lib_deps = 
 	WireGuard-ESP32
@@ -53,6 +61,7 @@ lib_deps =
 	;lsatan/SmartRC-CC1101-Driver-Lib@^2.5.7
 	SmartRC-CC1101-Driver-Lib=https://github.com/bmorcelli/SmartRC-CC1101-Driver-Lib/archive/refs/heads/Bruce.zip
 	h2zero/NimBLE-Arduino@^1.4.0
+	;https://github.com/eadmaster/rtl_433_ESP
 
 [env:m5stack-cplus2]
 platform = espressif32
@@ -320,14 +329,14 @@ build_flags =
 	;Radio Frequency (one pin modules) pin setting
 	-DRF_TX_PINS='{ {"M5 RF433T", GROVE_SDA}, {"Groove W", GROVE_SCL}, {"GROVE Y", GROVE_SDA}}'
 	-DRF_RX_PINS='{ {"M5 RF433R", GROVE_SCL}, {"Groove W", GROVE_SCL}, {"GROVE Y", GROVE_SDA}}'
-    ; connection pins using microSD sniffer module https://www.sparkfun.com/products/9419 https://docs.m5stack.com/en/core/Cardputer
-    -DUSE_CC1101_VIA_SPI
-    -DCC1101_GDO0_PIN=GROVE_SDA
-    -DCC1101_SS_PIN=GROVE_SCL  ; chip select
-    -DCC1101_MOSI_PIN=14
-    -DCC1101_SCK_PIN=40
-    -DCC1101_MISO_PIN=39
-    ;-DCC1101_GDO2_PIN=-1
+	; connection pins using microSD sniffer module https://www.sparkfun.com/products/9419 https://docs.m5stack.com/en/core/Cardputer
+	-DUSE_CC1101_VIA_SPI
+	-DCC1101_GDO0_PIN=GROVE_SDA  ; 2
+	-DCC1101_SS_PIN=GROVE_SCL  ; 1 = chip select
+	-DCC1101_MOSI_PIN=14  ; CMD on SDsniffer
+	-DCC1101_SCK_PIN=40   ; CLK on SDsniffer
+	-DCC1101_MISO_PIN=39  ; DAT0 on SDsniffer
+	;-DCC1101_GDO2_PIN=-1
     
 	;Screen Setup
 	-DHAS_SCREEN=1
@@ -741,7 +750,7 @@ build_flags =
 	; grove pins
 	; defaults from https://github.com/espressif/arduino-esp32/blob/master/variants/esp32s3/pins_arduino.h
 	-DGROVE_SDA=8  ; default RF TX pin
-	-DGROVE_SCL=9  ; default IR/RF RX pin
+	-DGROVE_SCL=46  ; default IR/RF RX pin
 	;-DALLOW_ALL_GPIO_FOR_IR_RF=1 ; Set this option to make use of all GPIOs, from 1 to 44 to be chosen, except TFT and SD pins
 	
 	; ir led pin
diff --git a/src/core/globals.h b/src/core/globals.h
index 2fd686c9..e081258f 100644
--- a/src/core/globals.h
+++ b/src/core/globals.h
@@ -109,6 +109,8 @@ extern int RfModule;
 
 extern float RfFreq;
 
+extern String cachedPassword;
+
 // Screen sleep control variables
 extern unsigned long previousMillis;
 extern bool isSleeping;
diff --git a/src/core/passwords.cpp b/src/core/passwords.cpp
new file mode 100644
index 00000000..6a95570a
--- /dev/null
+++ b/src/core/passwords.cpp
@@ -0,0 +1,38 @@
+#include "mbedtls/aes.h"
+#include "mbedtls/md.h"
+#include "mbedtls/pkcs5.h"
+#include <Arduino.h>
+
+
+String aes_decrypt(uint8_t* inputData, size_t fileSize, const String& password_str) {
+    // generate key, iv, salt
+    const char *password = password_str.c_str();
+    unsigned char key[32];
+    unsigned char iv[16];
+    unsigned char salt[8] = { /* The salt used by OpenSSL during encryption */ };
+
+    mbedtls_md_context_t md_ctx;
+    mbedtls_md_init(&md_ctx);
+    mbedtls_md_setup(&md_ctx, mbedtls_md_info_from_type(MBEDTLS_MD_SHA256), 1);
+
+    // Derive key and IV using PBKDF2
+    mbedtls_pkcs5_pbkdf2_hmac(&md_ctx, (unsigned char*)password, strlen(password), salt, 8, 10000, 32, key);
+    mbedtls_pkcs5_pbkdf2_hmac(&md_ctx, (unsigned char*)password, strlen(password), salt, 8, 10000, 16, iv);
+
+    mbedtls_md_free(&md_ctx);
+    
+    unsigned char *outputData = new unsigned char[fileSize];
+    mbedtls_aes_context aes;
+    mbedtls_aes_init(&aes);
+    mbedtls_aes_setkey_dec(&aes, key, 256);
+
+    mbedtls_aes_crypt_cbc(&aes, MBEDTLS_AES_DECRYPT, fileSize, iv, inputData, outputData);
+
+    mbedtls_aes_free(&aes);
+    
+    // Convert the decrypted data to a string
+    String decryptedText = String(outputData, fileSize);
+    free(outputData);
+
+    return decryptedText;
+}
diff --git a/src/core/passwords.h b/src/core/passwords.h
new file mode 100644
index 00000000..b7240a0c
--- /dev/null
+++ b/src/core/passwords.h
@@ -0,0 +1,2 @@
+
+String aes_decrypt(uint8_t* inputData, size_t fileSize, const String& password_str);
\ No newline at end of file
diff --git a/src/core/sd_functions.cpp b/src/core/sd_functions.cpp
index db85fe63..a57a0882 100644
--- a/src/core/sd_functions.cpp
+++ b/src/core/sd_functions.cpp
@@ -3,10 +3,12 @@
 #include "sd_functions.h"
 #include "mykeyboard.h"   // usinf keyboard when calling rename
 #include "display.h"      // using displayRedStripe as error msg
+#include "passwords.h"
 #include "modules/others/audio.h"
 #include "modules/rf/rf.h"
 #include "modules/ir/TV-B-Gone.h"
 #include "modules/others/bad_usb.h"
+#include "modules/others/qrcode_menu.h"
 
 struct FilePage {
   int pageIndex;
@@ -284,6 +286,111 @@ String readLineFromFile(File myFile) {
   return line;
 }
 
+
+/***************************************************************************************
+** Function name: readSmallFile
+** Description:   read a small (<3KB) file and return its contents as a single string
+**                on any error returns an empty string
+***************************************************************************************/
+String readSmallFile(FS &fs, String filepath) {
+  String fileContent = "";
+  File file;
+
+  file = fs.open(filepath, FILE_READ);
+  if (!file) return "";
+
+  size_t fileSize = file.size();
+  if(fileSize > 1024*3) {  // 3K is the max
+      displayError("File is too big");
+      Serial.println("File is too big");
+      return "";
+  }
+  
+  fileContent = file.readString();
+
+  file.close();
+  return fileContent;
+}
+
+/***************************************************************************************
+** Function name: getFileSize
+** Description:   get a file size without opening
+***************************************************************************************/
+size_t getFileSize(FS &fs, String filepath) {
+    if(&fs == &SD) filepath = "/sd" + filepath; 
+    else if(&fs == &LittleFS) filepath = "/littlefs" + filepath; 
+    else return 0;  // not found
+    struct stat st;
+    memset(&st, 0, sizeof(struct stat));
+    if (stat(filepath.c_str(), &st) != 0) return 0;  // stat error
+    // else
+    return st.st_size;
+}
+
+bool is_valid_ascii(const String &text) {
+    for (int i = 0; i < text.length(); i++) {
+        char c = text[i];
+        // Check if the character is within the printable ASCII range or is a newline/carriage return
+        if (!(c >= 32 && c <= 126) && c != 10 && c != 13) {
+            return false; // Invalid character found
+        }
+    }
+    return true; // All characters are valid
+}
+
+String readDecryptedAesFile(FS &fs, String filepath) {
+  File file;
+
+  file = fs.open(filepath, FILE_READ);
+  if (!file) return "";
+
+  size_t fileSize = file.size();
+  if(fileSize > 1024*3) {  // 3K is the max
+      displayError("File is too big");
+      return "";
+  }
+  
+  char buffer[fileSize];
+  size_t bytesRead = file.readBytes(buffer, fileSize);
+  //Serial.print("fileSize:");
+  //Serial.println(fileSize);
+  //Serial.println(bytesRead);
+  
+  /*
+  // read the whole file with a single call
+  char buffer[fileSize + 1];
+  size_t bytesRead = file.readBytes(buffer, fileSize);
+  buffer[bytesRead] = '\0'; // Null-terminate the string
+  return String(buffer);
+  */
+  
+  if (bytesRead==0) {
+    Serial.println("empty cypherText");
+    return "";
+  }
+  // else
+  
+  if(cachedPassword.length()==0) {
+    cachedPassword = keyboard("", 32, "password");
+    if(cachedPassword.length()==0) return "";  // cancelled
+  }
+  
+  // else try to decrypt
+  String plaintext = aes_decrypt((uint8_t*)buffer, bytesRead, cachedPassword);
+  
+  // check if really plaintext
+  if(!is_valid_ascii(plaintext)) {
+    // invalidate cached password -> will ask again on the next try
+    cachedPassword = "";
+    Serial.println("invalid password");
+    Serial.println(plaintext);
+    return "";
+  }
+  // else
+  return plaintext;
+}
+
+
 /***************************************************************************************
 ** Function name: sortList
 ** Description:   sort files for name
@@ -434,16 +541,14 @@ String loopSD(FS &fs, bool filePicker, String allowed_ext) {
   closeSdCard();
   setupSdCard();
   bool exit = false;
+  returnToMenu=true;  // make sure menu is redrawn when quitting in any point
 
   readFs(fs, Folder, fileList, allowed_ext);
 
   for(int i=0; i<MAXFILES; i++) if(fileList[i][2]!="") maxFiles++; else break;
   while(1){
     //if(returnToMenu) break; // stop this loop and retur to the previous loop
-    if(exit){ 
-      returnToMenu=true;
-      break; // stop this loop and retur to the previous loop
-    } 
+    if(exit) break; // stop this loop and retur to the previous loop
 
     if(redraw) {
       if(strcmp(PreFolder.c_str(),Folder.c_str()) != 0 || reload){
@@ -539,12 +644,40 @@ String loopSD(FS &fs, bool filePicker, String allowed_ext) {
               txSubFile(&fs, filepath);
             }});
           #if defined(USB_as_HID)
-          if(filepath.endsWith(".txt")) options.insert(options.begin(), {"BadUSB Run",  [&]() { 
-              Kb.begin();
-              USB.begin();
+          if(filepath.endsWith(".txt")) {
+            options.push_back({"BadUSB Run",  [&]() { 
+              Kb.begin(); USB.begin(); 
+              // TODO: set default keyboard layout
               key_input(fs, filepath);
             }});
+            /*
+            options.push_back({"USB HID Type",  [&]() { 
+              Kb.begin(); USB.begin();
+              Kb.print(readSmallFile(fs, filepath).c_str());  // buggy?
+              //String t = readSmallFile(fs, filepath).c_str();
+              //Kb.write((const uint8_t*) t.c_str(), t.length());
+            }});*/
+          }
+          if(filepath.endsWith(".aes") || filepath.endsWith(".enc")) {  // aes encrypted files
+              options.insert(options.begin(), {"Decrypt+Type",  [&]() { 
+                  String plaintext = readDecryptedAesFile(fs, filepath);
+                  if(plaintext.length()==0) return displayError("invalid password");;  // file is too big or cannot read, or cancelled
+                  // else
+                  Kb.begin(); USB.begin();
+                  Kb.print(plaintext.c_str());
+              }});
+          }
           #endif
+          if(filepath.endsWith(".aes") || filepath.endsWith(".enc")) {  // aes encrypted files
+              options.insert(options.begin(), {"Decrypt+Show",  [&]() {
+                String plaintext = readDecryptedAesFile(fs, filepath);
+                if(plaintext.length()==0) return;  // file is too big or cannot read, or cancelled
+                // else
+                displaySuccess(plaintext);
+                delay(2000);
+                // TODO: loop and wait for user input?
+              }});
+          }
           #if defined(HAS_NS4168_SPKR)
           if(isAudioFile(filepath)) options.insert(options.begin(), {"Play Audio",  [&]() { 
             delay(200);
@@ -552,7 +685,12 @@ String loopSD(FS &fs, bool filePicker, String allowed_ext) {
             setup_gpio(); //TODO: remove after fix select loop
           }});
           #endif
-
+          // generate qr codes from small files (<10K)
+          size_t filesize = getFileSize(fs, filepath);  // TODO: check filesize without opening
+          if(filesize < 3*1024) options.push_back({"QR code",  [&]() { 
+              delay(200);
+              qrcode_display(readSmallFile(fs, filepath));
+            }});
           options.push_back({"Main Menu", [&]() { exit = true; }});
           delay(200);
           if(!filePicker) loopOptions(options);
@@ -740,4 +878,4 @@ bool checkLittleFsSizeNM() {
   if((LittleFS.totalBytes() - LittleFS.usedBytes()) < 4096) {
     return false;
   } else return true;
-}
\ No newline at end of file
+}
diff --git a/src/core/sd_functions.h b/src/core/sd_functions.h
index 14bd0e85..d8f22b7f 100644
--- a/src/core/sd_functions.h
+++ b/src/core/sd_functions.h
@@ -27,6 +27,10 @@ bool createFolder(FS fs, String path);
 
 String readLineFromFile(File myFile);
 
+String readSmallFile(FS &fs, String filepath);
+
+String readDecryptedAesFile(FS &fs, String filepath);
+
 void readFs(FS fs, String folder, String result[][3], String allowed_ext = "*");
 
 void sortList(String fileList[][3], int fileListCount);
@@ -39,4 +43,4 @@ int createFilePages(String fileContent);
 
 bool checkLittleFsSize();
 
-bool checkLittleFsSizeNM(); //Don't display msg
\ No newline at end of file
+bool checkLittleFsSizeNM(); //Don't display msg
diff --git a/src/core/serialcmds.cpp b/src/core/serialcmds.cpp
index 2a125690..f6ff11a8 100644
--- a/src/core/serialcmds.cpp
+++ b/src/core/serialcmds.cpp
@@ -12,7 +12,10 @@
 #include "display.h"
 #include "powerSave.h"
 #include "modules/rf/rf.h"
+//#include "modules/rf/rtl433.h"
+//#include "modules/rf/radiolib_test.h"
 #include "modules/ir/TV-B-Gone.h"
+#include "modules/ir/ir_read.h"
 #include "modules/others/bad_usb.h"
 
 #if defined(HAS_NS4168_SPKR) || defined(BUZZ_PIN)
@@ -40,9 +43,9 @@ void startSerialCommandsHandlerTask() {
       "serialcmds",   // Name of the task (any string)
       20000,      // Stack size in bytes
       NULL,      // This is a pointer to the parameter that will be passed to the new task. We are not using it here and therefore it is set to NULL.
-      0,         // Priority of the task
+      1,         // Priority of the task
       &serialcmdsTaskHandle,      // Task handle (optional, can be NULL).
-      0          // Core where the task should run. By default, all your Arduino code runs on Core 1 and the Wi-Fi and RF functions (these are usually hidden from the Arduino environment) use the Core 0.
+      1          // Core where the task should run. By default, all your Arduino code runs on Core 1 and the Wi-Fi and RF functions (these are usually hidden from the Arduino environment) use the Core 0.
       );
 }
 
@@ -108,9 +111,9 @@ void handleSerialCommands() {
   
   bool r = processSerialCommand(cmd_str);
   if(r) setup_gpio(); // temp fix for menu inf. loop
+  else Serial.println("failed: " + cmd_str);
 }
 
-
 bool processSerialCommand(String cmd_str) {
   // return true on success, false on error
   // TODO: rewrite using https://github.com/SpacehuhnTech/SimpleCLI  (auto-generated help and args checking)
@@ -119,24 +122,34 @@ bool processSerialCommand(String cmd_str) {
 
   if(cmd_str == "" || cmd_str.startsWith("#") || cmd_str.startsWith(";") || cmd_str.startsWith("/")) {
     // ignore empty lines and comments
-    return false;
+    return true;
   }
 
-  // case-insensitive matching only without filename args -- TODO: better solution for this
-  if(cmd_str.indexOf("from_file ") == -1)
+  // case-insensitive matching only in some cases -- TODO: better solution for this
+  if(cmd_str.indexOf("from_file ") == -1 && cmd_str.indexOf("storage ") == -1 && cmd_str.indexOf("settings "))
     cmd_str.toLowerCase();
 
   // switch on cmd_str
   if(cmd_str.startsWith("ir") ) {
     
-    gsetIrTxPin(false);
-    //if(IrTx==0) IrTx = LED;  // quickfix init issue? CARDPUTER is 44
-
-    // ir tx <protocol> <address> <command>
-    // <protocol>: NEC, NECext, NEC42, NEC42ext, Samsung32, RC6, RC5, RC5X, SIRC, SIRC15, SIRC20, Kaseikyo, RCA
-    // <address> and <command> must be in hex format
-    // e.g. ir tx NEC 04000000 08000000
-
+    if(cmd_str == "ir rx") {  // "ir rx raw"
+      IrRead i = IrRead(true);  // true == headless mode
+      return(i.loop_headless(10));  // wait for 10 seconds
+    }
+    //TODO: if(cmd_str == "ir rx" {
+      
+    if(cmd_str.startsWith("ir tx")) {
+      // make sure it is initted
+      gsetIrTxPin(false);
+      //if(IrTx==0) IrTx = LED;  // quickfix init issue? CARDPUTER is 44
+
+      // ir tx <protocol> <address> <command>
+      // <protocol>: NEC, NECext, NEC42, NEC42ext, Samsung32, RC6, RC5, RC5X, SIRC, SIRC15, SIRC20, Kaseikyo, RCA
+      // <address> and <command> must be in hex format
+      // e.g. ir tx NEC 04000000 08000000
+    }
+    //TODO: if(cmd_str.startsWith("ir tx raw ")){
+    
     if(cmd_str.startsWith("ir tx nec ")){
        String address = cmd_str.substring(10, 10+8);
        String command = cmd_str.substring(19, 19+8);
@@ -161,7 +174,7 @@ bool processSerialCommand(String cmd_str) {
     //if(cmd_str.startsWith("ir tx raw")){
     
     if(cmd_str.startsWith("ir tx_from_file ")){
-      String filepath = cmd_str.substring(strlen("ir tx_from_file "), cmd_str.length());
+      String filepath = cmd_str.substring(strlen("ir tx_from_file "));
       filepath.trim();
       if(filepath.indexOf(".ir") == -1) return false;  // invalid filename
       if(!filepath.startsWith("/")) filepath = "/" + filepath;  // add "/" if missing
@@ -235,10 +248,10 @@ bool processSerialCommand(String cmd_str) {
       if(strlen(args)>1) sscanf(args, " %f", &frequency);
       //Serial.print("frequency:");
       //Serial.println((int) frequency);
-      return RCSwitch_Read_Raw(frequency);
+      return RCSwitch_Read_Raw(frequency, 10);
     }
     if(cmd_str.startsWith("subghz tx_from_file")) {
-      String filepath = cmd_str.substring(strlen("subghz tx_from_file "), cmd_str.length());
+      String filepath = cmd_str.substring(strlen("subghz tx_from_file "));
       filepath.trim();
       if(filepath.indexOf(".sub") == -1) return false;  // invalid filename
       if(!filepath.startsWith("/")) filepath = "/" + filepath;  // add "/" if missing
@@ -318,7 +331,7 @@ bool processSerialCommand(String cmd_str) {
   #if defined(USB_as_HID)
     // badusb available
     if(cmd_str.startsWith("badusb tx_from_file ")) {
-      String filepath = cmd_str.substring(strlen("badusb tx_from_file "), cmd_str.length());
+      String filepath = cmd_str.substring(strlen("badusb tx_from_file "));
       filepath.trim();
       if(filepath.indexOf(".txt") == -1) return false;  // invalid filename
       if(!filepath.startsWith("/")) filepath = "/" + filepath;  // add "/" if missing
@@ -334,7 +347,7 @@ bool processSerialCommand(String cmd_str) {
   #endif
 
   #if defined(HAS_NS4168_SPKR) || defined(BUZZ_PIN)
-    if(cmd_str.startsWith("tone" ) || cmd_str.startsWith("beep" )) {
+    if(cmd_str.startsWith("tone") || cmd_str.startsWith("beep")) {  // || cmd_str.startsWith("music_player beep" )
       const char* args = cmd_str.c_str() + 4;
       unsigned long frequency = 500UL;
       unsigned long duration = 500UL;  // default to 2 sec
@@ -350,7 +363,7 @@ bool processSerialCommand(String cmd_str) {
   
   #if defined(HAS_NS4168_SPKR) //M5StickCs doesn't have speakers.. they have buzzers on pin 02 that only beeps in different frequencies
     if(cmd_str.startsWith("music_player " ) ) {  // || cmd_str.startsWith("play " )
-      String song = cmd_str.substring(13, cmd_str.length());
+      String song = cmd_str.substring(13);
       if(song.indexOf(":") != -1) {
         // RTTTL player
         // music_player mario:d=4,o=5,b=100:16e6,16e6,32p,8e6,16c6,8e6,8g6,8p,8g,8p,8c6,16p,8g,16p,8e,16p,8a,8b,16a#,8a,16g.,16e6,16g6,8a6,16f6,8g6,8e6,16c6,16d6,8b,16p,8c6,16p,8g,16p,8e,16p,8a,8b,16a#,8a,16g.,16e6,16g6,8a6,16f6,8g6,8e6,16c6,16d6,8b,8p,16g6,16f#6,16f6,16d#6,16p,16e6,16p,16g#,16a,16c6,16p,16a,16c6,16d6,8p,16g6,16f#6,16f6,16d#6,16p,16e6,16p,16c7,16p,16c7,16c7,p,16g6,16f#6,16f6,16d#6,16p,16e6,16p,16g#,16a,16c6,16p,16a,16c6,16d6,8p,16d#6,8p,16d6,8p,16c6
@@ -367,14 +380,11 @@ bool processSerialCommand(String cmd_str) {
       }
     }
 
-    //TODO: tone
-    // https://github.com/earlephilhower/ESP8266Audio/issues/643
-
     //TODO: webradio
     // https://github.com/earlephilhower/ESP8266Audio/tree/master/examples/WebRadio
 
     if(cmd_str.startsWith("tts " ) || cmd_str.startsWith("say " )) {
-      String text = cmd_str.substring(4, cmd_str.length());
+      String text = cmd_str.substring(4);
       return tts(text);
     }
  #endif  // HAS_NS4168_SPKR
@@ -506,19 +516,58 @@ bool processSerialCommand(String cmd_str) {
       return true;
   }
   
-  if(cmd_str == "settings") {
-    // view current settings
+  if(cmd_str.startsWith("settings")) {
     JsonObject setting = settings[0];
+    String args = cmd_str.substring(strlen("settings "));
+    args.trim();
+    if(args.length()==0) {
+      // no args, just prints current settings
+      serializeJsonPretty(settings, Serial);
+      Serial.println("");
+      return true;
+    }
+    // else
+    String setting_name = args.substring(0, args.indexOf(" "));
+    setting_name.trim();
+    if(!setting.containsKey(setting_name)) {
+      Serial.println("invalid field name: " + setting_name);
+      return false;
+    }
+    String setting_value = args.substring(args.indexOf(" "));
+    setting_value.trim();
+    if(setting_value.length()==0) {
+      // just prints current settings
+      Serial.println(setting[setting_name].as<String>());
+      return true;
+    }
+    // else change the passed settings
+    // TODO: check if valid values
+    if(setting_name=="bright") bright = setting_value.toInt();
+    if(setting_name=="dimmerSet") dimmerSet = setting_value.toInt();
+    if(setting_name=="rot") rotation = setting_value.toInt();
+    if(setting_name=="Bruce_FGCOLOR") FGCOLOR = setting_value.toInt();
+    if(setting_name=="IrTx") IrTx = setting_value.toInt();
+    if(setting_name=="IrRx") IrRx = setting_value.toInt();
+    if(setting_name=="RfTx") RfTx = setting_value.toInt();
+    if(setting_name=="RfRx") RfRx = setting_value.toInt();
+    if(setting_name=="RfModule" && setting_value.toInt() <=1) RfModule = setting_value.toInt();
+    if(setting_name=="RfFreq" && setting_value.toFloat()) RfFreq = setting_value.toFloat();
+    if(setting_name=="tmz") IrRx = setting_value.toInt();
+    if(setting_name=="wui_usr") wui_usr = setting_value;
+    if(setting_name=="wui_pwd") wui_pwd = setting_value;
+    saveConfigs();
     serializeJsonPretty(settings, Serial);
     Serial.println("");
     return true;
   }
+  
   if(cmd_str == "info device" || cmd_str == "!") {
     Serial.print("Bruce v");
     Serial.println(BRUCE_VERSION);
+    Serial.println(GIT_COMMIT_HASH);
     // https://github.com/espressif/arduino-esp32/blob/master/libraries/ESP32/examples/ChipID/GetChipID/GetChipID.ino
-    Serial.printf("Chip is %s (revision v%d)\n", ESP.getChipModel(), ESP.getChipRevision());
-    Serial.printf("Detected flash size: %d\n", ESP.getFlashChipSize());
+    //Serial.printf("Chip is %s (revision v%d)\n", ESP.getChipModel(), ESP.getChipRevision());
+    //Serial.printf("Detected flash size: %d\n", ESP.getFlashChipSize());
     //Serial.printf("This chip has %d cores\n", ESP.getChipCores());
     //Serial.printf("CPU Freq is %d\n", ESP.getCpuFreqMHz());
     // Features: WiFi, BLE, Embedded Flash 8MB (GD)
@@ -583,23 +632,221 @@ bool processSerialCommand(String cmd_str) {
     }
   }
   
-  /* WIP
   // "storage" cmd to manage files  https://docs.flipper.net/development/cli/#Xgais
   if(cmd_str.startsWith("storage read ")) {
     String txt = "";
-    String filepath = cmd_str.substring(strlen("storage read "), cmd_str.length());
+    String filepath = cmd_str.substring(strlen("storage read "));
     filepath.trim();
+    if(filepath.length()==0) return false;  // missing arg
     if(!filepath.startsWith("/")) filepath = "/" + filepath;  // add "/" if missing
-    if(SD.exists(filepath)) txt = readSmallFile(SD, filepath);;
+    if(SD.exists(filepath)) txt = readSmallFile(SD, filepath);
     if(LittleFS.exists(filepath)) txt = readSmallFile(LittleFS, filepath);
     if(txt.length()!=0) {
       Serial.println(txt);
       return true;
     } else return false;
+  }
+  if(cmd_str.startsWith("storage stat ")) {
+    // storage stat /ir/_Flipper-IRDB-main.zip
+    String filepath = cmd_str.substring(strlen("storage stat "));
+    filepath.trim();
+    if(filepath.length()==0) return false;  // missing arg
+    if(!filepath.startsWith("/")) filepath = "/" + filepath;  // add "/" if missing
+    /*
+    FS* fs = NULL;
+    if(SD.exists(filepath)) fs = &SD;
+    if(LittleFS.exists(filepath)) fs = &LittleFS;
+    if(!fs) return false;  // file not found
+    File file = fs.open(filepath, FILE_READ);
+    if (!file) return false;
+    Serial.println(filepath);
+    Serial.println(file.size());
+    Serial.println(file.getLastWrite());
+    * */
+    // use <sys/stat.h> directly https://github.com/espressif/arduino-esp32/blob/66c9c0b1a6a36b85d27cdac0fb52098368de1a09/libraries/FS/src/vfs_api.cpp#L348#L348
+    if(SD.exists(filepath)) filepath = "/sd" + filepath; 
+    else if(LittleFS.exists(filepath)) filepath = "/littlefs" + filepath; 
+    else return false;  // not found
+    struct stat st;
+    memset(&st, 0, sizeof(struct stat));
+    if (stat(filepath.c_str(), &st) != 0) return false;
+    // else
+    Serial.print("File: ");
+    Serial.print(filepath);
+    Serial.println("");
+    
+    Serial.print("Size: ");
+    Serial.print(st.st_size);
+    Serial.print("\t");
+    if(S_ISDIR(st.st_mode))
+      Serial.print("directory");
+    else
+      Serial.print("regular file");
+    Serial.println("");
+    
+    Serial.print("Modify: ");
+    Serial.print(st.st_mtime);    // TODO: parse to localtime
+    Serial.println("");
+    
+    //Serial.println(st.st_mode);
+    //Serial.println(st.st_dev);
+    //Serial.println(st.st_ctime);
+    return true;
+  }
+  if(cmd_str.startsWith("storage list ")) {
+    // storage list BruceRF
+    String filepath = cmd_str.substring(strlen("storage list "));
+    filepath.trim();
+    if(filepath.length()==0) return false;  // missing arg
+    if(!filepath.startsWith("/")) filepath = "/" + filepath;  // add "/" if missing
+    FS* fs = NULL;
+    if(SD.exists(filepath)) fs = &SD;
+    if(LittleFS.exists(filepath)) fs = &LittleFS;
+    if(!fs) return false;  // dir not found
+    File root = fs->open(filepath);
+    if (!root || !root.isDirectory()) return false; // not a dir
+    File file2 = root.openNextFile();
+    while (file2) {
+        Serial.print(file2.name());
+        if (file2.isDirectory()) {
+          Serial.println("\t<DIR>");
+        } else {
+          Serial.print("\t");
+          Serial.println(file2.size());
+        }
+        //Serial.println(file2.path());
+        //Serial.println(file2.getLastWrite());  // TODO: parse to localtime
+        file2 = root.openNextFile();
+    }
+    file2.close();
+    root.close();
+    return true;
+  }
+  if(cmd_str.startsWith("storage remove ")) {
+    String filepath = cmd_str.substring(strlen("storage remove "));
+    filepath.trim();
+    if(filepath.length()==0) return false;  // missing arg
+    if(!filepath.startsWith("/")) filepath = "/" + filepath;  // add "/" if missing
+    if(SD.exists(filepath)) return SD.remove(filepath);
+    if(LittleFS.exists(filepath)) return LittleFS.remove(filepath);
+    // else
+    return false;
+  }
+  if(cmd_str.startsWith("storage mkdir ")) {
+    String filepath = cmd_str.substring(strlen("storage mkdir "));
+    filepath.trim();
+    if(filepath.length()==0) return false;  // missing arg
+    if(!filepath.startsWith("/")) filepath = "/" + filepath;  // add "/" if missing
+    if(!SD.exists(filepath)) return SD.mkdir(filepath);
+    if(!LittleFS.exists(filepath)) return LittleFS.mkdir(filepath);
+    // else
+    return false;
+  }
+  if(cmd_str.startsWith("storage rename ")) {
+    // storage rename HelloWorld.txt HelloWorld2.txt
+    String args = cmd_str.substring(strlen("storage rename "));
+    String filepath = args.substring(0, args.indexOf(" "));
+    filepath.trim();
+    if(filepath.length()==0) return false;  // missing arg
+    if(!filepath.startsWith("/")) filepath = "/" + filepath;  // add "/" if missing
+    String newName = args.substring(args.indexOf(" "), args.length());
+    newName.trim();
+    if(newName.length()==0) return false;  // missing arg
+    if(!newName.startsWith("/")) newName = "/" + newName;  // add "/" if missing
+    Serial.println(filepath);
+    Serial.println(newName);
+    if(SD.exists(filepath)) return SD.rename(filepath, newName);
+    if(LittleFS.exists(filepath)) return LittleFS.rename(filepath, newName);
+    // else
+    return false;
+  }
+  if(cmd_str.startsWith("storage copy ")) {
+    // storage copy HelloWorld.txt /dest/path
+    // storage copy bruce.conf badusb
+    String args = cmd_str.substring(strlen("storage copy "));
+    String filepath = args.substring(0, args.indexOf(" "));
+    filepath.trim();
+    if(filepath.length()==0) return false;  // missing arg
+    if(!filepath.startsWith("/")) filepath = "/" + filepath;  // add "/" if missing
+    String newName = args.substring(args.indexOf(" "), args.length());
+    newName.trim();
+    if(newName.length()==0) return false;  // missing arg
+    if(!newName.startsWith("/")) newName = "/" + newName;  // add "/" if missing
+    //Serial.println(filepath);
+    //Serial.println(newName);
+    fileToCopy=filepath;
+    if(SD.exists(filepath)) return pasteFile(SD, newName);
+    if(LittleFS.exists(filepath)) return pasteFile(LittleFS, newName);
+    // else
+    fileToCopy="";
+    return false;
+  }
+  
+  // TODO: storage write
+
+  if(cmd_str.startsWith("crypto decrypt_from_file")) {
+    // crypto decrypt_from_file passwords/github.com_pkcs5_pbkdf2.enc password
+    // crypto decrypt_from_file passwords/github.com_md5.enc 1234
+    // crypto decrypt_from_file passwords/github.com2.enc 1234
+    String args = cmd_str.substring(strlen("crypto decrypt_from_file "));
+    String filepath = args.substring(0, args.indexOf(" "));
+    filepath.trim();
+    if(filepath.length()==0) return false;  // missing arg
+    if(!filepath.startsWith("/")) filepath = "/" + filepath;  // add "/" if missing
+    String password = args.substring(args.indexOf(" ")+1, args.length());
+    password.trim();
+    if(password.length()==0) return false;  // missing arg
+    //Serial.println(filepath);
+    //Serial.println(password);
+    FS* fs = NULL;
+    if(SD.exists(filepath)) fs = &SD;
+    if(LittleFS.exists(filepath)) fs = &LittleFS;
+    if(!fs) return false;  // file not found
+    cachedPassword = password;  // avoid interactive prompt
+    String plaintext = readDecryptedAesFile(*fs, filepath);
+    if(plaintext=="") return false;
+    Serial.println(plaintext);
+    return true;
+  }
+  
+   if(cmd_str == "uptime") {
+      // https://github.com/espressif/arduino-esp32/blob/66c9c0b1a6a36b85d27cdac0fb52098368de1a09/libraries/WebServer/examples/AdvancedWebServer/AdvancedWebServer.ino#L64
+      int sec = millis() / 1000;
+      int hr = sec / 3600;
+      int min = (sec / 60) % 60;
+      sec = sec % 60;
+      char temp[400];
+      snprintf(temp, 400, "Uptime: %02d:%02d:%02d", hr, min, sec);
+      Serial.println(temp);
+      return true;
+  }
+  
+   if(cmd_str == "date") {
+      Serial.print("Current time: ");
+      Serial.println(timeStr);
+      // TODO: full date
+      return true;
+   }
+  
+/* WIP
+   if(cmd_str.startsWith("rtl433")) {
+    rtl433_setup();
+    return rtl433_loop(10000*3);
+  }
+  
+  if(cmd_str.startsWith("mass_storage")) {
+    // derived from https://github.com/espressif/arduino-esp32/blob/master/libraries/SD_MMC/examples/SD2USBMSC/SD2USBMSC.ino
+    
+  }
+  */
+  /*
+  if(cmd_str.startsWith("radiolib rx")) {
+    // https://github.com/jgromes/RadioLib/discussions/973
+    setup_cc1101();
+    while(loop_rx);
+    return true;
   }*/
- 
-  //  TODO: date
-  //  TODO: uptime
+  
   //  TODO: help
   
   //  TODO: more commands https://docs.flipper.net/development/cli#0Z9fs
diff --git a/src/main.cpp b/src/main.cpp
index ac8d8c8a..fe3b020f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -19,6 +19,7 @@ int RfTx;
 int RfRx;
 int RfModule=0;  // 0 - single-pinned, 1 - CC1101+SPI
 float RfFreq=433.92;
+String cachedPassword="";
 int dimmerSet;
 int bright=100;
 int tmz=3;
diff --git a/src/modules/ir/ir_read.cpp b/src/modules/ir/ir_read.cpp
index 2ad29d67..b7b833a2 100644
--- a/src/modules/ir/ir_read.cpp
+++ b/src/modules/ir/ir_read.cpp
@@ -21,7 +21,8 @@
 #define DUTY_CYCLE 0.330000
 
 
-IrRead::IrRead() {
+IrRead::IrRead(bool headless_mode) {
+    headless = headless_mode;
     setup();
 }
 
@@ -37,6 +38,7 @@ void IrRead::setup() {
     if(count==0) gsetIrRxPin(true); // Open dialog to choose IrRx pin
     
     pinMode(IrRx, INPUT);
+    if(headless) return;
     begin();
     return loop();
 }
@@ -201,6 +203,29 @@ void IrRead::save_device() {
     begin();
 }
 
+
+bool IrRead::loop_headless(int max_loops) {    
+    
+    while (!irrecv.decode(&results)) {
+        max_loops -= 1;
+        if(max_loops <= 0) {
+            Serial.println("timeout");
+            return false;  // nothing received
+        }
+        delay(1000);
+    }
+
+    append_to_file_str("??", parse_signal());
+
+    Serial.println("Filetype: Bruce IR File");
+    Serial.println("Version 1");
+    Serial.println("#");
+    Serial.print(strDeviceContent);
+    
+    irrecv.disableIRIn();
+    return true;
+}
+
 bool IrRead::write_file(String filename, FS* fs) {
     if (fs == nullptr) return false;
 
diff --git a/src/modules/ir/ir_read.h b/src/modules/ir/ir_read.h
index 1fdbd820..d1f741ba 100644
--- a/src/modules/ir/ir_read.h
+++ b/src/modules/ir/ir_read.h
@@ -18,13 +18,15 @@ class IrRead {
 	/////////////////////////////////////////////////////////////////////////////////////
 	// Constructor
 	/////////////////////////////////////////////////////////////////////////////////////
-	IrRead();
+	IrRead(bool headless_mode=false);
 
 	///////////////////////////////////////////////////////////////////////////////////
 	// Arduino Life Cycle
 	///////////////////////////////////////////////////////////////////////////////////
 	void setup();
 	void loop();
+	
+	bool loop_headless(int max_loops);
 
 private:
 	bool _read_signal = false;
@@ -33,6 +35,7 @@ class IrRead {
 	int raw_data_len;
 	int signals_read = 0;
 	String strDeviceContent = "";
+	bool headless = false;
 
 	/////////////////////////////////////////////////////////////////////////////////////
 	// Display functions
diff --git a/src/modules/rf/rf.cpp b/src/modules/rf/rf.cpp
index 93659850..434666c0 100644
--- a/src/modules/rf/rf.cpp
+++ b/src/modules/rf/rf.cpp
@@ -479,7 +479,7 @@ bool initRfModule(String mode, float frequency) {
 }
 
 
-bool RCSwitch_Read_Raw(float frequency) {
+bool RCSwitch_Read_Raw(float frequency, int max_loops) {
     RCSwitch rcswitch = RCSwitch();
     RfCodes received;
 
@@ -554,8 +554,7 @@ bool RCSwitch_Read_Raw(float frequency) {
             //Serial.println("resetAvailable");
             previousMillis = millis();
         }
-        if(received.key>0 && checkSelPress()) {
-            //Serial.println("received.key>0");
+        if(received.key>0) {
             String subfile_out = "Filetype: Bruce SubGhz RAW File\nVersion 1\n";
             subfile_out += "Frequency: " + String(int(frequency*1000000)) + "\n";
             if(received.preset=="1") received.preset="FuriHalSubGhzPresetOok270Async";
@@ -573,60 +572,69 @@ bool RCSwitch_Read_Raw(float frequency) {
                 return true;
             #endif
             
-            int chosen=0;
-            options = {
-                {"Replay signal",   [&]()  { chosen=1; } },
-                {"Save signal",     [&]()  { chosen=2; } },
-            };
-            delay(200);
-            loopOptions(options);
-            if(chosen==1) {
-                rcswitch.disableReceive();
-                sendRfCommand(received);
-                addToRecentCodes(received);
-                displayRedStripe("Waiting Signal",TFT_WHITE, FGCOLOR);
-                goto RestartRec;
-            }
-            else if (chosen==2) {
-                int i=0;
-                File file;
-                String FS="";
-                if(SD.begin()) {
-                    if (!SD.exists("/BruceRF")) SD.mkdir("/BruceRF");
-                    while(SD.exists("/BruceRF/bruce_" + String(i) + ".sub")) i++;
-                    file = SD.open("/BruceRF/bruce_"+ String(i) +".sub", FILE_WRITE);
-                    FS="SD";
-                } else if(LittleFS.begin()) {
-                    if(!checkLittleFsSize()) goto Exit;
-                    if (!LittleFS.exists("/BruceRF")) LittleFS.mkdir("/BruceRF");
-                    while(LittleFS.exists("/BruceRF/bruce_" + String(i) + ".sub")) i++;
-                    file = LittleFS.open("/BruceRF/bruce_"+ String(i) +".sub", FILE_WRITE);
-                    FS="LittleFS";
+            if(checkSelPress()) {
+                int chosen=0;
+                options = {
+                    {"Replay signal",   [&]()  { chosen=1; } },
+                    {"Save signal",     [&]()  { chosen=2; } },
+                };
+                delay(200);
+                loopOptions(options);
+                if(chosen==1) {
+                    rcswitch.disableReceive();
+                    sendRfCommand(received);
+                    addToRecentCodes(received);
+                    displayRedStripe("Waiting Signal",TFT_WHITE, FGCOLOR);
+                    goto RestartRec;
                 }
-                if(file) {
-                    file.println(subfile_out);
-                    displaySuccess(FS + "/bruce_" + String(i) + ".sub");
-                } else {
-                    Serial.println("Fail saving data to LittleFS");
-                    displayError("Error saving file");
+                else if (chosen==2) {
+                    int i=0;
+                    File file;
+                    String FS="";
+                    if(SD.begin()) {
+                        if (!SD.exists("/BruceRF")) SD.mkdir("/BruceRF");
+                        while(SD.exists("/BruceRF/bruce_" + String(i) + ".sub")) i++;
+                        file = SD.open("/BruceRF/bruce_"+ String(i) +".sub", FILE_WRITE);
+                        FS="SD";
+                    } else if(LittleFS.begin()) {
+                        if(!checkLittleFsSize()) goto Exit;
+                        if (!LittleFS.exists("/BruceRF")) LittleFS.mkdir("/BruceRF");
+                        while(LittleFS.exists("/BruceRF/bruce_" + String(i) + ".sub")) i++;
+                        file = LittleFS.open("/BruceRF/bruce_"+ String(i) +".sub", FILE_WRITE);
+                        FS="LittleFS";
+                    }
+                    if(file) {
+                        file.println(subfile_out);
+                        displaySuccess(FS + "/bruce_" + String(i) + ".sub");
+                    } else {
+                        Serial.println("Fail saving data to LittleFS");
+                        displayError("Error saving file");
+                    }
+                    file.close();
+                    delay(2000);
+                    drawMainBorder();
+                    tft.setCursor(10, 28);
+                    tft.setTextSize(FP);
+                    tft.println("Waiting for signal.");
                 }
-                file.close();
-                delay(2000);
-                drawMainBorder();
-                tft.setCursor(10, 28);
-                tft.setTextSize(FP);
-                tft.println("Waiting for signal.");
             }
-
         }
+        //#ifndef HAS_SCREEN
+        if(max_loops>0) {
+            // headless mode, quit if nothing received after max_loops
+            max_loops -= 1;
+            delay(1000);
+            if(max_loops==0) {
+                Serial.println("timeout");
+                return false;
+            }
+        }
+        //#endif
     }
     Exit:
     delay(1);
     
-    #ifdef USE_CC1101_VIA_SPI   
-    if(RfModule==1) 
-        ELECHOUSE_cc1101.setSidle();
-    #endif
+    deinitRfModule();
         
     return true;
 }
diff --git a/src/modules/rf/rf.h b/src/modules/rf/rf.h
index 52c58245..487e3e64 100644
--- a/src/modules/rf/rf.h
+++ b/src/modules/rf/rf.h
@@ -18,10 +18,10 @@ void rf_jammerIntermittent();
 void rf_jammerFull();
 void otherRFcodes();
 bool txSubFile(FS *fs, String filepath);
-bool RCSwitch_Read_Raw(float frequency=0);
+bool RCSwitch_Read_Raw(float frequency=0, int max_loops=-1);
 void RCSwitch_send(uint64_t data, unsigned int bits, int pulse=0, int protocol=1, int repeat=10);
 void addToRecentCodes(struct RfCodes rfcode);
 void sendRfCommand(struct RfCodes rfcode);
 bool initRfModule(String mode="", float frequency=0);
 void initCC1101once(SPIClass* SSPI);
-void deinitRfModule();
\ No newline at end of file
+void deinitRfModule();