diff --git a/Adafruit_ILI9341.cpp b/Adafruit_ILI9341.cpp
old mode 100755
new mode 100644
index eda9b4a..1dcfa73
--- a/Adafruit_ILI9341.cpp
+++ b/Adafruit_ILI9341.cpp
@@ -49,7 +49,8 @@
 #include "Adafruit_ILI9341.h"
 #ifndef ARDUINO_STM32_FEATHER
 #include "pins_arduino.h"
-#ifndef RASPI
+#if !defined(RASPI) && !defined(ARDUINO_UNOR4_MINIMA) &&                       \
+    !defined(ARDUINO_UNOR4_WIFI)
 #include "wiring_private.h"
 #endif
 #endif
diff --git a/Adafruit_ILI9341.h b/Adafruit_ILI9341.h
old mode 100755
new mode 100644
index 525f0f4..9feeef3
--- a/Adafruit_ILI9341.h
+++ b/Adafruit_ILI9341.h
@@ -101,7 +101,7 @@
 
 #define ILI9341_GMCTRP1 0xE0 ///< Positive Gamma Correction
 #define ILI9341_GMCTRN1 0xE1 ///< Negative Gamma Correction
-//#define ILI9341_PWCTR6     0xFC
+// #define ILI9341_PWCTR6     0xFC
 
 // Color definitions
 #define ILI9341_BLACK 0x0000       ///<   0,   0,   0
diff --git a/examples/graphicstest_featherwing/graphicstest_featherwing.ino b/examples/graphicstest_featherwing/graphicstest_featherwing.ino
index b3818a0..9a25f0c 100644
--- a/examples/graphicstest_featherwing/graphicstest_featherwing.ino
+++ b/examples/graphicstest_featherwing/graphicstest_featherwing.ino
@@ -26,8 +26,18 @@
    #define TFT_CS   7
    #define TFT_DC   8
    #define SD_CS    5
-#elif defined(ESP32) && !defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S2) && \
-      !defined(ARDUINO_FEATHERS3)
+#elif defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S2)         || \
+      defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S2_REVTFT)  || \
+      defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S2_TFT)     || \
+      defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S3)         || \
+      defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S3_NOPSRAM) || \
+      defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S3_REVTFT)  || \
+      defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S3_TFT)
+  #define STMPE_CS  6
+  #define TFT_CS    9
+  #define TFT_DC   10
+  #define SD_CS     5
+#elif defined(ESP32)
    #define STMPE_CS 32
    #define TFT_CS   15
    #define TFT_DC   33
diff --git a/examples/touchpaint_featherwing/touchpaint_featherwing.ino b/examples/touchpaint_featherwing/touchpaint_featherwing.ino
index c53cf46..a423d77 100644
--- a/examples/touchpaint_featherwing/touchpaint_featherwing.ino
+++ b/examples/touchpaint_featherwing/touchpaint_featherwing.ino
@@ -30,7 +30,18 @@
    #define TFT_CS   7
    #define TFT_DC   8
    #define SD_CS    5
-#elif defined(ESP32) && !defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S2)
+#elif defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S2)         || \
+      defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S2_REVTFT)  || \
+      defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S2_TFT)     || \
+      defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S3)         || \
+      defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S3_NOPSRAM) || \
+      defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S3_REVTFT)  || \
+      defined(ARDUINO_ADAFRUIT_FEATHER_ESP32S3_TFT)
+  #define STMPE_CS  6
+  #define TFT_CS    9
+  #define TFT_DC   10
+  #define SD_CS     5
+#elif defined(ESP32)
    #define STMPE_CS 32
    #define TFT_CS   15
    #define TFT_DC   33
@@ -200,4 +211,4 @@ void loop() {
   if (((p.y-PENRADIUS) > 0) && ((p.y+PENRADIUS) < tft.height())) {
     tft.fillCircle(p.x, p.y, PENRADIUS, currentcolor);
   }
-}
\ No newline at end of file
+}
diff --git a/library.properties b/library.properties
index d8dc921..733b29f 100644
--- a/library.properties
+++ b/library.properties
@@ -1,5 +1,5 @@
 name=Adafruit ILI9341
-version=1.6.1
+version=1.6.3
 author=Adafruit
 maintainer=Adafruit <info@adafruit.com>
 sentence=Library for Adafruit ILI9341 displays