diff --git a/src/libs/SD/examples/listfiles/listfiles.ino b/src/libs/SD/examples/listfiles/listfiles.ino
index 2b5eaf1..fd35d0c 100644
--- a/src/libs/SD/examples/listfiles/listfiles.ino
+++ b/src/libs/SD/examples/listfiles/listfiles.ino
@@ -28,14 +28,14 @@ File root;
 
 void setup() {
   // Open serial communications and wait for port to open:
-  Serial.begin(9600);
+  Serial.begin(115200);
   while (!Serial) {
     ; // wait for serial port to connect. Needed for Leonardo only
   }
 
   Serial.print("Initializing SD card...");
 
-  if (!SD.begin(4)) {
+  if (!SD.begin(SS)) {
     Serial.println("initialization failed!");
     return;
   }
@@ -70,11 +70,13 @@ void printDirectory(File dir, int numTabs) {
     } else {
       // files have sizes, directories do not
       Serial.print("\t\t");
-      Serial.println(entry.size(), DEC);
+      Serial.print(entry.size(), DEC);
+      Serial.print("\t\t");
+      time_t ft = entry.getLastWrite();
+      struct tm *tm = localtime(&ft);
+      // US format.  Feel free to convert to your own locale...
+      Serial.printf("%02d-%02d-%02d %02d:%02d:%02d\n", tm->tm_mon + 1, tm->tm_mday, tm->tm_year % 100, tm->tm_hour, tm->tm_min, tm->tm_sec);
     }
     entry.close();
   }
 }
-
-
-
diff --git a/src/libs/SD/keywords.txt b/src/libs/SD/keywords.txt
index 9893cc9..07717c6 100644
--- a/src/libs/SD/keywords.txt
+++ b/src/libs/SD/keywords.txt
@@ -21,10 +21,12 @@ open	KEYWORD2
 close	KEYWORD2
 seek	KEYWORD2
 position	KEYWORD2
-size	KEYWORD2	
+size	KEYWORD2
+rename	KEYWORD2
 
 #######################################
 # Constants (LITERAL1)
 #######################################
 FILE_READ	LITERAL1
 FILE_WRITE	LITERAL1
+FILE_READWRITE	LITERAL1
diff --git a/src/libs/SD/src/SD.cpp b/src/libs/SD/src/SD.cpp
index 6b40b0e..a3f0431 100644
--- a/src/libs/SD/src/SD.cpp
+++ b/src/libs/SD/src/SD.cpp
@@ -3,3 +3,5 @@
 #if !defined(NO_GLOBAL_INSTANCES) && !defined(NO_GLOBAL_SD)
 SDClass SD;
 #endif
+
+void (*__SD__userDateTimeCB)(uint16_t*, uint16_t*) = nullptr;
diff --git a/src/libs/SD/src/SD.h b/src/libs/SD/src/SD.h
index e4aefb6..b483874 100644
--- a/src/libs/SD/src/SD.h
+++ b/src/libs/SD/src/SD.h
@@ -49,10 +49,18 @@ public:
         return SDFS.open(filename, getMode(mode));
     }
 
+    File open(const char *filename, const char *mode) {
+        return SDFS.open(filename, mode);
+    }
+
     File open(const String &filename, uint8_t mode = FILE_READ) {
         return open(filename.c_str(), mode);
     }
 
+    File open(const String &filename, const char *mode) {
+        return open(filename.c_str(), mode);
+    }
+
     boolean exists(const char *filepath) {
         return (boolean)SDFS.exists(filepath);
     }
@@ -135,6 +143,17 @@ public:
         return ((uint64_t)clusterSize() * (uint64_t)totalClusters());
     }
 
+    void setTimeCallback(time_t (*cb)(void)) {
+        SDFS.setTimeCallback(cb);
+    }
+
+    // Wrapper to allow obsolete datetimecallback use, silently convert to time_t in wrappertimecb
+    void dateTimeCallback(void (*cb)(uint16_t*, uint16_t*)) {
+        extern void (*__SD__userDateTimeCB)(uint16_t*, uint16_t*);
+        __SD__userDateTimeCB = cb;
+	SDFS.setTimeCallback(wrapperTimeCB);
+    }
+
 private:
     const char *getMode(uint8_t mode) {
         bool read = (mode & sdfat::O_READ) ? true : false;
@@ -148,8 +167,46 @@ private:
         else                                 { return "r";  }
     }
 
+    static time_t wrapperTimeCB(void) {
+        extern void (*__SD__userDateTimeCB)(uint16_t*, uint16_t*);
+        if (__SD__userDateTimeCB) {
+            uint16_t d, t;
+            __SD__userDateTimeCB(&d, &t);
+            return sdfs::SDFSImpl::FatToTimeT(d, t);
+        }
+        return time(nullptr);
+    }
+
 };
 
+
+// Expose FatStructs.h helpers for MSDOS date/time for use with dateTimeCallback
+static inline uint16_t FAT_DATE(uint16_t year, uint8_t month, uint8_t day) {
+  return (year - 1980) << 9 | month << 5 | day;
+}
+static inline uint16_t FAT_YEAR(uint16_t fatDate) {
+  return 1980 + (fatDate >> 9);
+}
+static inline uint8_t FAT_MONTH(uint16_t fatDate) {
+  return (fatDate >> 5) & 0XF;
+}
+static inline uint8_t FAT_DAY(uint16_t fatDate) {
+  return fatDate & 0X1F;
+}
+static inline uint16_t FAT_TIME(uint8_t hour, uint8_t minute, uint8_t second) {
+  return hour << 11 | minute << 5 | second >> 1;
+}
+static inline uint8_t FAT_HOUR(uint16_t fatTime) {
+  return fatTime >> 11;
+}
+static inline uint8_t FAT_MINUTE(uint16_t fatTime) {
+  return (fatTime >> 5) & 0X3F;
+}
+static inline uint8_t FAT_SECOND(uint16_t fatTime) {
+  return 2*(fatTime & 0X1F);
+}
+
+
 #if !defined(NO_GLOBAL_INSTANCES) && !defined(NO_GLOBAL_SD)
 extern SDClass SD;
 #endif